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/OMXCameraAdapter.cpp | |
| parent | 00fd87fc096d092bfbe3579cd7fe2c1824e6eac0 (diff) | |
| download | hardware_ti_omap4xxx-aa6e62e279cb54ae76c55ba9f8d02da230ce34e7.zip hardware_ti_omap4xxx-aa6e62e279cb54ae76c55ba9f8d02da230ce34e7.tar.gz hardware_ti_omap4xxx-aa6e62e279cb54ae76c55ba9f8d02da230ce34e7.tar.bz2 | |
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/OMXCameraAdapter.cpp')
| -rw-r--r-- | camera/OMXCameraAdapter/OMXCameraAdapter.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp index 131072c..493adce 100644 --- a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp +++ b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp @@ -315,6 +315,7 @@ status_t OMXCameraAdapter::initialize(CameraProperties::Properties* caps, int se memset(mExposureBracketingValues, 0, EXP_BRACKET_RANGE*sizeof(int)); mMeasurementEnabled = false; mFaceDetectionRunning = false; + mFaceDetectionPaused = false; memset(&mCameraAdapterParameters.mCameraPortParams[mCameraAdapterParameters.mImagePortIndex], 0, sizeof(OMXCameraPortParameters)); memset(&mCameraAdapterParameters.mCameraPortParams[mCameraAdapterParameters.mPrevPortIndex], 0, sizeof(OMXCameraPortParameters)); @@ -2663,7 +2664,7 @@ OMX_ERRORTYPE OMXCameraAdapter::OMXCameraAdapterFillBufferDone(OMX_IN OMX_HANDLE { Mutex::Autolock lock(mFaceDetectionLock); - if ( mFaceDetectionRunning ) { + if ( mFaceDetectionRunning && !mFaceDetectionPaused ) { detectFaces(pBuffHeader, fdResult, pPortParam->mWidth, pPortParam->mHeight); if ( NULL != fdResult.get() ) { notifyFaceSubscribers(fdResult); |