From d69b292a753de409fb46916e80f87bd999144456 Mon Sep 17 00:00:00 2001 From: Hanchen Li Date: Wed, 6 Dec 2017 10:35:43 -0800 Subject: [PATCH 1/3] Fix problem with camera on Android TV --- .../android/src/org/tensorflow/demo/CameraActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tensorflow/examples/android/src/org/tensorflow/demo/CameraActivity.java b/tensorflow/examples/android/src/org/tensorflow/demo/CameraActivity.java index 4e45f42d0c9..bd45e44537c 100644 --- a/tensorflow/examples/android/src/org/tensorflow/demo/CameraActivity.java +++ b/tensorflow/examples/android/src/org/tensorflow/demo/CameraActivity.java @@ -333,7 +333,8 @@ public abstract class CameraActivity extends Activity continue; } - useCamera2API = isHardwareLevelSupported(characteristics, + useCamera2API = facing == CameraCharacteristics.LENS_FACING_EXTERNAL || + isHardwareLevelSupported(characteristics, CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_FULL); LOGGER.i("Camera API lv2?: %s", useCamera2API); return cameraId; From dac4cbd4602b742532102f8953641ff301363fbe Mon Sep 17 00:00:00 2001 From: Andrew Harp Date: Thu, 7 Dec 2017 12:31:45 -0500 Subject: [PATCH 2/3] Update CameraActivity.java reformat and add comment --- .../android/src/org/tensorflow/demo/CameraActivity.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tensorflow/examples/android/src/org/tensorflow/demo/CameraActivity.java b/tensorflow/examples/android/src/org/tensorflow/demo/CameraActivity.java index bd45e44537c..b4de279c004 100644 --- a/tensorflow/examples/android/src/org/tensorflow/demo/CameraActivity.java +++ b/tensorflow/examples/android/src/org/tensorflow/demo/CameraActivity.java @@ -333,9 +333,12 @@ public abstract class CameraActivity extends Activity continue; } - useCamera2API = facing == CameraCharacteristics.LENS_FACING_EXTERNAL || - isHardwareLevelSupported(characteristics, - CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_FULL); + // Fallback to camera1 API for internal cameras that don't have full support. + // This should help with legacy situations where using the camera2 API causes + // distorted or otherwise broken previews. + useCamera2API = facing == CameraCharacteristics.LENS_FACING_EXTERNAL + || isHardwareLevelSupported(characteristics, + CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_FULL); LOGGER.i("Camera API lv2?: %s", useCamera2API); return cameraId; } From 4bc510c17b23af1adac83b148c0c7dfd978a20be Mon Sep 17 00:00:00 2001 From: Andrew Harp Date: Thu, 7 Dec 2017 12:32:23 -0500 Subject: [PATCH 3/3] add paren for clarity --- .../android/src/org/tensorflow/demo/CameraActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tensorflow/examples/android/src/org/tensorflow/demo/CameraActivity.java b/tensorflow/examples/android/src/org/tensorflow/demo/CameraActivity.java index b4de279c004..8bd4abb154a 100644 --- a/tensorflow/examples/android/src/org/tensorflow/demo/CameraActivity.java +++ b/tensorflow/examples/android/src/org/tensorflow/demo/CameraActivity.java @@ -336,7 +336,7 @@ public abstract class CameraActivity extends Activity // Fallback to camera1 API for internal cameras that don't have full support. // This should help with legacy situations where using the camera2 API causes // distorted or otherwise broken previews. - useCamera2API = facing == CameraCharacteristics.LENS_FACING_EXTERNAL + useCamera2API = (facing == CameraCharacteristics.LENS_FACING_EXTERNAL) || isHardwareLevelSupported(characteristics, CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_FULL); LOGGER.i("Camera API lv2?: %s", useCamera2API);