diff options
Diffstat (limited to 'camera/TICameraParameters.cpp')
| -rw-r--r-- | camera/TICameraParameters.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/camera/TICameraParameters.cpp b/camera/TICameraParameters.cpp index 04a3536..1e2ec20 100644 --- a/camera/TICameraParameters.cpp +++ b/camera/TICameraParameters.cpp @@ -96,6 +96,7 @@ const char TICameraParameters::KEY_S3D_CAP_FRAME_LAYOUT[] = "s3d-cap-frame-layou const char TICameraParameters::KEY_S3D_CAP_FRAME_LAYOUT_VALUES[] = "s3d-cap-frame-layout-values"; #endif +#ifndef OMAP_TUNA //TI extentions fo 3D resolutions const char TICameraParameters::KEY_SUPPORTED_PICTURE_SUBSAMPLED_SIZES[] = "supported-picture-subsampled-size-values"; const char TICameraParameters::KEY_SUPPORTED_PICTURE_TOPBOTTOM_SIZES[] = "supported-picture-topbottom-size-values"; @@ -103,6 +104,7 @@ const char TICameraParameters::KEY_SUPPORTED_PICTURE_SIDEBYSIDE_SIZES[] = "suppo const char TICameraParameters::KEY_SUPPORTED_PREVIEW_SUBSAMPLED_SIZES[] = "supported-preview-subsampled-size-values"; const char TICameraParameters::KEY_SUPPORTED_PREVIEW_TOPBOTTOM_SIZES[] = "supported-preview-topbottom-size-values"; const char TICameraParameters::KEY_SUPPORTED_PREVIEW_SIDEBYSIDE_SIZES[] = "supported-preview-sidebyside-size-values"; +#endif //TI extensions for SAC/SMC const char TICameraParameters::KEY_AUTOCONVERGENCE_MODE[] = "auto-convergence-mode"; @@ -191,12 +193,14 @@ const char TICameraParameters::ISO_MODE_1000[] = "1000"; const char TICameraParameters::ISO_MODE_1200[] = "1200"; const char TICameraParameters::ISO_MODE_1600[] = "1600"; +#ifndef OMAP_TUNA //TI extensions for stereo frame layouts const char TICameraParameters::S3D_NONE[] = "none"; const char TICameraParameters::S3D_TB_FULL[] = "tb-full"; const char TICameraParameters::S3D_SS_FULL[] = "ss-full"; const char TICameraParameters::S3D_TB_SUBSAMPLED[] = "tb-subsampled"; const char TICameraParameters::S3D_SS_SUBSAMPLED[] = "ss-subsampled"; +#endif // TI extensions to add auto convergence values const char TICameraParameters::AUTOCONVERGENCE_MODE_DISABLE[] = "disable"; @@ -218,9 +222,12 @@ const char TICameraParameters::ORIENTATION_SENSOR_90[] = "90"; const char TICameraParameters::ORIENTATION_SENSOR_180[] = "180"; const char TICameraParameters::ORIENTATION_SENSOR_270[] = "270"; +#ifndef OMAP_TUNA const char TICameraParameters::KEY_MECHANICAL_MISALIGNMENT_CORRECTION_SUPPORTED[] = "mechanical-misalignment-correction-supported"; const char TICameraParameters::KEY_MECHANICAL_MISALIGNMENT_CORRECTION[] = "mechanical-misalignment-correction"; +#endif +#ifndef OMAP_TUNA //TI extensions for enable/disable algos const char TICameraParameters::KEY_ALGO_FIXED_GAMMA[] = TI_KEY_ALGO_PREFIX "fixed-gamma"; const char TICameraParameters::KEY_ALGO_NSF1[] = TI_KEY_ALGO_PREFIX "nsf1"; @@ -228,6 +235,7 @@ const char TICameraParameters::KEY_ALGO_NSF2[] = TI_KEY_ALGO_PREFIX "nsf2"; const char TICameraParameters::KEY_ALGO_SHARPENING[] = TI_KEY_ALGO_PREFIX "sharpening"; const char TICameraParameters::KEY_ALGO_THREELINCOLORMAP[] = TI_KEY_ALGO_PREFIX "threelinecolormap"; const char TICameraParameters::KEY_ALGO_GIC[] = TI_KEY_ALGO_PREFIX "gic"; +#endif } // namespace Camera } // namespace Ti |