camera: Remove a lot of cruft tuna doesn't need/support.

Looks kinda messy, but runtime results are better.

Signed-off-by: Kyle Repinski <repinski23@gmail.com>

3 files changed, 32 insertions, 0 deletions

diff --git a/camera/inc/CameraProperties.h b/camera/inc/CameraProperties.h
index 0b61210..e20d18d 100644
--- a/camera/inc/CameraProperties.h
+++ b/camera/inc/CameraProperties.h
@@ -69,16 +69,20 @@ public:
     static const char ORIENTATION_INDEX[];
     static const char FACING_INDEX[];
     static const char SUPPORTED_PREVIEW_SIZES[];
+#ifndef OMAP_TUNA
     static const char SUPPORTED_PREVIEW_SUBSAMPLED_SIZES[];
     static const char SUPPORTED_PREVIEW_TOPBOTTOM_SIZES[];
     static const char SUPPORTED_PREVIEW_SIDEBYSIDE_SIZES[];
+#endif
     static const char SUPPORTED_PREVIEW_FORMATS[];
     static const char SUPPORTED_PREVIEW_FRAME_RATES[];
     static const char SUPPORTED_PREVIEW_FRAME_RATES_EXT[];
     static const char SUPPORTED_PICTURE_SIZES[];
+#ifndef OMAP_TUNA
     static const char SUPPORTED_PICTURE_SUBSAMPLED_SIZES[];
     static const char SUPPORTED_PICTURE_TOPBOTTOM_SIZES[];
     static const char SUPPORTED_PICTURE_SIDEBYSIDE_SIZES[];
+#endif
     static const char SUPPORTED_PICTURE_FORMATS[];
     static const char SUPPORTED_THUMBNAIL_SIZES[];
     static const char SUPPORTED_WHITE_BALANCE[];
@@ -184,8 +188,10 @@ public:
     static const char VIDEO_SIZE[];
     static const char SUPPORTED_VIDEO_SIZES[];
 
+#ifndef OMAP_TUNA
     static const char MECHANICAL_MISALIGNMENT_CORRECTION_SUPPORTED[];
     static const char MECHANICAL_MISALIGNMENT_CORRECTION[];
+#endif
 
     static const char RAW_WIDTH[];
     static const char RAW_HEIGHT[];
diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
index ba192db..8182c9c 100644
--- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
+++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
@@ -669,11 +669,13 @@ private:
                                          size_t,
                                          char*,
                                          size_t);
+#ifndef OMAP_TUNA
     static status_t encodeSizeCap3D(OMX_TI_CAPRESTYPE&,
                                     const CapResolution*,
                                     size_t ,
                                     char * ,
                                     size_t);
+#endif
     static status_t insertImageSizes(CameraProperties::Properties*, OMX_TI_CAPTYPE&);
     static status_t insertPreviewSizes(CameraProperties::Properties*, OMX_TI_CAPTYPE&);
     static status_t insertThumbSizes(CameraProperties::Properties*, OMX_TI_CAPTYPE&);
@@ -902,16 +904,22 @@ private:
 
     //OMX Capabilities data
     static const CapResolution mImageCapRes [];
+#ifndef OMAP_TUNA
     static const CapResolution mImageCapResSS [];
     static const CapResolution mImageCapResTB [];
+#endif
     static const CapResolution mPreviewRes [];
+#ifndef OMAP_TUNA
     static const CapResolution mPreviewResSS [];
     static const CapResolution mPreviewResTB [];
+#endif
     static const CapResolution mPreviewPortraitRes [];
     static const CapResolution mThumbRes [];
     static const CapPixelformat mPixelformats [];
+#ifndef OMAP_TUNA
     static const userToOMX_LUT mFrameLayout [];
     static const LUTtype mLayoutLUT;
+#endif
     static const CapCodingFormat mImageCodingFormat[];
     static const CapFramerate mFramerates [];
     static const CapU32 mSensorNames[] ;
@@ -950,16 +958,24 @@ private:
     static const char DEFAULT_THUMBNAIL_QUALITY[];
     static const char DEFAULT_THUMBNAIL_SIZE[];
     static const char DEFAULT_PICTURE_FORMAT[];
+#ifndef OMAP_TUNA
     static const char DEFAULT_S3D_PICTURE_LAYOUT[];
+#endif
     static const char DEFAULT_PICTURE_SIZE[];
+#ifndef OMAP_TUNA
     static const char DEFAULT_PICTURE_SS_SIZE[];
     static const char DEFAULT_PICTURE_TB_SIZE[];
+#endif
     static const char DEFAULT_PREVIEW_FORMAT[];
     static const char DEFAULT_FRAMERATE[];
+#ifndef OMAP_TUNA
     static const char DEFAULT_S3D_PREVIEW_LAYOUT[];
+#endif
     static const char DEFAULT_PREVIEW_SIZE[];
+#ifndef OMAP_TUNA
     static const char DEFAULT_PREVIEW_SS_SIZE[];
     static const char DEFAULT_PREVIEW_TB_SIZE[];
+#endif
     static const char DEFAULT_NUM_PREV_BUFS[];
     static const char DEFAULT_NUM_PIC_BUFS[];
     static const char DEFAULT_SATURATION[];
@@ -983,7 +999,9 @@ private:
     static const char DEFAULT_SENSOR_ORIENTATION[];
     static const char DEFAULT_AUTOCONVERGENCE_MODE[];
     static const char DEFAULT_MANUAL_CONVERGENCE[];
+#ifndef OMAP_TUNA
     static const char * DEFAULT_MECHANICAL_MISALIGNMENT_CORRECTION_MODE;
+#endif
     static const char DEFAULT_EXIF_MODEL[];
     static const char DEFAULT_EXIF_MAKE[];
 
diff --git a/camera/inc/TICameraParameters.h b/camera/inc/TICameraParameters.h
index 75e4812..95690f8 100644
--- a/camera/inc/TICameraParameters.h
+++ b/camera/inc/TICameraParameters.h
@@ -206,13 +206,16 @@ static const char KEY_S3D_CAP_FRAME_LAYOUT[];
 static const char KEY_S3D_CAP_FRAME_LAYOUT_VALUES[];
 #endif
 
+#ifndef OMAP_TUNA
 //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[];
+#endif
 
+#ifndef OMAP_TUNA
 //TI extentions fo 3D resolutions
 static const char KEY_SUPPORTED_PICTURE_SUBSAMPLED_SIZES[];
 static const char KEY_SUPPORTED_PICTURE_TOPBOTTOM_SIZES[];
@@ -220,6 +223,7 @@ 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[];
+#endif
 
 //  TI extensions to add values for AutoConvergence settings.
 static const char AUTOCONVERGENCE_MODE_DISABLE[];
@@ -242,9 +246,12 @@ static const char ORIENTATION_SENSOR_270[];
 static const char FACING_FRONT[];
 static const char FACING_BACK[];
 
+#ifndef OMAP_TUNA
 static const char KEY_MECHANICAL_MISALIGNMENT_CORRECTION_SUPPORTED[];
 static const char KEY_MECHANICAL_MISALIGNMENT_CORRECTION[];
+#endif
 
+#ifndef OMAP_TUNA
 //TI extensions for enable/disable algos
 static const char KEY_ALGO_FIXED_GAMMA[];
 static const char KEY_ALGO_NSF1[];
@@ -252,6 +259,7 @@ 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
 
 };