diff options
| author | Jay Wang <jaywang@codeaurora.org> | 2016-04-29 17:24:03 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-08-21 18:45:51 -0700 |
| commit | 2f15393db4fb2d22281578ecfe10e7e27f64a47f (patch) | |
| tree | 9adf59d2ebccb43a4f487fcb28d2323f3f586451 /src/com/android | |
| parent | 43bb58af79bf830401041d61a115fa18e70d5c35 (diff) | |
| download | android_packages_apps_Snap-2f15393db4fb2d22281578ecfe10e7e27f64a47f.tar.gz android_packages_apps_Snap-2f15393db4fb2d22281578ecfe10e7e27f64a47f.tar.bz2 android_packages_apps_Snap-2f15393db4fb2d22281578ecfe10e7e27f64a47f.zip | |
SnapdragonCamera: add OTP calib data support and fix AE state
Add support to receive, parse, and send OTP calibration data
from HAL to ClearSight library and add check for AE convergence
state.
CRs-Fixed: 993611
Change-Id: I52d6b71dc7bde4e08342afee7aa9d41bb9a4dde6
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/camera/CaptureModule.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index d17f8b3b4..052844def 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -253,13 +253,11 @@ public class CaptureModule implements CameraModule, PhotoController, // AF_PASSIVE is added for continous auto focus mode if (CaptureResult.CONTROL_AF_STATE_FOCUSED_LOCKED == afState || CaptureResult.CONTROL_AF_STATE_NOT_FOCUSED_LOCKED == afState || - CaptureRequest.CONTROL_AF_STATE_PASSIVE_FOCUSED == afState || + CaptureResult.CONTROL_AF_STATE_PASSIVE_FOCUSED == afState || CaptureResult.CONTROL_AF_STATE_PASSIVE_UNFOCUSED == afState) { // CONTROL_AE_STATE can be null on some devices - if ((aeState == null - || aeState == CaptureResult.CONTROL_AE_STATE_CONVERGED - || (id == MONO_ID && MODE == DUAL_MODE)) - && isFlashOff()) { + if (aeState == null || (aeState == CaptureResult + .CONTROL_AE_STATE_CONVERGED) && isFlashOff()) { mState[id] = STATE_PICTURE_TAKEN; captureStillPicture(id); } else { @@ -274,7 +272,8 @@ public class CaptureModule implements CameraModule, PhotoController, Log.d(TAG, "STATE_WAITING_PRECAPTURE id: " + id + " aeState:" + aeState); if (aeState == null || aeState == CaptureResult.CONTROL_AE_STATE_PRECAPTURE || - aeState == CaptureRequest.CONTROL_AE_STATE_FLASH_REQUIRED) { + aeState == CaptureResult.CONTROL_AE_STATE_FLASH_REQUIRED || + aeState == CaptureResult.CONTROL_AE_STATE_CONVERGED) { mState[id] = STATE_WAITING_NON_PRECAPTURE; } break; @@ -856,7 +855,7 @@ public class CaptureModule implements CameraModule, PhotoController, Size largest = Collections.max( Arrays.asList(map.getOutputSizes(ImageFormat.YUV_420_888)), new CompareSizesByArea()); - ClearSightImageProcessor.getInstance().init(largest.getWidth(), largest.getHeight()); + ClearSightImageProcessor.getInstance().init(largest.getWidth(), largest.getHeight(), mActivity); ClearSightImageProcessor.getInstance().setCallback(this); } else { // No Clearsight |