From e96008f4b012d51ccc4020761e2cfda38b36749e Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Tue, 3 Sep 2019 23:40:44 +0200 Subject: [PATCH] Enable missing functionality in Snapshot2PictureRecorder --- .../cameraview/engine/Camera2Engine.java | 2 +- .../picture/Snapshot2PictureRecorder.java | 21 ++++++------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera2Engine.java b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera2Engine.java index 5dbb9ec8..01deabae 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera2Engine.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera2Engine.java @@ -235,7 +235,7 @@ public class Camera2Engine extends CameraEngine implements ImageReader.OnImageAv } private void applyRepeatingRequestBuilder(boolean checkStarted, int errorReason) { - if (!checkStarted || getPreviewState() == STATE_STARTED) { + if (getPreviewState() == STATE_STARTED || !checkStarted) { try { mSession.setRepeatingRequest(mRepeatingRequestBuilder.build(), mRepeatingRequestCallback, null); diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/picture/Snapshot2PictureRecorder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/picture/Snapshot2PictureRecorder.java index 41f94506..290de7f8 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/picture/Snapshot2PictureRecorder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/picture/Snapshot2PictureRecorder.java @@ -83,8 +83,7 @@ public class Snapshot2PictureRecorder extends SnapshotGlPictureRecorder implemen @Override public void take() { - // TODO - if (true || !mActionNeeded) { + if (!mActionNeeded) { LOG.i("take:", "Engine does no metering or needs no flash, taking fast snapshot."); super.take(); } else { @@ -121,17 +120,10 @@ public class Snapshot2PictureRecorder extends SnapshotGlPictureRecorder implemen @Override public void onLocked(boolean success) { LOG.i("onLocked:", "Parameters locked, opening torch."); - if (false) { - mState = STATE_WAITING_TORCH; - mBuilder.set(CaptureRequest.FLASH_MODE, CaptureRequest.FLASH_MODE_TORCH); - mBuilder.set(CaptureRequest.CONTROL_AE_MODE, CaptureRequest.CONTROL_AE_MODE_ON); - applyBuilder(); - } else { - // TODO - LOG.e("Early taking image."); - mState = STATE_WAITING_IMAGE; - super.take(); - } + mState = STATE_WAITING_TORCH; + mBuilder.set(CaptureRequest.FLASH_MODE, CaptureRequest.FLASH_MODE_TORCH); + mBuilder.set(CaptureRequest.CONTROL_AE_MODE, CaptureRequest.CONTROL_AE_MODE_ON); + applyBuilder(); } public void onCaptureCompleted(@NonNull TotalCaptureResult result) { @@ -159,8 +151,7 @@ public class Snapshot2PictureRecorder extends SnapshotGlPictureRecorder implemen @Override protected void dispatchResult() { - // TODO - if (false && mState == STATE_WAITING_IMAGE) { + if (mState == STATE_WAITING_IMAGE) { // Revert our changes. LOG.i("dispatchResult:", "Reverting the flash changes."); try {