diff options
| author | Keith Deacon <kdeacon@ti.com> | 2012-09-21 18:18:51 -0500 |
|---|---|---|
| committer | Daniel Levin <dendy@ti.com> | 2012-11-26 18:42:16 +0200 |
| commit | 0b2e0f2ffa0102de14856e16bb2ce8df30b71d10 (patch) | |
| tree | 1b7f13e91df2a2d9fb60f8ac79bcb3ca0e12f8a6 /camera/OMXCameraAdapter | |
| parent | 2a358c2f010664425dc8ba4695cc1132ef2affc9 (diff) | |
| parent | f25f76de80ce7ff4f942d53867277815ef767f21 (diff) | |
| download | hardware_ti_omap4-0b2e0f2ffa0102de14856e16bb2ce8df30b71d10.zip hardware_ti_omap4-0b2e0f2ffa0102de14856e16bb2ce8df30b71d10.tar.gz hardware_ti_omap4-0b2e0f2ffa0102de14856e16bb2ce8df30b71d10.tar.bz2 | |
Merge p-jb-release into d-jb-release
Change-Id: I649b0c53d1c0e8f56e059a3cb24a38089d8fccc4
Diffstat (limited to 'camera/OMXCameraAdapter')
| -rw-r--r-- | camera/OMXCameraAdapter/OMXAlgo.cpp | 3 | ||||
| -rw-r--r-- | camera/OMXCameraAdapter/OMXCameraAdapter.cpp | 2 | ||||
| -rw-r--r-- | camera/OMXCameraAdapter/OMXCapture.cpp | 17 |
3 files changed, 21 insertions, 1 deletions
diff --git a/camera/OMXCameraAdapter/OMXAlgo.cpp b/camera/OMXCameraAdapter/OMXAlgo.cpp index c64654a..759b514 100644 --- a/camera/OMXCameraAdapter/OMXAlgo.cpp +++ b/camera/OMXCameraAdapter/OMXAlgo.cpp @@ -52,6 +52,9 @@ status_t OMXCameraAdapter::setParametersAlgo(const android::CameraParameters &pa } else if (strcmp(valstr, (const char *) TICameraParameters::EXPOSURE_BRACKETING) == 0) { capMode = OMXCameraAdapter::HIGH_SPEED; mCapabilitiesOpMode = MODE_HIGH_SPEED; + } else if (strcmp(valstr, (const char *) TICameraParameters::ZOOM_BRACKETING) == 0) { + capMode = OMXCameraAdapter::HIGH_SPEED; + mCapabilitiesOpMode = MODE_HIGH_SPEED; } else if (strcmp(valstr, (const char *) TICameraParameters::HIGH_QUALITY_MODE) == 0) { capMode = OMXCameraAdapter::HIGH_QUALITY; mCapabilitiesOpMode = MODE_HIGH_QUALITY; diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp index e63cf02..e4af7fa 100644 --- a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp +++ b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp @@ -3336,7 +3336,7 @@ static void debugShowFPS() mFps = ((mFrameCount - mLastFrameCount) * float(s2ns(1))) / diff; mLastFpsTime = now; mLastFrameCount = mFrameCount; - CAMHAL_LOGD("Camera %d Frames, %f FPS", mFrameCount, mFps); + CAMHAL_LOGI("Camera %d Frames, %f FPS", mFrameCount, mFps); } // XXX: mFPS has the value we want } diff --git a/camera/OMXCameraAdapter/OMXCapture.cpp b/camera/OMXCameraAdapter/OMXCapture.cpp index 0f911ef..8b38989 100644 --- a/camera/OMXCameraAdapter/OMXCapture.cpp +++ b/camera/OMXCameraAdapter/OMXCapture.cpp @@ -1389,6 +1389,23 @@ status_t OMXCameraAdapter::stopImageCapture() } mStartCaptureSem.Create(0); } + } else if (CP_CAM == mCapMode) { + // Reset shot config queue + OMX_TI_CONFIG_ENQUEUESHOTCONFIGS resetShotConfigs; + OMX_INIT_STRUCT_PTR(&resetShotConfigs, OMX_TI_CONFIG_ENQUEUESHOTCONFIGS); + + resetShotConfigs.nPortIndex = mCameraAdapterParameters.mImagePortIndex; + resetShotConfigs.bFlushQueue = OMX_TRUE; + resetShotConfigs.nNumConfigs = 0; + eError = OMX_SetConfig(mCameraAdapterParameters.mHandleComp, + ( OMX_INDEXTYPE ) OMX_TI_IndexConfigEnqueueShotConfigs, + &resetShotConfigs); + if ( OMX_ErrorNone != eError ) { + CAMHAL_LOGEB("Error while reset shot config 0x%x", eError); + goto EXIT; + } else { + CAMHAL_LOGDA("Shot config reset successfully"); + } } //Wait here for the capture to be done, in worst case timeout and proceed with cleanup |