diff options
| author | Emilian Peev <epeev@mm-sol.com> | 2012-11-05 16:19:35 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-05 16:19:35 -0800 |
| commit | a0763482ea8c9cb1bf48e9c5f103858bf1e49e4e (patch) | |
| tree | 5f34282b3eb2cf6404778e64d3cae677542d8de7 /camera/inc/OMXCameraAdapter/OMXCameraAdapter.h | |
| parent | 29bbc4a6bc001c3255931dded77a5112c5496874 (diff) | |
| parent | 646723c06120cc9344463f6b3f001178e606838f (diff) | |
| download | omap4xxx-omapzoom-a0763482ea8c9cb1bf48e9c5f103858bf1e49e4e.tar.gz | |
am 646723c0: am b96dffd4: CameraHal: Sync AF cancel with incoming OMX events
* commit '646723c06120cc9344463f6b3f001178e606838f':
CameraHal: Sync AF cancel with incoming OMX events
Diffstat (limited to 'camera/inc/OMXCameraAdapter/OMXCameraAdapter.h')
| -rw-r--r-- | camera/inc/OMXCameraAdapter/OMXCameraAdapter.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h index 59c5efc9..1f1fd9f7 100644 --- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h +++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h @@ -939,6 +939,10 @@ private: Mutex mFrameCountMutex; Condition mFirstFrameCondition; + static const nsecs_t CANCEL_AF_TIMEOUT; + Mutex mCancelAFMutex; + Condition mCancelAFCond; + Mutex mDoAFMutex; Condition mDoAFCond; |