diff options
| author | Tyler Luu <tluu@ti.com> | 2011-08-15 23:57:24 -0500 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2011-08-23 18:11:57 +0800 |
| commit | aa6e62e279cb54ae76c55ba9f8d02da230ce34e7 (patch) | |
| tree | f0b425293d804f3f459b1f9dd509f73b90d65b01 /camera/OMXCameraAdapter/OMXCapture.cpp | |
| parent | 00fd87fc096d092bfbe3579cd7fe2c1824e6eac0 (diff) | |
| download | hardware_ti_omap4xxx-aa6e62e279cb54ae76c55ba9f8d02da230ce34e7.tar.gz hardware_ti_omap4xxx-aa6e62e279cb54ae76c55ba9f8d02da230ce34e7.tar.bz2 hardware_ti_omap4xxx-aa6e62e279cb54ae76c55ba9f8d02da230ce34e7.zip | |
CameraHal: Adjust FD callbacks to updated javadoc
FD callback behavior is updated in latest javadoc
patch "Improve camera face detection javadoc."
Change-Id: I963628ae55eec62083c25d34bbb380ae6673e431
Signed-off-by: Tyler Luu <tluu@ti.com>
Diffstat (limited to 'camera/OMXCameraAdapter/OMXCapture.cpp')
| -rw-r--r-- | camera/OMXCameraAdapter/OMXCapture.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/camera/OMXCameraAdapter/OMXCapture.cpp b/camera/OMXCameraAdapter/OMXCapture.cpp index 079a072..f6e26c9 100644 --- a/camera/OMXCameraAdapter/OMXCapture.cpp +++ b/camera/OMXCameraAdapter/OMXCapture.cpp @@ -701,6 +701,9 @@ status_t OMXCameraAdapter::startImageCapture() return NO_INIT; } + // Camera framework doesn't expect face callbacks once capture is triggered + pauseFaceDetection(true); + //During bracketing image capture is already active { Mutex::Autolock lock(mBracketingLock); @@ -850,6 +853,10 @@ status_t OMXCameraAdapter::stopImageCapture() CAMHAL_LOGEB("Error Releaseing 3A locks%d", ret); } + // After capture, face detection should be disabled + // and application needs to restart face detection + stopFaceDetection(); + //Wait here for the capture to be done, in worst case timeout and proceed with cleanup ret = mCaptureSem.WaitTimeout(OMX_CAPTURE_TIMEOUT); if ( NO_ERROR != ret ) { |