less verbose output for highgui hw info

nihui · nihui · commit 5228c32c2195 · 2024-03-08T14:29:58.000+08:00
diff --git a/highgui/src/capture_cvi.cpp b/highgui/src/capture_cvi.cpp
@@ -84,35 +84,17 @@ static int get_device_model()
         }
     }
 
+    if (device_model > 0)
+    {
+        fprintf(stderr, "opencv-mobile MIPI CSI camera with cvi\n");
+    }
+
     return device_model;
 }
 
 static bool is_device_whitelisted()
 {
-    const int device_model = get_device_model();
-
-    if (device_model == 1)
-    {
-        // milkv duo
-        return true;
-    }
-    if (device_model == 2)
-    {
-        // milkv duo 256
-        return true;
-    }
-    if (device_model == 3)
-    {
-        // licheerv nano
-        return true;
-    }
-    if (device_model == 4)
-    {
-        // milkv duo s
-        return true;
-    }
-
-    return false;
+    return get_device_model() > 0;
 }
 
 extern "C"
@@ -258,7 +240,6 @@ static int load_sys_library()
     bool whitelisted = is_device_whitelisted();
     if (!whitelisted)
     {
-        fprintf(stderr, "this device is not whitelisted for capture cvi\n");
         return -1;
     }
 
@@ -975,7 +956,6 @@ static int load_vpu_library()
     bool whitelisted = is_device_whitelisted();
     if (!whitelisted)
     {
-        fprintf(stderr, "this device is not whitelisted for capture cvi\n");
         return -1;
     }
 
@@ -1827,7 +1807,6 @@ static int load_sns_obj_library()
     bool whitelisted = is_device_whitelisted();
     if (!whitelisted)
     {
-        fprintf(stderr, "this device is not whitelisted for capture cvi\n");
         return -1;
     }
 
@@ -2199,7 +2178,6 @@ static int load_ae_library()
     bool whitelisted = is_device_whitelisted();
     if (!whitelisted)
     {
-        fprintf(stderr, "this device is not whitelisted for capture cvi\n");
         return -1;
     }
 
@@ -2266,7 +2244,6 @@ static int load_awb_library()
     bool whitelisted = is_device_whitelisted();
     if (!whitelisted)
     {
-        fprintf(stderr, "this device is not whitelisted for capture cvi\n");
         return -1;
     }
 
@@ -2346,7 +2323,6 @@ static int load_isp_library()
     bool whitelisted = is_device_whitelisted();
     if (!whitelisted)
     {
-        fprintf(stderr, "this device is not whitelisted for capture cvi\n");
         return -1;
     }
 
@@ -2454,7 +2430,6 @@ static int load_cvi_bin_library()
     bool whitelisted = is_device_whitelisted();
     if (!whitelisted)
     {
-        fprintf(stderr, "this device is not whitelisted for capture cvi\n");
         return -1;
     }
 
diff --git a/highgui/src/capture_v4l2_aw_isp.cpp b/highgui/src/capture_v4l2_aw_isp.cpp
@@ -65,20 +65,17 @@ static int get_device_model()
         }
     }
 
+    if (device_model > 0)
+    {
+        fprintf(stderr, "opencv-mobile MIPI CSI camera with v4l2 awispapi\n");
+    }
+
     return device_model;
 }
 
 static bool is_device_whitelisted()
 {
-    const int device_model = get_device_model();
-
-    if (device_model == 1)
-    {
-        // tinyvision
-        return true;
-    }
-
-    return false;
+    return get_device_model() > 0;
 }
 
 extern "C" {
@@ -415,7 +412,6 @@ static int load_awispapi_library()
     bool whitelisted = is_device_whitelisted();
     if (!whitelisted)
     {
-        fprintf(stderr, "this device is not whitelisted for capture v4l2 awispapi\n");
         return -1;
     }
 
diff --git a/highgui/src/capture_v4l2_rk_aiq.cpp b/highgui/src/capture_v4l2_rk_aiq.cpp
@@ -39,6 +39,44 @@
 
 namespace cv {
 
+// 0 = unknown
+// 1 = luckfox-pico
+static int get_device_model()
+{
+    static int device_model = -1;
+
+    if (device_model >= 0)
+        return device_model;
+
+    device_model = 0;
+
+    FILE* fp = fopen("/proc/device-tree/model", "rb");
+    if (fp)
+    {
+        char buf[1024];
+        fgets(buf, 1024, fp);
+        fclose(fp);
+
+        if (strncmp(buf, "Luckfox Pico", 12) == 0)
+        {
+            // luckfox pico family and plus pro max mini variants
+            device_model = 1;
+        }
+    }
+
+    if (device_model > 0)
+    {
+        fprintf(stderr, "opencv-mobile MIPI CSI camera with v4l2 rkaiq\n");
+    }
+
+    return device_model;
+}
+
+static bool is_device_whitelisted()
+{
+    return get_device_model() > 0;
+}
+
 extern "C"
 {
 
@@ -348,26 +386,9 @@ static int load_rkaiq_library()
         return 0;
 
     // check device whitelist
-    bool whitelisted = false;
-    {
-        FILE* fp = fopen("/proc/device-tree/model", "rb");
-        if (!fp)
-            return -1;
-
-        char buf[1024];
-        fgets(buf, 1024, fp);
-        fclose(fp);
-
-        if (strncmp(buf, "Luckfox Pico", 12) == 0)
-        {
-            // luckfox pico family and plus pro max mini variants
-            whitelisted = true;
-        }
-    }
-
+    bool whitelisted = is_device_whitelisted();
     if (!whitelisted)
     {
-        fprintf(stderr, "this device is not whitelisted for capture v4l2 rkaiq\n");
         return -1;
     }
 
@@ -606,26 +627,9 @@ static int load_rga_library()
         return 0;
 
     // check device whitelist
-    bool whitelisted = false;
-    {
-        FILE* fp = fopen("/proc/device-tree/model", "rb");
-        if (!fp)
-            return -1;
-
-        char buf[1024];
-        fgets(buf, 1024, fp);
-        fclose(fp);
-
-        if (strncmp(buf, "Luckfox Pico", 12) == 0)
-        {
-            // luckfox pico family and plus pro max mini variants
-            whitelisted = true;
-        }
-    }
-
+    bool whitelisted = is_device_whitelisted();
     if (!whitelisted)
     {
-        fprintf(stderr, "this device is not whitelisted for capture v4l2 rkaiq\n");
         return -1;
     }
 
diff --git a/highgui/src/jpeg_decoder_aw.cpp b/highgui/src/jpeg_decoder_aw.cpp
@@ -75,30 +75,17 @@ static int get_device_model()
         }
     }
 
+    if (device_model > 0)
+    {
+        fprintf(stderr, "opencv-mobile HW JPG decoder with aw cedarc\n");
+    }
+
     return device_model;
 }
 
 static bool is_device_whitelisted()
 {
-    const int device_model = get_device_model();
-
-    if (device_model == 1)
-    {
-        // t113-i
-        return true;
-    }
-    if (device_model == 2)
-    {
-        // tinyvision
-        return true;
-    }
-    if (device_model == 3)
-    {
-        // yuzuki-chameleon
-        return true;
-    }
-
-    return false;
+    return get_device_model() > 0;
 }
 
 extern "C" {
@@ -143,7 +130,6 @@ static int load_videoengine_library()
     bool whitelisted = is_device_whitelisted();
     if (!whitelisted)
     {
-        fprintf(stderr, "this device is not whitelisted for jpeg decoder aw cedarc\n");
         return -1;
     }
 
@@ -676,7 +662,6 @@ static int load_vdecoder_library()
     bool whitelisted = is_device_whitelisted();
     if (!whitelisted)
     {
-        fprintf(stderr, "this device is not whitelisted for jpeg decoder aw cedarc\n");
         return -1;
     }
 
diff --git a/highgui/src/jpeg_decoder_cvi.cpp b/highgui/src/jpeg_decoder_cvi.cpp
@@ -82,35 +82,17 @@ static int get_device_model()
         }
     }
 
+    if (device_model > 0)
+    {
+        fprintf(stderr, "opencv-mobile HW JPG decoder with cvi\n");
+    }
+
     return device_model;
 }
 
 static bool is_device_whitelisted()
 {
-    const int device_model = get_device_model();
-
-    if (device_model == 1)
-    {
-        // milkv duo
-        return true;
-    }
-    if (device_model == 2)
-    {
-        // milkv duo 256
-        return true;
-    }
-    if (device_model == 3)
-    {
-        // licheerv nano
-        return true;
-    }
-    if (device_model == 4)
-    {
-        // milkv duo s
-        return true;
-    }
-
-    return false;
+    return get_device_model() > 0;
 }
 
 extern "C"
@@ -248,7 +230,6 @@ static int load_sys_library()
     bool whitelisted = is_device_whitelisted();
     if (!whitelisted)
     {
-        fprintf(stderr, "this device is not whitelisted for jpeg decoder cvi\n");
         return -1;
     }
 
@@ -657,7 +638,6 @@ static int load_vdec_library()
     bool whitelisted = is_device_whitelisted();
     if (!whitelisted)
     {
-        fprintf(stderr, "this device is not whitelisted for jpeg decoder cvi\n");
         return -1;
     }
 
@@ -925,7 +905,6 @@ static int load_vpu_library()
     bool whitelisted = is_device_whitelisted();
     if (!whitelisted)
     {
-        fprintf(stderr, "this device is not whitelisted for jpeg decoder cvi\n");
         return -1;
     }
 
diff --git a/highgui/src/jpeg_encoder_aw.cpp b/highgui/src/jpeg_encoder_aw.cpp
diff --git a/highgui/src/jpeg_encoder_rk_mpp.cpp b/highgui/src/jpeg_encoder_rk_mpp.cpp

Original file line number	Diff line number	Diff line change
`@@ -84,35 +84,17 @@ static int get_device_model()`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
	`87`	`+ if (device_model > 0)`
	`88`	`+ {`
	`89`	`+ fprintf(stderr, "opencv-mobile MIPI CSI camera with cvi\n");`
	`90`	`+ }`
	`91`	`+`
`87`	`92`	`return device_model;`
`88`	`93`	`}`
`89`	`94`
`90`	`95`	`static bool is_device_whitelisted()`
`91`	`96`	`{`
`92`		`- const int device_model = get_device_model();`
`93`		`-`
`94`		`- if (device_model == 1)`
`95`		`- {`
`96`		`- // milkv duo`
`97`		`- return true;`
`98`		`- }`
`99`		`- if (device_model == 2)`
`100`		`- {`
`101`		`- // milkv duo 256`
`102`		`- return true;`
`103`		`- }`
`104`		`- if (device_model == 3)`
`105`		`- {`
`106`		`- // licheerv nano`
`107`		`- return true;`
`108`		`- }`
`109`		`- if (device_model == 4)`
`110`		`- {`
`111`		`- // milkv duo s`
`112`		`- return true;`
`113`		`- }`
`114`		`-`
`115`		`- return false;`
	`97`	`+ return get_device_model() > 0;`
`116`	`98`	`}`
`117`	`99`
`118`	`100`	`extern "C"`
`@@ -258,7 +240,6 @@ static int load_sys_library()`
`258`	`240`	`bool whitelisted = is_device_whitelisted();`
`259`	`241`	`if (!whitelisted)`
`260`	`242`	`{`
`261`		`- fprintf(stderr, "this device is not whitelisted for capture cvi\n");`
`262`	`243`	`return -1;`
`263`	`244`	`}`
`264`	`245`
`@@ -975,7 +956,6 @@ static int load_vpu_library()`
`975`	`956`	`bool whitelisted = is_device_whitelisted();`
`976`	`957`	`if (!whitelisted)`
`977`	`958`	`{`
`978`		`- fprintf(stderr, "this device is not whitelisted for capture cvi\n");`
`979`	`959`	`return -1;`
`980`	`960`	`}`
`981`	`961`
`@@ -1827,7 +1807,6 @@ static int load_sns_obj_library()`
`1827`	`1807`	`bool whitelisted = is_device_whitelisted();`
`1828`	`1808`	`if (!whitelisted)`
`1829`	`1809`	`{`
`1830`		`- fprintf(stderr, "this device is not whitelisted for capture cvi\n");`
`1831`	`1810`	`return -1;`
`1832`	`1811`	`}`
`1833`	`1812`
`@@ -2199,7 +2178,6 @@ static int load_ae_library()`
`2199`	`2178`	`bool whitelisted = is_device_whitelisted();`
`2200`	`2179`	`if (!whitelisted)`
`2201`	`2180`	`{`
`2202`		`- fprintf(stderr, "this device is not whitelisted for capture cvi\n");`
`2203`	`2181`	`return -1;`
`2204`	`2182`	`}`
`2205`	`2183`
`@@ -2266,7 +2244,6 @@ static int load_awb_library()`
`2266`	`2244`	`bool whitelisted = is_device_whitelisted();`
`2267`	`2245`	`if (!whitelisted)`
`2268`	`2246`	`{`
`2269`		`- fprintf(stderr, "this device is not whitelisted for capture cvi\n");`
`2270`	`2247`	`return -1;`
`2271`	`2248`	`}`
`2272`	`2249`
`@@ -2346,7 +2323,6 @@ static int load_isp_library()`
`2346`	`2323`	`bool whitelisted = is_device_whitelisted();`
`2347`	`2324`	`if (!whitelisted)`
`2348`	`2325`	`{`
`2349`		`- fprintf(stderr, "this device is not whitelisted for capture cvi\n");`
`2350`	`2326`	`return -1;`
`2351`	`2327`	`}`
`2352`	`2328`
`@@ -2454,7 +2430,6 @@ static int load_cvi_bin_library()`
`2454`	`2430`	`bool whitelisted = is_device_whitelisted();`
`2455`	`2431`	`if (!whitelisted)`
`2456`	`2432`	`{`
`2457`		`- fprintf(stderr, "this device is not whitelisted for capture cvi\n");`
`2458`	`2433`	`return -1;`
`2459`	`2434`	`}`
`2460`	`2435`
Original file line number	Diff line number	Diff line change
`@@ -65,20 +65,17 @@ static int get_device_model()`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
	`68`	`+ if (device_model > 0)`
	`69`	`+ {`
	`70`	`+ fprintf(stderr, "opencv-mobile MIPI CSI camera with v4l2 awispapi\n");`
	`71`	`+ }`
	`72`	`+`
`68`	`73`	`return device_model;`
`69`	`74`	`}`
`70`	`75`
`71`	`76`	`static bool is_device_whitelisted()`
`72`	`77`	`{`
`73`		`- const int device_model = get_device_model();`
`74`		`-`
`75`		`- if (device_model == 1)`
`76`		`- {`
`77`		`- // tinyvision`
`78`		`- return true;`
`79`		`- }`
`80`		`-`
`81`		`- return false;`
	`78`	`+ return get_device_model() > 0;`
`82`	`79`	`}`
`83`	`80`
`84`	`81`	`extern "C" {`
`@@ -415,7 +412,6 @@ static int load_awispapi_library()`
`415`	`412`	`bool whitelisted = is_device_whitelisted();`
`416`	`413`	`if (!whitelisted)`
`417`	`414`	`{`
`418`		`- fprintf(stderr, "this device is not whitelisted for capture v4l2 awispapi\n");`
`419`	`415`	`return -1;`
`420`	`416`	`}`
`421`	`417`
Original file line number	Diff line number	Diff line change
`@@ -75,30 +75,17 @@ static int get_device_model()`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
	`78`	`+ if (device_model > 0)`
	`79`	`+ {`
	`80`	`+ fprintf(stderr, "opencv-mobile HW JPG decoder with aw cedarc\n");`
	`81`	`+ }`
	`82`	`+`
`78`	`83`	`return device_model;`
`79`	`84`	`}`
`80`	`85`
`81`	`86`	`static bool is_device_whitelisted()`
`82`	`87`	`{`
`83`		`- const int device_model = get_device_model();`
`84`		`-`
`85`		`- if (device_model == 1)`
`86`		`- {`
`87`		`- // t113-i`
`88`		`- return true;`
`89`		`- }`
`90`		`- if (device_model == 2)`
`91`		`- {`
`92`		`- // tinyvision`
`93`		`- return true;`
`94`		`- }`
`95`		`- if (device_model == 3)`
`96`		`- {`
`97`		`- // yuzuki-chameleon`
`98`		`- return true;`
`99`		`- }`
`100`		`-`
`101`		`- return false;`
	`88`	`+ return get_device_model() > 0;`
`102`	`89`	`}`
`103`	`90`
`104`	`91`	`extern "C" {`
`@@ -143,7 +130,6 @@ static int load_videoengine_library()`
`143`	`130`	`bool whitelisted = is_device_whitelisted();`
`144`	`131`	`if (!whitelisted)`
`145`	`132`	`{`
`146`		`- fprintf(stderr, "this device is not whitelisted for jpeg decoder aw cedarc\n");`
`147`	`133`	`return -1;`
`148`	`134`	`}`
`149`	`135`
`@@ -676,7 +662,6 @@ static int load_vdecoder_library()`
`676`	`662`	`bool whitelisted = is_device_whitelisted();`
`677`	`663`	`if (!whitelisted)`
`678`	`664`	`{`
`679`		`- fprintf(stderr, "this device is not whitelisted for jpeg decoder aw cedarc\n");`
`680`	`665`	`return -1;`
`681`	`666`	`}`
`682`	`667`
Original file line number	Diff line number	Diff line change
`@@ -82,35 +82,17 @@ static int get_device_model()`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
	`85`	`+ if (device_model > 0)`
	`86`	`+ {`
	`87`	`+ fprintf(stderr, "opencv-mobile HW JPG decoder with cvi\n");`
	`88`	`+ }`
	`89`	`+`
`85`	`90`	`return device_model;`
`86`	`91`	`}`
`87`	`92`
`88`	`93`	`static bool is_device_whitelisted()`
`89`	`94`	`{`
`90`		`- const int device_model = get_device_model();`
`91`		`-`
`92`		`- if (device_model == 1)`
`93`		`- {`
`94`		`- // milkv duo`
`95`		`- return true;`
`96`		`- }`
`97`		`- if (device_model == 2)`
`98`		`- {`
`99`		`- // milkv duo 256`
`100`		`- return true;`
`101`		`- }`
`102`		`- if (device_model == 3)`
`103`		`- {`
`104`		`- // licheerv nano`
`105`		`- return true;`
`106`		`- }`
`107`		`- if (device_model == 4)`
`108`		`- {`
`109`		`- // milkv duo s`
`110`		`- return true;`
`111`		`- }`
`112`		`-`
`113`		`- return false;`
	`95`	`+ return get_device_model() > 0;`
`114`	`96`	`}`
`115`	`97`
`116`	`98`	`extern "C"`
`@@ -248,7 +230,6 @@ static int load_sys_library()`
`248`	`230`	`bool whitelisted = is_device_whitelisted();`
`249`	`231`	`if (!whitelisted)`
`250`	`232`	`{`
`251`		`- fprintf(stderr, "this device is not whitelisted for jpeg decoder cvi\n");`
`252`	`233`	`return -1;`
`253`	`234`	`}`
`254`	`235`
`@@ -657,7 +638,6 @@ static int load_vdec_library()`
`657`	`638`	`bool whitelisted = is_device_whitelisted();`
`658`	`639`	`if (!whitelisted)`
`659`	`640`	`{`
`660`		`- fprintf(stderr, "this device is not whitelisted for jpeg decoder cvi\n");`
`661`	`641`	`return -1;`
`662`	`642`	`}`
`663`	`643`
`@@ -925,7 +905,6 @@ static int load_vpu_library()`
`925`	`905`	`bool whitelisted = is_device_whitelisted();`
`926`	`906`	`if (!whitelisted)`
`927`	`907`	`{`
`928`		`- fprintf(stderr, "this device is not whitelisted for jpeg decoder cvi\n");`
`929`	`908`	`return -1;`
`930`	`909`	`}`
`931`	`910`