diff options
| author | Tyler Luu <tluu@ti.com> | 2011-10-21 00:36:22 -0500 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2011-10-26 14:29:10 -0700 |
| commit | fd705eb8b757a4f3d1d80b736cf20cade04524d7 (patch) | |
| tree | 3431416f492463b55cc2dbd0e754a4f870b74842 /camera/inc/OMXCameraAdapter/OMXCameraAdapter.h | |
| parent | 20107c0eaacde4f440d84f0643515451545ef601 (diff) | |
| download | omap4xxx-omapzoom-fd705eb8b757a4f3d1d80b736cf20cade04524d7.tar.gz | |
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/OMXCameraAdapter.h')
| -rw-r--r-- | camera/inc/OMXCameraAdapter/OMXCameraAdapter.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h index f4814c63..2f17ba86 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; |