diff options
| author | Tyler Luu <tluu@ti.com> | 2011-09-20 12:15:58 -0500 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2011-09-22 16:06:51 +0800 |
| commit | bb0d35fb1b006c3973a7104265df32af825eea49 (patch) | |
| tree | c90cb5fdcd573fbce501e83130f32df6022e37f6 /camera/OMXCameraAdapter/OMXCapture.cpp | |
| parent | 0151734329a6b8f5b1b9e42ecb7dfcba8d1e4f03 (diff) | |
| download | hardware_ti_omap4-bb0d35fb1b006c3973a7104265df32af825eea49.zip hardware_ti_omap4-bb0d35fb1b006c3973a7104265df32af825eea49.tar.gz hardware_ti_omap4-bb0d35fb1b006c3973a7104265df32af825eea49.tar.bz2 | |
CameraHal: Changes to 3A lock implementation
1) Only take user set values for AE and AWB locks. Decouple
interaction between AE/AWB locks and AF/takePicture/stopPreview
2) When in CAF mode, if we query AF and see that focus is already
locked, we do not have to call SetConfig for OMX_IndexConfigFocusControl.
Just return the status to upper layers instead.
3) If user doesn't call cancelAutoFocus after a doAutoFocus call, we
need to forcefully unlock AF to ensure we do a scan. This would also
essentially render CAF as normal auto AF.
bug:5356404
Change-Id: I5bb840ca0122d8a9387f72290d2b421703dba23d
Signed-off-by: Tyler Luu <tluu@ti.com>
Diffstat (limited to 'camera/OMXCameraAdapter/OMXCapture.cpp')
| -rw-r--r-- | camera/OMXCameraAdapter/OMXCapture.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/camera/OMXCameraAdapter/OMXCapture.cpp b/camera/OMXCameraAdapter/OMXCapture.cpp index 07c57b0..c82c2c0 100644 --- a/camera/OMXCameraAdapter/OMXCapture.cpp +++ b/camera/OMXCameraAdapter/OMXCapture.cpp @@ -877,8 +877,8 @@ status_t OMXCameraAdapter::stopImageCapture() mStartCaptureSem.Create(0); } - //release any 3A locks if locked - ret = set3ALock(OMX_FALSE, OMX_FALSE, OMX_FALSE); + // Release AF Lock if still held + ret = set3ALock(mUserSetExpLock, mUserSetWbLock, OMX_FALSE); if(ret!=NO_ERROR) { CAMHAL_LOGEB("Error Releaseing 3A locks%d", ret); |