diff options
| author | Milen Mitkov <mmitkov@mm-sol.com> | 2011-10-28 16:26:35 +0300 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2011-10-31 17:29:22 -0700 |
| commit | 3c272a993dfc4ca153b09e5ec1e651f75eab90c4 (patch) | |
| tree | 00ebbf1c3eec0bd8e02468ef6270c645c83269eb /camera/OMXCameraAdapter/OMXCameraAdapter.cpp | |
| parent | cf0a61f13533d70cb7ad700330de94142c2afe6a (diff) | |
| download | hardware_ti_omap4xxx-3c272a993dfc4ca153b09e5ec1e651f75eab90c4.tar.gz hardware_ti_omap4xxx-3c272a993dfc4ca153b09e5ec1e651f75eab90c4.tar.bz2 hardware_ti_omap4xxx-3c272a993dfc4ca153b09e5ec1e651f75eab90c4.zip | |
CameraHAL: Return status after CAF finishes
If the user initiates autofocus while CAF
is scanning (e.g. when capturing),
wait until CAF finishes and just then
notify the focus subscribers.
bug:5514415
Change-Id: I971783c74f9977755cc93cdba964e4fcd3a2ab0a
Signed-off-by: Milen Mitkov <mmitkov@mm-sol.com>
Diffstat (limited to 'camera/OMXCameraAdapter/OMXCameraAdapter.cpp')
| -rwxr-xr-x | camera/OMXCameraAdapter/OMXCameraAdapter.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp index faed67e..15fceec 100755 --- a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp +++ b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp @@ -225,7 +225,7 @@ status_t OMXCameraAdapter::initialize(CameraProperties::Properties* caps) { if( ret == INVALID_OPERATION){ CAMHAL_LOGDA("command handler thread already runnning!!"); - ret = NO_ERROR; + ret = NO_ERROR; } else { CAMHAL_LOGEA("Couldn't run command handlerthread"); @@ -248,7 +248,7 @@ status_t OMXCameraAdapter::initialize(CameraProperties::Properties* caps) { if( ret == INVALID_OPERATION){ CAMHAL_LOGDA("omx callback handler thread already runnning!!"); - ret = NO_ERROR; + ret = NO_ERROR; }else { CAMHAL_LOGEA("Couldn't run omx callback handler thread"); @@ -1883,6 +1883,12 @@ status_t OMXCameraAdapter::startPreview() if ( mPending3Asettings ) apply3Asettings(mParameters3A); + // enable focus callbacks just once here + // fixes an issue with slow callback registration in Ducati + if ( NO_ERROR == ret ) { + ret = setFocusCallback(true); + } + //reset frame rate estimates mFPS = 0.0f; mLastFPS = 0.0f; @@ -3600,4 +3606,3 @@ extern "C" int CameraAdapter_Capabilities(CameraProperties::Properties* properti /*--------------------Camera Adapter Class ENDS here-----------------------------*/ - |