From 35d8d2a5f2838b13952fa35f046fbd1a7fd4bc88 Mon Sep 17 00:00:00 2001 From: Emilian Peev Date: Wed, 21 Nov 2012 16:00:35 +0200 Subject: CameraHal: Update profiling argument passing Change-Id: Icbca29fb3af86cd0e4e454ad87add5f5561dceab Signed-off-by: Emilian Peev --- camera/OMXCameraAdapter/OMXCameraAdapter.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'camera') diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp index 9f6dd37..00e19c9 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]; @@ -2472,6 +2477,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) { @@ -3381,7 +3389,7 @@ status_t OMXCameraAdapter::storeProfilingData(OMX_BUFFERHEADERTYPE* pBuffHeader) if ( UNLIKELY( mDebugProfile ) ) { platformPrivate = static_cast (pBuffHeader->pPlatformPrivate); - extraData = getExtradata(platformPrivate->pMetaDataBuffer, + extraData = getExtradata(platformPrivate, static_cast (OMX_TI_ProfilerData)); if ( NULL != extraData ) { -- cgit v1.1 From 13e5f4171777082bf00f48dae3de45522406198e Mon Sep 17 00:00:00 2001 From: Georgi Georgiev Date: Wed, 14 Nov 2012 15:51:13 +0200 Subject: CameraHAL: Add burst flag to ECaptureParamSettings Change-Id: Ie54c27fc00994e1d9617e144396b23b12a380f65 Signed-off-by: Georgi Georgiev --- camera/inc/OMXCameraAdapter/OMXCameraAdapter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'camera') 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) }; -- cgit v1.1