diff options
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/OMXCameraAdapter/OMXCapture.cpp | 4 | ||||
| -rw-r--r-- | camera/OMXCameraAdapter/OMXFocus.cpp | 22 |
2 files changed, 15 insertions, 11 deletions
diff --git a/camera/OMXCameraAdapter/OMXCapture.cpp b/camera/OMXCameraAdapter/OMXCapture.cpp index 3480619..e479b2c 100644 --- a/camera/OMXCameraAdapter/OMXCapture.cpp +++ b/camera/OMXCameraAdapter/OMXCapture.cpp @@ -843,8 +843,8 @@ status_t OMXCameraAdapter::startImageCapture() ret = mStartCaptureSem.WaitTimeout(OMX_CAPTURE_TIMEOUT); } - //If somethiing bad happened while we wait - if (mComponentState == OMX_StateInvalid) + //If something bad happened while we wait + if (mComponentState != OMX_StateExecuting) { CAMHAL_LOGEA("Invalid State after Image Capture Exitting!!!"); goto EXIT; diff --git a/camera/OMXCameraAdapter/OMXFocus.cpp b/camera/OMXCameraAdapter/OMXFocus.cpp index b48cfec..d9d4df4 100644 --- a/camera/OMXCameraAdapter/OMXFocus.cpp +++ b/camera/OMXCameraAdapter/OMXFocus.cpp @@ -173,7 +173,7 @@ status_t OMXCameraAdapter::doAutoFocus() // force AF, Ducati will take care of whether CAF // or AF will be performed, depending on light conditions - if ( focusControl.eFocusControl == OMX_IMAGE_FocusControlAuto + if ( focusControl.eFocusControl == OMX_IMAGE_FocusControlAuto && focusStatus.eFocusStatus == OMX_FocusStatusUnableToReach ) { focusControl.eFocusControl = OMX_IMAGE_FocusControlAutoLock; @@ -193,16 +193,20 @@ status_t OMXCameraAdapter::doAutoFocus() CAMHAL_LOGDA("Autofocus started successfully"); } - // configure focus timeout based on capture mode - timeout = (mCapMode == VIDEO_MODE) ? AF_VIDEO_CALLBACK_TIMEOUT : AF_IMAGE_CALLBACK_TIMEOUT; + // configure focus timeout based on capture mode + timeout = (mCapMode == VIDEO_MODE) ? AF_VIDEO_CALLBACK_TIMEOUT : AF_IMAGE_CALLBACK_TIMEOUT; - if(mDoAFSem.WaitTimeout(timeout) != NO_ERROR) { - //If somethiing bad happened while we wait - if (mComponentState == OMX_StateInvalid) { - CAMHAL_LOGEA("Invalid State after Auto Focus Exitting!!!"); - return EINVAL; - } + ret = mDoAFSem.WaitTimeout(timeout); + //If somethiing bad happened while we wait + if (mComponentState == OMX_StateInvalid) { + CAMHAL_LOGEA("Invalid State after Auto Focus Exitting!!!"); + return EINVAL; + } + if( ret != NO_ERROR) { + //Disable auto focus callback from Ducati + setFocusCallback(false); + CAMHAL_LOGEA("Autofocus callback timeout expired"); RemoveEvent(mCameraAdapterParameters.mHandleComp, (OMX_EVENTTYPE) OMX_EventIndexSettingChanged, OMX_ALL, |