summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorEmilian Peev <epeev@mm-sol.com>2011-11-30 15:27:38 +0200
committerWu-cheng Li <wuchengli@google.com>2012-04-11 18:45:44 +0800
commit96f2b555d2200fca7d8399c4c9a968590637aa31 (patch)
tree68028e7a45fa0e24f35c4813b9d837ab80a16ec3 /camera
parente914b7e0a972af85845268ecf962773b8e4da977 (diff)
downloadhardware_ti_omap4xxx-96f2b555d2200fca7d8399c4c9a968590637aa31.zip
hardware_ti_omap4xxx-96f2b555d2200fca7d8399c4c9a968590637aa31.tar.gz
hardware_ti_omap4xxx-96f2b555d2200fca7d8399c4c9a968590637aa31.tar.bz2
CameraHAL: Fix for CTS test #testFocusDistances
- The 'focusStatus' variable in 'doAutoFocus()' is uninitialized in the case where the camera client sets focus lock in CAF mode. Depending on the current stack content this method might try to set CAF focus again and wait for a focus callback, which will inevitably timeout. - Fix for random fails during CTS test #testFocusDistances. Change-Id: Iafa84bbf5b7119d77f1f666a6a88c613b657541e Signed-off-by: Emilian Peev <epeev@mm-sol.com>
Diffstat (limited to 'camera')
-rw-r--r--camera/OMXCameraAdapter/OMXFocus.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/camera/OMXCameraAdapter/OMXFocus.cpp b/camera/OMXCameraAdapter/OMXFocus.cpp
index 5703610..50e2c21 100644
--- a/camera/OMXCameraAdapter/OMXFocus.cpp
+++ b/camera/OMXCameraAdapter/OMXFocus.cpp
@@ -108,6 +108,8 @@ status_t OMXCameraAdapter::doAutoFocus()
return NO_ERROR;
}
+ OMX_INIT_STRUCT_PTR (&focusStatus, OMX_PARAM_FOCUSSTATUSTYPE);
+
// If the app calls autoFocus, the camera will stop sending face callbacks.
pauseFaceDetection(true);