diff options
| author | Tyler Luu <tluu@ti.com> | 2011-11-07 21:46:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-07 21:46:57 +0000 |
| commit | acaf7ec3fa398eea77ad207d71b5453f2227aa00 (patch) | |
| tree | fa639f280ff91bc825d729fd2ce7491a401a6b92 /camera | |
| parent | f5d6dac998ecfbbd4eb21c77520a17f5e0a1cd1a (diff) | |
| parent | 2a7d690c1acd0f61fbd95a532c9703a4cd0af83a (diff) | |
| download | hardware_ti_omap4xxx-acaf7ec3fa398eea77ad207d71b5453f2227aa00.zip hardware_ti_omap4xxx-acaf7ec3fa398eea77ad207d71b5453f2227aa00.tar.gz hardware_ti_omap4xxx-acaf7ec3fa398eea77ad207d71b5453f2227aa00.tar.bz2 | |
am 2a7d690c: am fc8ab094: CameraHal: Clean-up if mCaptureSem times out
* commit '2a7d690c1acd0f61fbd95a532c9703a4cd0af83a':
CameraHal: Clean-up if mCaptureSem times out
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/OMXCameraAdapter/OMXCapture.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/camera/OMXCameraAdapter/OMXCapture.cpp b/camera/OMXCameraAdapter/OMXCapture.cpp index 379cf48..68111b8 100644 --- a/camera/OMXCameraAdapter/OMXCapture.cpp +++ b/camera/OMXCameraAdapter/OMXCapture.cpp @@ -915,7 +915,7 @@ status_t OMXCameraAdapter::stopImageCapture() stopFaceDetection(); //Wait here for the capture to be done, in worst case timeout and proceed with cleanup - ret = mCaptureSem.WaitTimeout(OMX_CAPTURE_TIMEOUT); + mCaptureSem.WaitTimeout(OMX_CAPTURE_TIMEOUT); //If somethiing bad happened while we wait if (mComponentState == OMX_StateInvalid) @@ -924,16 +924,6 @@ status_t OMXCameraAdapter::stopImageCapture() goto EXIT; } - if ( NO_ERROR != ret ) { - ret |= RemoveEvent(mCameraAdapterParameters.mHandleComp, - (OMX_EVENTTYPE) OMX_EventIndexSettingChanged, - OMX_ALL, - OMX_TI_IndexConfigShutterCallback, - NULL); - CAMHAL_LOGEA("Timeout expired on capture sem"); - goto EXIT; - } - // Disable image capture // Capturing command is not needed when capturing in video mode if (mCapMode != VIDEO_MODE) { |