diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-09-17 07:00:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-09-17 07:00:58 +0000 |
| commit | c58270be926449ed65aedcd3024cd27dfd40f964 (patch) | |
| tree | 1a0ec358815675839601d31ea9f7e301dacda014 | |
| parent | 18f98ec3fbbc7c7a74eddfa08a5fd39d126b318f (diff) | |
| parent | 02281215f44195822d6fc80d6fa3ca0843431e7d (diff) | |
| download | support-snap-temp-L02900000951182599.tar.gz | |
Merge "Fix the issue that captured images with flash are too dark" into snap-temp-L02900000951182599snap-temp-L02900000951182599
| -rw-r--r-- | camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java b/camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java index 029f057e7ec..c3b362d7003 100644 --- a/camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java +++ b/camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java @@ -230,6 +230,7 @@ public final class ImageCapture extends UseCase { private static final String TAG = "ImageCapture"; @SuppressWarnings("WeakerAccess") /* synthetic accessor */ private static final long CHECK_3A_TIMEOUT_IN_MS = 1000L; + private static final long CHECK_3A_WITH_FLASH_TIMEOUT_IN_MS = 5000L; private static final int MAX_IMAGES = 2; // TODO(b/149336664) Move the quality to a compatibility class when there is a per device case. private static final byte JPEG_QUALITY_MAXIMIZE_QUALITY_MODE = 100; @@ -1421,6 +1422,11 @@ public final class ImageCapture extends UseCase { return Futures.immediateFuture(false); } + long waitTimeout = CHECK_3A_TIMEOUT_IN_MS; + if (state.mIsAePrecaptureTriggered || state.mIsTorchOpened) { + waitTimeout = CHECK_3A_WITH_FLASH_TIMEOUT_IN_MS; + } + return mSessionCallbackChecker.checkCaptureResult( new CaptureCallbackChecker.CaptureResultChecker<Boolean>() { @Override @@ -1438,7 +1444,7 @@ public final class ImageCapture extends UseCase { return null; } }, - CHECK_3A_TIMEOUT_IN_MS, + waitTimeout, false); } |