diff options
| author | Daniel Levin <dendy@ti.com> | 2012-07-25 16:21:42 -0500 |
|---|---|---|
| committer | Daniel Levin <dendy@ti.com> | 2012-07-25 16:21:42 -0500 |
| commit | 39d50eecaa890262e491ad27cceda3f7e67deaed (patch) | |
| tree | 870c4b69ddfd6e2ede4cf6e0e6fbd9d651a74ebc /camera/AppCallbackNotifier.cpp | |
| parent | 5853dcae469721a87220cc72c34104e839f880c7 (diff) | |
| parent | 1ec22866752ed94071f2d8ed2ca2a4bd724bd36c (diff) | |
| download | hardware_ti_omap4-39d50eecaa890262e491ad27cceda3f7e67deaed.zip hardware_ti_omap4-39d50eecaa890262e491ad27cceda3f7e67deaed.tar.gz hardware_ti_omap4-39d50eecaa890262e491ad27cceda3f7e67deaed.tar.bz2 | |
Merge "CameraHal: Implementation for CAF status callbacks" into jb-migration
Change-Id: Ib1a12a16fd0fb2457c2ff9793b3628dbae31c992
Signed-off-by: Daniel Levin <dendy@ti.com>
Diffstat (limited to 'camera/AppCallbackNotifier.cpp')
| -rw-r--r-- | camera/AppCallbackNotifier.cpp | 44 |
1 files changed, 31 insertions, 13 deletions
diff --git a/camera/AppCallbackNotifier.cpp b/camera/AppCallbackNotifier.cpp index 8829b65..44d6a39 100644 --- a/camera/AppCallbackNotifier.cpp +++ b/camera/AppCallbackNotifier.cpp @@ -367,20 +367,38 @@ void AppCallbackNotifier::notifyEvent() case CameraHalEvent::EVENT_FOCUS_LOCKED: case CameraHalEvent::EVENT_FOCUS_ERROR: + if ( mCameraHal && mNotifyCb ) { + focusEvtData = &evt->mEventData->focusEvent; + + switch ( focusEvtData->focusStatus ) { + case CameraHalEvent::FOCUS_STATUS_SUCCESS: + if ( mCameraHal->msgTypeEnabled(CAMERA_MSG_FOCUS) ) { + mCameraHal->disableMsgType(CAMERA_MSG_FOCUS); + mNotifyCb(CAMERA_MSG_FOCUS, true, 0, mCallbackCookie); + } + break; - focusEvtData = &evt->mEventData->focusEvent; - if ( ( focusEvtData->focusStatus == CameraHalEvent::FOCUS_STATUS_SUCCESS ) && - ( NULL != mCameraHal ) && - ( NULL != mNotifyCb ) && - ( mCameraHal->msgTypeEnabled(CAMERA_MSG_FOCUS) ) ) { - mCameraHal->disableMsgType(CAMERA_MSG_FOCUS); - mNotifyCb(CAMERA_MSG_FOCUS, true, 0, mCallbackCookie); - } else if ( ( focusEvtData->focusStatus == CameraHalEvent::FOCUS_STATUS_FAIL ) && - ( NULL != mCameraHal ) && - ( NULL != mNotifyCb ) && - ( mCameraHal->msgTypeEnabled(CAMERA_MSG_FOCUS) ) ) { - mCameraHal->disableMsgType(CAMERA_MSG_FOCUS); - mNotifyCb(CAMERA_MSG_FOCUS, false, 0, mCallbackCookie); + case CameraHalEvent::FOCUS_STATUS_FAIL: + if ( mCameraHal->msgTypeEnabled(CAMERA_MSG_FOCUS) ) { + mCameraHal->disableMsgType(CAMERA_MSG_FOCUS); + mNotifyCb(CAMERA_MSG_FOCUS, false, 0, mCallbackCookie); + } + break; + +#ifdef ANDROID_API_JB_OR_LATER + case CameraHalEvent::FOCUS_STATUS_PENDING: + if ( mCameraHal->msgTypeEnabled(CAMERA_MSG_FOCUS_MOVE) ) { + mNotifyCb(CAMERA_MSG_FOCUS_MOVE, true, 0, mCallbackCookie); + } + break; + + case CameraHalEvent::FOCUS_STATUS_DONE: + if ( mCameraHal->msgTypeEnabled(CAMERA_MSG_FOCUS_MOVE) ) { + mNotifyCb(CAMERA_MSG_FOCUS_MOVE, false, 0, mCallbackCookie); + } + break; +#endif + } } break; |