diff options
| author | Kyle Repinski <repinski23@gmail.com> | 2015-01-06 23:50:55 -0600 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2015-04-11 20:24:52 +0200 |
| commit | c52c76fa1593f374173a818b4de5bd7c51903fbc (patch) | |
| tree | 9235f74121a9acd3f90cf53435df2a7799b80cd6 /camera/OMXCameraAdapter/OMXFocus.cpp | |
| parent | 0f63d0e84746ec4e3851ac5456e165f3365a42f6 (diff) | |
| download | device_samsung_tuna-c52c76fa1593f374173a818b4de5bd7c51903fbc.zip device_samsung_tuna-c52c76fa1593f374173a818b4de5bd7c51903fbc.tar.gz device_samsung_tuna-c52c76fa1593f374173a818b4de5bd7c51903fbc.tar.bz2 | |
camera: More-or-less disable face detection.
This is causing a lot of problems.
Diffstat (limited to 'camera/OMXCameraAdapter/OMXFocus.cpp')
| -rw-r--r-- | camera/OMXCameraAdapter/OMXFocus.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/camera/OMXCameraAdapter/OMXFocus.cpp b/camera/OMXCameraAdapter/OMXFocus.cpp index 32478af..f584184 100644 --- a/camera/OMXCameraAdapter/OMXFocus.cpp +++ b/camera/OMXCameraAdapter/OMXFocus.cpp @@ -110,8 +110,10 @@ status_t OMXCameraAdapter::doAutoFocus() OMX_INIT_STRUCT_PTR (&focusStatus, OMX_PARAM_FOCUSSTATUSTYPE); +#ifndef OMAP_TUNA // If the app calls autoFocus, the camera will stop sending face callbacks. pauseFaceDetection(true); +#endif // This is needed for applying FOCUS_REGION correctly if ( (!mFocusAreas.isEmpty()) && (!mFocusAreas.itemAt(0)->isZeroArea())) @@ -319,8 +321,10 @@ status_t OMXCameraAdapter::cancelAutoFocus() // re-apply CAF after unlocking and canceling // mPending3Asettings |= SetFocus; } +#ifndef OMAP_TUNA // If the apps call #cancelAutoFocus()}, the face callbacks will also resume. pauseFaceDetection(false); +#endif LOG_FUNCTION_NAME_EXIT; @@ -472,8 +476,10 @@ status_t OMXCameraAdapter::returnFocusStatus(bool timeoutReached) notifyFocusSubscribers(focusStatus); } +#ifndef OMAP_TUNA // After focus, face detection will resume sending face callbacks pauseFaceDetection(false); +#endif LOG_FUNCTION_NAME_EXIT; |