summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeechan Park <heech.park@samsung.com>2011-10-04 18:34:55 -0700
committerWu-cheng Li <wuchengli@google.com>2011-10-05 16:57:02 +0800
commitb7663baff9b88b4d4ac89577b0d04985a316a7c5 (patch)
treefd06fa85d326f0fefc59681d5d292b42e794d0cb
parentf7fb00bf365e9b31fb9eeaa87acda3f1a9c6b792 (diff)
downloadhardware_ti_omap4-b7663baff9b88b4d4ac89577b0d04985a316a7c5.zip
hardware_ti_omap4-b7663baff9b88b4d4ac89577b0d04985a316a7c5.tar.gz
hardware_ti_omap4-b7663baff9b88b4d4ac89577b0d04985a316a7c5.tar.bz2
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
-rw-r--r--camera/OMXCameraAdapter/OMXFocus.cpp15
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;