Merge pull request opencv#8963 from likan999:fix-java-camera-view

alalek · alalek · commit 9ee60dbff20d · 2017-06-27T11:57:13.000Z
diff --git a/modules/java/generator/src/java/android+JavaCameraView.java b/modules/java/generator/src/java/android+JavaCameraView.java
@@ -147,7 +147,14 @@ protected boolean initializeCamera(int width, int height) {
                     Size frameSize = calculateCameraFrameSize(sizes, new JavaCameraSizeAccessor(), width, height);
 
                     /* Image format NV21 causes issues in the Android emulators */
-                    if (Build.BRAND.equalsIgnoreCase("generic") || Build.BRAND.equalsIgnoreCase("Android"))
+                    if (Build.FINGERPRINT.startsWith("generic")
+                            || Build.FINGERPRINT.startsWith("unknown")
+                            || Build.MODEL.contains("google_sdk")
+                            || Build.MODEL.contains("Emulator")
+                            || Build.MODEL.contains("Android SDK built for x86")
+                            || Build.MANUFACTURER.contains("Genymotion")
+                            || (Build.BRAND.startsWith("generic") && Build.DEVICE.startsWith("generic"))
+                            || "google_sdk".equals(Build.PRODUCT))
                         params.setPreviewFormat(ImageFormat.YV12);  // "generic" or "android" = android emulator
                     else
                         params.setPreviewFormat(ImageFormat.NV21);
