diff options
| author | Heechan Park <heech.park@samsung.com> | 2011-10-04 18:34:55 -0700 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2011-10-05 16:57:02 +0800 |
| commit | f50bf42f39a1d1ca8505d198b41c557e8ca83668 (patch) | |
| tree | 6031031d85bab61312ef1975f2c6346a4fe19d61 /camera | |
| parent | 9316cd2d737dfd1baab83efd7c54dbd75ab8f96e (diff) | |
| download | omap4xxx-f50bf42f39a1d1ca8505d198b41c557e8ca83668.tar.gz | |
Enabling Fast Shot2shot by disabling AF scan in the CAF mode
bug:5219431
Signed-off-by: Heechan Park <heech.park@samsung.com>
Change-Id: I5659f94273e6e4b79395742edb00799a64ecfd46
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/OMXCameraAdapter/OMXFocus.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/camera/OMXCameraAdapter/OMXFocus.cpp b/camera/OMXCameraAdapter/OMXFocus.cpp index 692e60a..24b1d6b 100644 --- a/camera/OMXCameraAdapter/OMXFocus.cpp +++ b/camera/OMXCameraAdapter/OMXFocus.cpp @@ -106,10 +106,6 @@ status_t OMXCameraAdapter::doAutoFocus() CAMHAL_LOGDA("AE/AWB unlocked successfully"); } - // if we are in CAF...then force normal AF - if (mParameters3A.Focus == OMX_IMAGE_FocusControlAuto) { - focusControl.eFocusControl = OMX_IMAGE_FocusControlAutoLock; - } } else if ( mParameters3A.Focus == OMX_IMAGE_FocusControlAuto ) { // In case we have CAF running we should first check the AF status. // If it has managed to lock, then do as usual and return status @@ -122,10 +118,6 @@ status_t OMXCameraAdapter::doAutoFocus() } else { CAMHAL_LOGDB("Focus status check 0x%x!", focusStatus.eFocusStatus); } - - if ( OMX_FocusStatusReached != focusStatus.eFocusStatus ) { - focusControl.eFocusControl = OMX_IMAGE_FocusControlAutoLock; - } } if ( ( focusControl.eFocusControl != OMX_IMAGE_FocusControlAuto ) && @@ -178,15 +170,10 @@ status_t OMXCameraAdapter::doAutoFocus() } else { // Focus mode in continuous if ( NO_ERROR == ret ) { ret = returnFocusStatus(false); + mPending3Asettings |= SetFocus; } } - //Restore CAF if needed - if ( ( mParameters3A.Focus == OMX_IMAGE_FocusControlAuto ) && - ( focusControl.eFocusControl == OMX_IMAGE_FocusControlAutoLock ) ) { - mPending3Asettings |= SetFocus; - } - LOG_FUNCTION_NAME_EXIT; return ret; |