summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmytro Vasylenko <x0178436@ti.com>2013-02-01 14:24:26 +0200
committerHashcode <hashcode0f@gmail.com>2015-02-03 13:38:33 -0800
commit36abd1f5030c36d32b7d139e0989b04c7c02fa9c (patch)
treed8a9ca448469090f94c1d09159fa5bedb1dd2651
parent0da39f328913b05ae03dc7b53a2326c44b03aaf1 (diff)
downloadhardware_ti_omap4-36abd1f5030c36d32b7d139e0989b04c7c02fa9c.zip
hardware_ti_omap4-36abd1f5030c36d32b7d139e0989b04c7c02fa9c.tar.gz
hardware_ti_omap4-36abd1f5030c36d32b7d139e0989b04c7c02fa9c.tar.bz2
CameraHAL: Fix for Autofocus callback timeout expired
Prevent waiting for callback of failed AF in ducati. Just retriggering it. Change-Id: Ie7305bc98a6391adbdc410f60bfe23222b0d1e39 Signed-off-by: Dmytro Vasylenko <x0178436@ti.com>
-rw-r--r--camera/OMXCameraAdapter/OMXFocus.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/camera/OMXCameraAdapter/OMXFocus.cpp b/camera/OMXCameraAdapter/OMXFocus.cpp
index 386fff3..31e5560 100644
--- a/camera/OMXCameraAdapter/OMXFocus.cpp
+++ b/camera/OMXCameraAdapter/OMXFocus.cpp
@@ -177,7 +177,8 @@ status_t OMXCameraAdapter::doAutoFocus()
// force AF, Ducati will take care of whether CAF
// or AF will be performed, depending on light conditions
if ( focusControl.eFocusControl == OMX_IMAGE_FocusControlAuto &&
- ( focusStatus.eFocusStatus == OMX_FocusStatusUnableToReach ||
+ ( focusStatus.eFocusStatus == OMX_FocusStatusRequest ||
+ focusStatus.eFocusStatus == OMX_FocusStatusUnableToReach ||
focusStatus.eFocusStatus == OMX_FocusStatusLost ) ) {
focusControl.eFocusControl = OMX_IMAGE_FocusControlAutoLock;
}