diff options
Diffstat (limited to 'camera/OMXCameraAdapter/OMXAlgo.cpp')
| -rw-r--r-- | camera/OMXCameraAdapter/OMXAlgo.cpp | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/camera/OMXCameraAdapter/OMXAlgo.cpp b/camera/OMXCameraAdapter/OMXAlgo.cpp index d163ef2..6855d56 100644 --- a/camera/OMXCameraAdapter/OMXAlgo.cpp +++ b/camera/OMXCameraAdapter/OMXAlgo.cpp @@ -64,6 +64,9 @@ status_t OMXCameraAdapter::setParametersAlgo(const android::CameraParameters &pa } else if (strcmp(valstr, (const char *) TICameraParameters::VIDEO_MODE) == 0) { capMode = OMXCameraAdapter::VIDEO_MODE; mCapabilitiesOpMode = MODE_VIDEO; + } else if (strcmp(valstr, (const char *) TICameraParameters::VIDEO_MODE_HQ) == 0) { + capMode = OMXCameraAdapter::VIDEO_MODE_HQ; + mCapabilitiesOpMode = MODE_VIDEO_HIGH_QUALITY; } else if (strcmp(valstr, (const char *) TICameraParameters::CP_CAM_MODE) == 0) { capMode = OMXCameraAdapter::CP_CAM; mCapabilitiesOpMode = MODE_CPCAM; @@ -325,7 +328,7 @@ status_t OMXCameraAdapter::setAutoConvergence(const char *pValstr, const char *p ACParams.nSize = (OMX_U32)sizeof(OMX_TI_CONFIG_CONVERGENCETYPE); ACParams.nVersion = mLocalVersionParam; - ACParams.nPortIndex = OMX_ALL; + ACParams.nPortIndex = mCameraAdapterParameters.mPrevPortIndex; OMX_GetConfig(mCameraAdapterParameters.mHandleComp, (OMX_INDEXTYPE)OMX_TI_IndexConfigAutoConvergence, @@ -644,8 +647,7 @@ status_t OMXCameraAdapter::setCaptureMode(OMXCameraAdapter::CaptureMode mode) { OMX_INIT_STRUCT_PTR (&camMode, OMX_CONFIG_CAMOPERATINGMODETYPE); - if ( mSensorIndex == OMX_TI_StereoSensor ) - { + if ( mSensorIndex == OMX_TI_StereoSensor ) { if ( OMXCameraAdapter::VIDEO_MODE == mode ) { CAMHAL_LOGDA("Camera mode: STEREO VIDEO"); camMode.eCamOperatingMode = OMX_TI_StereoVideo; @@ -653,26 +655,18 @@ status_t OMXCameraAdapter::setCaptureMode(OMXCameraAdapter::CaptureMode mode) CAMHAL_LOGDA("Camera mode: STEREO"); camMode.eCamOperatingMode = OMX_CaptureStereoImageCapture; } - } - else if ( OMXCameraAdapter::HIGH_SPEED == mode ) - { + } else if ( OMXCameraAdapter::HIGH_SPEED == mode ) { CAMHAL_LOGDA("Camera mode: HIGH SPEED"); camMode.eCamOperatingMode = OMX_CaptureImageHighSpeedTemporalBracketing; - } - else if ( OMXCameraAdapter::CP_CAM == mode ) - { + } else if ( OMXCameraAdapter::CP_CAM == mode ) { CAMHAL_LOGDA("Camera mode: CP CAM"); camMode.eCamOperatingMode = OMX_TI_CPCam; // TODO(XXX): Hardcode for now until we implement re-proc pipe singlePrevMode.eMode = OMX_TI_SinglePreviewMode_ImageCaptureHighSpeed; - } - else if( OMXCameraAdapter::HIGH_QUALITY == mode ) - { + } else if( OMXCameraAdapter::HIGH_QUALITY == mode ) { CAMHAL_LOGDA("Camera mode: HIGH QUALITY"); camMode.eCamOperatingMode = OMX_CaptureImageProfileBase; - } - else if( OMXCameraAdapter::HIGH_QUALITY_ZSL== mode ) - { + } else if( OMXCameraAdapter::HIGH_QUALITY_ZSL== mode ) { const char* valstr = NULL; CAMHAL_LOGDA("Camera mode: HIGH QUALITY_ZSL"); camMode.eCamOperatingMode = OMX_TI_CaptureImageProfileZeroShutterLag; @@ -683,17 +677,16 @@ status_t OMXCameraAdapter::setCaptureMode(OMXCameraAdapter::CaptureMode mode) } #endif - } - else if( OMXCameraAdapter::VIDEO_MODE == mode ) - { + } else if( OMXCameraAdapter::VIDEO_MODE == mode ) { CAMHAL_LOGDA("Camera mode: VIDEO MODE"); camMode.eCamOperatingMode = OMX_CaptureVideo; - } - else - { + } else if( OMXCameraAdapter::VIDEO_MODE_HQ == mode ) { + CAMHAL_LOGDA("Camera mode: VIDEO MODE HQ"); + camMode.eCamOperatingMode = OMX_CaptureHighQualityVideo; + } else { CAMHAL_LOGEA("Camera mode: INVALID mode passed!"); return BAD_VALUE; - } + } if( NO_ERROR == ret ) { |