diff options
Diffstat (limited to 'camera/inc')
| -rw-r--r-- | camera/inc/CameraProperties.h | 7 | ||||
| -rw-r--r-- | camera/inc/OMXCameraAdapter/OMXCameraAdapter.h | 13 | ||||
| -rw-r--r-- | camera/inc/TICameraParameters.h | 9 |
3 files changed, 22 insertions, 7 deletions
diff --git a/camera/inc/CameraProperties.h b/camera/inc/CameraProperties.h index 3968c2b..c87719c 100644 --- a/camera/inc/CameraProperties.h +++ b/camera/inc/CameraProperties.h @@ -101,9 +101,12 @@ public: static const char CONTRAST[]; static const char IPP[]; static const char GBCE[]; - static const char AUTOCONVERGENCE[]; static const char AUTOCONVERGENCE_MODE[]; - static const char MANUALCONVERGENCE_VALUES[]; + static const char AUTOCONVERGENCE_MODE_VALUES[]; + static const char MANUAL_CONVERGENCE[]; + static const char SUPPORTED_MANUAL_CONVERGENCE_MIN[]; + static const char SUPPORTED_MANUAL_CONVERGENCE_MAX[]; + static const char SUPPORTED_MANUAL_CONVERGENCE_STEP[]; static const char SENSOR_ORIENTATION[]; static const char SENSOR_ORIENTATION_VALUES[]; static const char REVISION[]; diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h index e0f3c2c..1c4fb88 100644 --- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h +++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h @@ -600,6 +600,8 @@ private: static status_t insertVideoSizes(CameraProperties::Properties*, OMX_TI_CAPTYPE&); static status_t insertFacing(CameraProperties::Properties*, OMX_TI_CAPTYPE&); static status_t insertFocalLength(CameraProperties::Properties*, OMX_TI_CAPTYPE&); + static status_t insertAutoConvergenceModes(CameraProperties::Properties*, OMX_TI_CAPTYPE&); + static status_t insertManualConvergenceRange(CameraProperties::Properties*, OMX_TI_CAPTYPE&); status_t setParametersCapture(const CameraParameters ¶ms, BaseCameraAdapter::AdapterState state); @@ -640,8 +642,7 @@ private: status_t apply3ADefaults(Gen3A_settings &Gen3A); // AutoConvergence - status_t setAutoConvergence(OMX_TI_AUTOCONVERGENCEMODETYPE pACMode, OMX_S32 pManualConverence); - status_t getAutoConvergence(OMX_TI_AUTOCONVERGENCEMODETYPE *pACMode, OMX_S32 *pManualConverence); + status_t setAutoConvergence(const char *valstr,const CameraParameters ¶ms); OMX_OTHER_EXTRADATATYPE *getExtradata(OMX_OTHER_EXTRADATATYPE *extraData, OMX_EXTRADATATYPE type); @@ -751,6 +752,8 @@ private: static const int SENSORID_S5K4E1GA; static const int SENSORID_S5K6A1GX03; static const CapU32 mFacing []; + static const userToOMX_LUT mAutoConvergence []; + static const LUTtype mAutoConvergenceLUT; // OMX Camera defaults static const char DEFAULT_ANTIBANDING[]; @@ -800,6 +803,8 @@ private: static const char DEFAULT_PREFERRED_PREVIEW_SIZE_FOR_VIDEO[]; static const char DEFAULT_SENSOR_ORIENTATION[]; static const char DEFAULT_FACING_SUPPORTED[]; + static const char DEFAULT_AUTOCONVERGENCE_MODE[]; + static const char DEFAULT_MANUAL_CONVERGENCE[]; static const size_t MAX_FOCUS_AREAS; @@ -818,6 +823,10 @@ private: Vector< sp<CameraArea> > mFocusAreas; mutable Mutex mFocusAreasLock; + // Current Touch convergence areas + Vector< sp<CameraArea> > mTouchAreas; + mutable Mutex mTouchAreasLock; + // Current Metering areas Vector< sp<CameraArea> > mMeteringAreas; mutable Mutex mMeteringAreasLock; diff --git a/camera/inc/TICameraParameters.h b/camera/inc/TICameraParameters.h index b426314..ae0f221 100644 --- a/camera/inc/TICameraParameters.h +++ b/camera/inc/TICameraParameters.h @@ -84,9 +84,12 @@ static const char MEASUREMENT_ENABLE[]; static const char MEASUREMENT_DISABLE[]; // TI extensions to add values for ManualConvergence and AutoConvergence mode -static const char KEY_AUTOCONVERGENCE[]; static const char KEY_AUTOCONVERGENCE_MODE[]; -static const char KEY_MANUALCONVERGENCE_VALUES[]; +static const char KEY_AUTOCONVERGENCE_MODE_VALUES[]; +static const char KEY_MANUAL_CONVERGENCE[]; +static const char KEY_SUPPORTED_MANUAL_CONVERGENCE_MIN[]; +static const char KEY_SUPPORTED_MANUAL_CONVERGENCE_MAX[]; +static const char KEY_SUPPORTED_MANUAL_CONVERGENCE_STEP[]; //TI extensions for enabling/disabling GLBCE static const char GLBCE_ENABLE[]; @@ -221,7 +224,7 @@ static const char KEY_S3D2D_PREVIEW_MODE[]; static const char AUTOCONVERGENCE_MODE_DISABLE[]; static const char AUTOCONVERGENCE_MODE_FRAME[]; static const char AUTOCONVERGENCE_MODE_CENTER[]; -static const char AUTOCONVERGENCE_MODE_FFT[]; +static const char AUTOCONVERGENCE_MODE_TOUCH[]; static const char AUTOCONVERGENCE_MODE_MANUAL[]; |