diff options
Diffstat (limited to 'camera/inc/TICameraParameters.h')
| -rw-r--r-- | camera/inc/TICameraParameters.h | 133 |
1 files changed, 75 insertions, 58 deletions
diff --git a/camera/inc/TICameraParameters.h b/camera/inc/TICameraParameters.h index 4701cae..84fa9fa 100644 --- a/camera/inc/TICameraParameters.h +++ b/camera/inc/TICameraParameters.h @@ -14,16 +14,14 @@ * limitations under the License. */ - - - #ifndef TI_CAMERA_PARAMETERS_H #define TI_CAMERA_PARAMETERS_H #include <utils/KeyedVector.h> #include <utils/String8.h> -namespace android { +namespace Ti { +namespace Camera { ///TI Specific Camera Parameters class TICameraParameters @@ -36,35 +34,48 @@ static const char KEY_SUPPORTED_CAMERAS[]; // Select logical Camera index static const char KEY_CAMERA[]; static const char KEY_CAMERA_NAME[]; -static const char KEY_S3D_SUPPORTED[]; static const char KEY_BURST[]; static const char KEY_CAP_MODE[]; +static const char KEY_CAP_MODE_VALUES[]; static const char KEY_VNF[]; +static const char KEY_VNF_SUPPORTED[]; static const char KEY_SATURATION[]; static const char KEY_BRIGHTNESS[]; -static const char KEY_EXPOSURE_MODE[]; static const char KEY_SUPPORTED_EXPOSURE[]; +static const char KEY_EXPOSURE_MODE[]; +static const char KEY_SUPPORTED_MANUAL_EXPOSURE_MIN[]; +static const char KEY_SUPPORTED_MANUAL_EXPOSURE_MAX[]; +static const char KEY_SUPPORTED_MANUAL_EXPOSURE_STEP[]; +static const char KEY_SUPPORTED_MANUAL_GAIN_ISO_MIN[]; +static const char KEY_SUPPORTED_MANUAL_GAIN_ISO_MAX[]; +static const char KEY_SUPPORTED_MANUAL_GAIN_ISO_STEP[]; +static const char KEY_MANUAL_EXPOSURE[]; +static const char KEY_MANUAL_EXPOSURE_RIGHT[]; +static const char KEY_MANUAL_GAIN_ISO[]; +static const char KEY_MANUAL_GAIN_ISO_RIGHT[]; static const char KEY_CONTRAST[]; static const char KEY_SHARPNESS[]; static const char KEY_ISO[]; static const char KEY_SUPPORTED_ISO_VALUES[]; static const char KEY_SUPPORTED_IPP[]; static const char KEY_IPP[]; -static const char KEY_MAN_EXPOSURE[]; static const char KEY_METERING_MODE[]; -static const char KEY_PADDED_WIDTH[]; -static const char KEY_PADDED_HEIGHT[]; static const char KEY_EXP_BRACKETING_RANGE[]; +static const char KEY_EXP_GAIN_BRACKETING_RANGE[]; +static const char KEY_ZOOM_BRACKETING_RANGE[]; static const char KEY_TEMP_BRACKETING[]; static const char KEY_TEMP_BRACKETING_RANGE_POS[]; static const char KEY_TEMP_BRACKETING_RANGE_NEG[]; +static const char KEY_FLUSH_SHOT_CONFIG_QUEUE[]; static const char KEY_SHUTTER_ENABLE[]; static const char KEY_MEASUREMENT_ENABLE[]; static const char KEY_INITIAL_VALUES[]; static const char KEY_GBCE[]; +static const char KEY_GBCE_SUPPORTED[]; static const char KEY_GLBCE[]; -static const char KEY_MINFRAMERATE[]; -static const char KEY_MAXFRAMERATE[]; +static const char KEY_GLBCE_SUPPORTED[]; +static const char KEY_FRAMERATE_RANGES_EXT_SUPPORTED[]; +static const char KEY_FRAMERATES_EXT_SUPPORTED[]; // TI recording hint to notify camera adapters of possible recording static const char KEY_RECORDING_HINT[]; @@ -72,32 +83,18 @@ static const char KEY_AUTO_FOCUS_LOCK[]; static const char KEY_CURRENT_ISO[]; static const char KEY_SENSOR_ORIENTATION[]; -static const char KEY_SENSOR_ORIENTATION_VALUES[]; - -//TI extensions for zoom -static const char ZOOM_SUPPORTED[]; -static const char ZOOM_UNSUPPORTED[]; //TI extensions for camera capabilies static const char INITIAL_VALUES_TRUE[]; static const char INITIAL_VALUES_FALSE[]; -//TI extensions for enabling/disabling measurements -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[]; - -//TI extensions for enabling/disabling GLBCE -static const char GLBCE_ENABLE[]; -static const char GLBCE_DISABLE[]; - -//TI extensions for enabling/disabling GBCE -static const char GBCE_ENABLE[]; -static const char GBCE_DISABLE[]; +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 to add Min frame rate Values static const char VIDEO_MINFRAMERATE_5[]; @@ -109,16 +106,6 @@ static const char VIDEO_MINFRAMERATE_25[]; static const char VIDEO_MINFRAMERATE_30[]; static const char VIDEO_MINFRAMERATE_33[]; -// TI extensions for Manual Gain and Manual Exposure -static const char KEY_MANUAL_EXPOSURE_LEFT[]; -static const char KEY_MANUAL_EXPOSURE_RIGHT[]; -static const char KEY_MANUAL_EXPOSURE_MODES[]; -static const char KEY_MANUAL_GAIN_EV_RIGHT[]; -static const char KEY_MANUAL_GAIN_EV_LEFT[]; -static const char KEY_MANUAL_GAIN_ISO_RIGHT[]; -static const char KEY_MANUAL_GAIN_ISO_LEFT[]; -static const char KEY_MANUAL_GAIN_MODES[]; - //TI extensions for setting EXIF tags static const char KEY_EXIF_MODEL[]; static const char KEY_EXIF_MAKE[]; @@ -128,13 +115,13 @@ static const char KEY_GPS_MAPDATUM[]; static const char KEY_GPS_VERSION[]; static const char KEY_GPS_DATESTAMP[]; -//TI extensions for enabling/disabling shutter sound -static const char SHUTTER_ENABLE[]; -static const char SHUTTER_DISABLE[]; +// TI extensions for VTC +static const char KEY_VTC_HINT[]; +static const char KEY_VIDEO_ENCODER_HANDLE[]; +static const char KEY_VIDEO_ENCODER_SLICE_HEIGHT[]; -//TI extensions for Temporal bracketing -static const char BRACKET_ENABLE[]; -static const char BRACKET_DISABLE[]; +static const char RAW_WIDTH[]; +static const char RAW_HEIGHT[]; //TI extensions to Image post-processing static const char IPP_LDCNSF[]; @@ -146,18 +133,19 @@ static const char IPP_NONE[]; static const char HIGH_PERFORMANCE_MODE[]; static const char HIGH_QUALITY_MODE[]; static const char HIGH_QUALITY_ZSL_MODE[]; +static const char CP_CAM_MODE[]; static const char VIDEO_MODE[]; - +static const char EXPOSURE_BRACKETING[]; +static const char ZOOM_BRACKETING[]; +static const char TEMP_BRACKETING[]; // TI extensions to standard android pixel formats -static const char PIXEL_FORMAT_RAW[]; +static const char PIXEL_FORMAT_UNUSED[]; static const char PIXEL_FORMAT_JPS[]; static const char PIXEL_FORMAT_MPO[]; -static const char PIXEL_FORMAT_RAW_JPEG[]; -static const char PIXEL_FORMAT_RAW_MPO[]; +static const char PIXEL_FORMAT_YUV422I_UYVY[]; // TI extensions to standard android scene mode settings -static const char SCENE_MODE_SPORT[]; static const char SCENE_MODE_CLOSEUP[]; static const char SCENE_MODE_AQUA[]; static const char SCENE_MODE_SNOWBEACH[]; @@ -176,7 +164,7 @@ static const char WHITE_BALANCE_SUNSET[]; static const char WHITE_BALANCE_FACE[]; // TI extensions to add exposure preset modes to android api -static const char EXPOSURE_MODE_OFF[]; +static const char EXPOSURE_MODE_MANUAL[]; static const char EXPOSURE_MODE_AUTO[]; static const char EXPOSURE_MODE_NIGHT[]; static const char EXPOSURE_MODE_BACKLIGHT[]; @@ -192,6 +180,7 @@ static const char EXPOSURE_MODE_FACE[]; static const char FOCUS_MODE_PORTRAIT[]; static const char FOCUS_MODE_EXTENDED[]; static const char FOCUS_MODE_FACE[]; +static const char FOCUS_MODE_OFF[]; // TI extensions to add iso values static const char ISO_MODE_AUTO[]; @@ -209,17 +198,34 @@ static const char EFFECT_VIVID[]; static const char EFFECT_COLOR_SWAP[]; static const char EFFECT_BLACKWHITE[]; -static const char KEY_S3D2D_PREVIEW[]; -static const char KEY_S3D2D_PREVIEW_MODE[]; +//TI extensions for stereo frame layouts +static const char KEY_S3D_PRV_FRAME_LAYOUT[]; +static const char KEY_S3D_PRV_FRAME_LAYOUT_VALUES[]; +static const char KEY_S3D_CAP_FRAME_LAYOUT[]; +static const char KEY_S3D_CAP_FRAME_LAYOUT_VALUES[]; + +//TI extensions for stereo frame layouts +static const char S3D_NONE[]; +static const char S3D_TB_FULL[]; +static const char S3D_SS_FULL[]; +static const char S3D_TB_SUBSAMPLED[]; +static const char S3D_SS_SUBSAMPLED[]; + +//TI extentions fo 3D resolutions +static const char KEY_SUPPORTED_PICTURE_SUBSAMPLED_SIZES[]; +static const char KEY_SUPPORTED_PICTURE_TOPBOTTOM_SIZES[]; +static const char KEY_SUPPORTED_PICTURE_SIDEBYSIDE_SIZES[]; +static const char KEY_SUPPORTED_PREVIEW_SUBSAMPLED_SIZES[]; +static const char KEY_SUPPORTED_PREVIEW_TOPBOTTOM_SIZES[]; +static const char KEY_SUPPORTED_PREVIEW_SIDEBYSIDE_SIZES[]; // TI extensions to add values for AutoConvergence settings. 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[]; - //TI extensions for flash mode settings static const char FLASH_MODE_FILL_IN[]; @@ -234,9 +240,20 @@ static const char ORIENTATION_SENSOR_270[]; static const char FACING_FRONT[]; static const char FACING_BACK[]; -}; +static const char KEY_MECHANICAL_MISALIGNMENT_CORRECTION_SUPPORTED[]; +static const char KEY_MECHANICAL_MISALIGNMENT_CORRECTION[]; + +//TI extensions for enable/disable algos +static const char KEY_ALGO_FIXED_GAMMA[]; +static const char KEY_ALGO_NSF1[]; +static const char KEY_ALGO_NSF2[]; +static const char KEY_ALGO_SHARPENING[]; +static const char KEY_ALGO_THREELINCOLORMAP[]; +static const char KEY_ALGO_GIC[]; }; -#endif +} // namespace Camera +} // namespace Ti +#endif |