summaryrefslogtreecommitdiffstats
path: root/camera/inc/OMXCameraAdapter
diff options
context:
space:
mode:
authorTyler Luu <tluu@ti.com>2011-10-21 00:36:22 -0500
committerJames Dong <jdong@google.com>2011-10-26 14:29:10 -0700
commitcb036d78d4d4bf95b99b2e1547a63b0939950bec (patch)
tree3a1db518c2fa26733d7f94c0da5ae2ee58a2de12 /camera/inc/OMXCameraAdapter
parent6efbd6bdff9a72a2768441e912c48606b6957737 (diff)
downloadhardware_ti_omap4-cb036d78d4d4bf95b99b2e1547a63b0939950bec.zip
hardware_ti_omap4-cb036d78d4d4bf95b99b2e1547a63b0939950bec.tar.gz
hardware_ti_omap4-cb036d78d4d4bf95b99b2e1547a63b0939950bec.tar.bz2
CameraHal: Fixes for #testFocusDistance
1. Seperate OMXCameraAdapter cancelAutoFocus with unsetting focus lock. Adding new internal parameter to unlock focus from the cancelAutoFocus in CameraHal. We need to cancel auto focus during stop preview in case it is still running. If we do the unlock in OMXCameraAdapter then, focus distance can change after stopPreview. 2. If autoFocus or takePicture comes after startPreview but before the first preview frame comes, then sometimes the focus distance queried after the calls won't be correct since OMX camera might still be transitioning. 3. Update focus distances when focus is running. b/5473673 Change-Id: I5a27d78aef437a1601a68e8c08fa860f04fc0c55 Signed-off-by: Tyler Luu <tluu@ti.com>
Diffstat (limited to 'camera/inc/OMXCameraAdapter')
-rw-r--r--camera/inc/OMXCameraAdapter/OMXCameraAdapter.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
index f4814c6..2f17ba8 100644
--- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
+++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
@@ -905,6 +905,8 @@ private:
int mLastFrameCount;
unsigned int mIter;
nsecs_t mLastFPSTime;
+ Mutex mFrameCountMutex;
+ Condition mFirstFrameCondition;
size_t mSensorIndex;
CodingMode mCodingMode;