diff options
Diffstat (limited to 'camera/inc')
| -rw-r--r-- | camera/inc/CameraProperties.h | 4 | ||||
| -rw-r--r-- | camera/inc/OMXCameraAdapter/OMXCameraAdapter.h | 2 | ||||
| -rw-r--r-- | camera/inc/TICameraParameters.h | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/camera/inc/CameraProperties.h b/camera/inc/CameraProperties.h index 0b8680e..0b61210 100644 --- a/camera/inc/CameraProperties.h +++ b/camera/inc/CameraProperties.h @@ -51,7 +51,9 @@ enum OperatingMode { MODE_HIGH_QUALITY, MODE_ZEROSHUTTERLAG, MODE_VIDEO, +#ifndef OMAP_TUNA MODE_STEREO, +#endif MODE_CPCAM, MODE_MAX }; @@ -153,10 +155,12 @@ public: static const char PARAMS_DELIMITER []; +#ifndef OMAP_TUNA static const char S3D_PRV_FRAME_LAYOUT[]; static const char S3D_PRV_FRAME_LAYOUT_VALUES[]; static const char S3D_CAP_FRAME_LAYOUT[]; static const char S3D_CAP_FRAME_LAYOUT_VALUES[]; +#endif static const char VSTAB[]; static const char VSTAB_SUPPORTED[]; static const char VNF[]; diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h index 83969d1..ba192db 100644 --- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h +++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h @@ -707,7 +707,9 @@ private: #endif static status_t insertAutoConvergenceModes(CameraProperties::Properties*, OMX_TI_CAPTYPE&); static status_t insertManualConvergenceRange(CameraProperties::Properties*, OMX_TI_CAPTYPE&); +#ifndef OMAP_TUNA static status_t insertLayout(CameraProperties::Properties*, OMX_TI_CAPTYPE&); +#endif static status_t insertVideoSnapshotSupported(CameraProperties::Properties*, OMX_TI_CAPTYPE&); static status_t insertVNFSupported(CameraProperties::Properties* params, OMX_TI_CAPTYPE &caps); static status_t insertVSTABSupported(CameraProperties::Properties* params, OMX_TI_CAPTYPE &caps); diff --git a/camera/inc/TICameraParameters.h b/camera/inc/TICameraParameters.h index 84fa9fa..75e4812 100644 --- a/camera/inc/TICameraParameters.h +++ b/camera/inc/TICameraParameters.h @@ -198,11 +198,13 @@ static const char EFFECT_VIVID[]; static const char EFFECT_COLOR_SWAP[]; static const char EFFECT_BLACKWHITE[]; +#ifndef OMAP_TUNA //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[]; +#endif //TI extensions for stereo frame layouts static const char S3D_NONE[]; |