From 123d5456b680b06f4149ab31e1a02e55ed607ca1 Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Sat, 31 Aug 2019 16:03:07 +0200 Subject: [PATCH] Add better logs --- .../cameraview/engine/metering/AutoExposure.java | 8 ++++++-- .../cameraview/engine/metering/AutoFocus.java | 8 ++++++-- .../cameraview/engine/metering/AutoWhiteBalance.java | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/metering/AutoExposure.java b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/metering/AutoExposure.java index 3b36e6c5..ed237b42 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/metering/AutoExposure.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/metering/AutoExposure.java @@ -36,13 +36,17 @@ public class AutoExposure extends MeteringParameter { || aeMode == CameraCharacteristics.CONTROL_AE_MODE_ON_AUTO_FLASH || aeMode == CameraCharacteristics.CONTROL_AE_MODE_ON_AUTO_FLASH_REDEYE || aeMode == 5 /* CameraCharacteristics.CONTROL_AE_MODE_ON_EXTERNAL_FLASH, API 28 */); - return isNotLegacy && isAEOn; + boolean result = isNotLegacy && isAEOn; + LOG.i("checkSupportsProcessing:", result); + return result; } @Override protected boolean checkShouldSkip(@NonNull CaptureResult lastResult) { Integer aeState = lastResult.get(CaptureResult.CONTROL_AE_STATE); - return aeState != null && aeState == CaptureResult.CONTROL_AE_STATE_CONVERGED; + boolean result = aeState != null && aeState == CaptureResult.CONTROL_AE_STATE_CONVERGED; + LOG.i("checkShouldSkip:", result); + return result; } @Override diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/metering/AutoFocus.java b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/metering/AutoFocus.java index 0d98d272..6f5bc0ec 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/metering/AutoFocus.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/metering/AutoFocus.java @@ -25,17 +25,21 @@ public class AutoFocus extends MeteringParameter { @NonNull CaptureRequest.Builder builder) { // Exclude OFF and EDOF as per docs. Integer afMode = builder.get(CaptureRequest.CONTROL_AF_MODE); - return afMode != null && + boolean result = afMode != null && (afMode == CameraCharacteristics.CONTROL_AF_MODE_AUTO || afMode == CameraCharacteristics.CONTROL_AF_MODE_CONTINUOUS_PICTURE || afMode == CameraCharacteristics.CONTROL_AF_MODE_CONTINUOUS_VIDEO || afMode == CameraCharacteristics.CONTROL_AF_MODE_MACRO); + LOG.i("checkSupportsProcessing:", result); + return result; } @Override protected boolean checkShouldSkip(@NonNull CaptureResult lastResult) { Integer afState = lastResult.get(CaptureResult.CONTROL_AF_STATE); - return afState != null && afState == CaptureResult.CONTROL_AF_STATE_FOCUSED_LOCKED; + boolean result = afState != null && afState == CaptureResult.CONTROL_AF_STATE_FOCUSED_LOCKED; + LOG.i("checkShouldSkip:", result); + return result; } @Override diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/metering/AutoWhiteBalance.java b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/metering/AutoWhiteBalance.java index b1ab9f53..28f7fab4 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/metering/AutoWhiteBalance.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/metering/AutoWhiteBalance.java @@ -27,13 +27,17 @@ public class AutoWhiteBalance extends MeteringParameter { CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL, -1) != CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY; Integer awbMode = builder.get(CaptureRequest.CONTROL_AWB_MODE); - return isNotLegacy && awbMode != null && awbMode == CaptureRequest.CONTROL_AWB_MODE_AUTO; + boolean result = isNotLegacy && awbMode != null && awbMode == CaptureRequest.CONTROL_AWB_MODE_AUTO; + LOG.i("checkSupportsProcessing:", result); + return result; } @Override protected boolean checkShouldSkip(@NonNull CaptureResult lastResult) { Integer awbState = lastResult.get(CaptureResult.CONTROL_AWB_STATE); - return awbState != null && awbState == CaptureRequest.CONTROL_AWB_STATE_CONVERGED; + boolean result = awbState != null && awbState == CaptureRequest.CONTROL_AWB_STATE_CONVERGED; + LOG.i("checkShouldSkip:", result); + return result; } @Override