From fbd0084b89fe1c3b7be014d13b15b20a08ed583a Mon Sep 17 00:00:00 2001 From: Sol Boucher Date: Wed, 27 Aug 2014 14:07:41 -0700 Subject: camera2-portability: Fix camera2 takePicture AE regression This fixes a regression introduced by 984a086412a94ebea1bd9af8cd8bbf4afab38034 that resulted in captures sometimes hanging until the AE state changed. It includes explanatory comments to guard against this sort of error in the future. Bug: 17302778 Change-Id: I668f5a5470a0ae7712f62c7574d18360d47e410b --- .../android/ex/camera2/portability/AndroidCamera2AgentImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java index 44f19bc..c4eea50 100644 --- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java +++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java @@ -854,6 +854,9 @@ class AndroidCamera2AgentImpl extends CameraAgent { case CaptureResult.CONTROL_AF_STATE_FOCUSED_LOCKED: case CaptureResult.CONTROL_AF_STATE_NOT_FOCUSED_LOCKED: { + // This check must be made regardless of whether the focus state has + // changed recently to avoid infinite waiting during autoFocus() + // when the algorithm has already either converged or failed to. if (mOneshotAfCallback != null) { // A call to autoFocus() was just made to request a focus lock. // Notify the caller that the lens is now indefinitely fixed, @@ -876,8 +879,7 @@ class AndroidCamera2AgentImpl extends CameraAgent { // might get the final callbacks for an earlier frame after receiving one or // more that correspond to the next one. To prevent our data from oscillating, // we never consider AE states that are older than the last one we've seen. - if (aeState != mCurrentAeState && - result.getFrameNumber() > mLastAeFrameNumber) { + if (result.getFrameNumber() > mLastAeFrameNumber) { mCurrentAeState = aeStateMaybe; mLastAeFrameNumber = result.getFrameNumber(); @@ -885,6 +887,9 @@ class AndroidCamera2AgentImpl extends CameraAgent { case CaptureResult.CONTROL_AE_STATE_CONVERGED: case CaptureResult.CONTROL_AE_STATE_FLASH_REQUIRED: case CaptureResult.CONTROL_AE_STATE_LOCKED: { + // This check must be made regardless of whether the exposure state + // has changed recently to avoid infinite waiting during + // takePicture() when the algorithm has already converged. if (mOneshotCaptureCallback != null) { // A call to takePicture() was just made, and autoexposure // converged so it's time to initiate the capture! -- cgit v1.2.3