diff options
| author | Daniel Levin <dendy@ti.com> | 2012-12-05 15:47:26 +0200 |
|---|---|---|
| committer | Daniel Levin <dendy@ti.com> | 2012-12-05 15:47:36 +0200 |
| commit | cf3c3da0c0b2b033cd3b6aa9835a5b1559110fd0 (patch) | |
| tree | 23f81abc13ac7a3bc95050bef451998ca4f072b8 /camera | |
| parent | fea025262821c36c01440fadd68343a5ddd873d6 (diff) | |
| parent | 13e5f4171777082bf00f48dae3de45522406198e (diff) | |
| download | hardware_ti_omap4-cf3c3da0c0b2b033cd3b6aa9835a5b1559110fd0.zip hardware_ti_omap4-cf3c3da0c0b2b033cd3b6aa9835a5b1559110fd0.tar.gz hardware_ti_omap4-cf3c3da0c0b2b033cd3b6aa9835a5b1559110fd0.tar.bz2 | |
Merge branch 'd-jb-mr0-release-camera' into p-jb-mr1-release
Change-Id: I3feec53fce7f847398420b89e2e8cc2b1045cca3
Signed-off-by: Daniel Levin <dendy@ti.com>
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/OMXCameraAdapter/OMXCameraAdapter.cpp | 10 | ||||
| -rw-r--r-- | camera/inc/OMXCameraAdapter/OMXCameraAdapter.h | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp index a559703..75bde38 100644 --- a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp +++ b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp @@ -2220,6 +2220,11 @@ status_t OMXCameraAdapter::startPreview() if ( OMX_ErrorNone == eError) { ret |= setExtraData(true, mCameraAdapterParameters.mPrevPortIndex, OMX_AncillaryData); ret |= setExtraData(true, OMX_ALL, OMX_TI_VectShotInfo); +#ifdef CAMERAHAL_OMX_PROFILING + if ( UNLIKELY( mDebugProfile ) ) { + ret |= setExtraData(true, OMX_ALL, OMX_TI_ProfilerData); + } +#endif } mPreviewData = &mCameraAdapterParameters.mCameraPortParams[mCameraAdapterParameters.mPrevPortIndex]; @@ -2475,6 +2480,9 @@ status_t OMXCameraAdapter::stopPreview() { OMX_ERRORTYPE eError = OMX_ErrorNone; status_t ret = NO_ERROR; +#ifdef CAMERAHAL_OMX_PROFILING + ret |= setExtraData(false, OMX_ALL, OMX_TI_ProfilerData); +#endif if (mTunnelDestroyed == false){ ret = destroyTunnel(); if (ret == ALREADY_EXISTS) { @@ -3384,7 +3392,7 @@ status_t OMXCameraAdapter::storeProfilingData(OMX_BUFFERHEADERTYPE* pBuffHeader) if ( UNLIKELY( mDebugProfile ) ) { platformPrivate = static_cast<OMX_TI_PLATFORMPRIVATE *> (pBuffHeader->pPlatformPrivate); - extraData = getExtradata(platformPrivate->pMetaDataBuffer, + extraData = getExtradata(platformPrivate, static_cast<OMX_EXTRADATATYPE> (OMX_TI_ProfilerData)); if ( NULL != extraData ) { diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h index b2da574..4f89215 100644 --- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h +++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h @@ -264,7 +264,7 @@ public: SetRotation = 1 << 4, ECaptureSettingMax, ECapturesettingsAll = ( ((ECaptureSettingMax -1 ) << 1) -1 ), /// all possible flags raised - ECaptureParamSettings = SetFormat | SetThumb | SetQuality, // Settings set with SetParam + ECaptureParamSettings = SetFormat | SetThumb | SetQuality | SetBurstExpBracket, // Settings set with SetParam ECaptureConfigSettings = (ECapturesettingsAll & ~ECaptureParamSettings) }; |