diff options
| author | Emilian Peev <epeev@mm-sol.com> | 2012-02-20 13:50:17 +0200 |
|---|---|---|
| committer | Daniel Levin <dendy@ti.com> | 2012-07-25 08:55:41 -0500 |
| commit | d911ee9616b2cfe5fffb59c4904249fe32c83ca4 (patch) | |
| tree | c40d3cc2d9e11e50c7f07ece7571f7d77fac5cf2 | |
| parent | d6f57f3f5de733f590c584cd5ddfdc43d5073cb2 (diff) | |
| download | hardware_ti_omap4-d911ee9616b2cfe5fffb59c4904249fe32c83ca4.zip hardware_ti_omap4-d911ee9616b2cfe5fffb59c4904249fe32c83ca4.tar.gz hardware_ti_omap4-d911ee9616b2cfe5fffb59c4904249fe32c83ca4.tar.bz2 | |
CameraHal: VFR updates
- Changing the preview port definition will
internally reset the VFR configuration.
An additional call to 'setVFramerate()' is
needed in order the restore the previously
configured range after the preview port
gets set.
Change-Id: I8b88863a9138e454e1489a0980bf875b91a295ad
Signed-off-by: Emilian Peev <epeev@mm-sol.com>
| -rw-r--r-- | camera/OMXCameraAdapter/OMXAlgo.cpp | 5 | ||||
| -rw-r--r-- | camera/OMXCameraAdapter/OMXCameraAdapter.cpp | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/camera/OMXCameraAdapter/OMXAlgo.cpp b/camera/OMXCameraAdapter/OMXAlgo.cpp index ea0db22..be7c457 100644 --- a/camera/OMXCameraAdapter/OMXAlgo.cpp +++ b/camera/OMXCameraAdapter/OMXAlgo.cpp @@ -1103,6 +1103,11 @@ status_t OMXCameraAdapter::setSensorOrientation(unsigned int degree) CAMHAL_LOGEB("Error while configuring format 0x%x", ret); return ret; } + + // Another WA: Setting the port definition will reset the VFR + // configuration. + setVFramerate(mPreviewData->mMinFrameRate, + mPreviewData->mMaxFrameRate); } } diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp index 5181339..df6140d 100644 --- a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp +++ b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp @@ -856,6 +856,11 @@ status_t OMXCameraAdapter::setSensorQuirks(int orientation, if ( NO_ERROR != ret ) { return ret; } + + // Another WA: Setting the port definition will reset the VFR + // configuration. + setVFramerate(portParams.mMinFrameRate, portParams.mMaxFrameRate); + portConfigured = true; } |