aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/examples
diff options
context:
space:
mode:
authorGravatar Andrew Harp <andrewharp@users.noreply.github.com>2017-12-07 12:31:45 -0500
committerGravatar GitHub <noreply@github.com>2017-12-07 12:31:45 -0500
commitdac4cbd4602b742532102f8953641ff301363fbe (patch)
treea3837ad325593bfe79ffac0c1cd67fac91935af5 /tensorflow/examples
parentd69b292a753de409fb46916e80f87bd999144456 (diff)
Update CameraActivity.java
reformat and add comment
Diffstat (limited to 'tensorflow/examples')
-rw-r--r--tensorflow/examples/android/src/org/tensorflow/demo/CameraActivity.java9
1 files 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 bd45e44537..b4de279c00 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;
}