CameraHal: Remove non-API 3A settings

b/5472533

Change-Id: I62ce16499c62e11a321c89872eec19d9d1eac635
Signed-off-by: Tyler Luu <tluu@ti.com>

1 files changed, 28 insertions, 19 deletions

diff --git a/camera/inc/General3A_Settings.h b/camera/inc/General3A_Settings.h
index 64297b39..c4287fc6 100644
--- a/camera/inc/General3A_Settings.h
+++ b/camera/inc/General3A_Settings.h
@@ -63,31 +63,23 @@ const userToOMX_LUT effects_UserToOMX [] = {
     { CameraParameters::EFFECT_SOLARIZE,  OMX_ImageFilterSolarize },
     { CameraParameters::EFFECT_SEPIA, OMX_ImageFilterSepia },
     { CameraParameters::EFFECT_MONO, OMX_ImageFilterGrayScale },
-    { TICameraParameters::EFFECT_NATURAL, OMX_ImageFilterNatural },
-    { TICameraParameters::EFFECT_VIVID, OMX_ImageFilterVivid },
-    { TICameraParameters::EFFECT_COLOR_SWAP, OMX_ImageFilterColourSwap   },
     { CameraParameters::EFFECT_BLACKBOARD, OMX_TI_ImageFilterBlackBoard },
     { CameraParameters::EFFECT_WHITEBOARD, OMX_TI_ImageFilterWhiteBoard },
     { CameraParameters::EFFECT_AQUA, OMX_TI_ImageFilterAqua },
     { CameraParameters::EFFECT_POSTERIZE, OMX_TI_ImageFilterPosterize },
+#ifdef OMAP_ENHANCEMENT
+    { TICameraParameters::EFFECT_NATURAL, OMX_ImageFilterNatural },
+    { TICameraParameters::EFFECT_VIVID, OMX_ImageFilterVivid },
+    { TICameraParameters::EFFECT_COLOR_SWAP, OMX_ImageFilterColourSwap   },
     { TICameraParameters::EFFECT_BLACKWHITE, OMX_TI_ImageFilterBlackWhite }
+#endif
 };
 
 const userToOMX_LUT scene_UserToOMX [] = {
     { CameraParameters::SCENE_MODE_AUTO, OMX_Manual },
-    { TICameraParameters::SCENE_MODE_CLOSEUP, OMX_Closeup },
     { CameraParameters::SCENE_MODE_LANDSCAPE, OMX_Landscape },
-    { TICameraParameters::SCENE_MODE_AQUA, OMX_Underwater },
-    { TICameraParameters::SCENE_MODE_SPORT, OMX_Sport },
-    { TICameraParameters::SCENE_MODE_MOOD, OMX_Mood },
     { CameraParameters::SCENE_MODE_NIGHT_PORTRAIT, OMX_NightPortrait },
-    { TICameraParameters::SCENE_MODE_NIGHT_INDOOR, OMX_NightIndoor },
     { CameraParameters::SCENE_MODE_FIREWORKS, OMX_Fireworks },
-    { TICameraParameters::SCENE_MODE_DOCUMENT, OMX_Document },
-    { TICameraParameters::SCENE_MODE_BARCODE, OMX_Barcode },
-    { TICameraParameters::SCENE_MODE_VIDEO_SUPER_NIGHT, OMX_SuperNight },
-    { TICameraParameters::SCENE_MODE_VIDEO_CINE, OMX_Cine },
-    { TICameraParameters::SCENE_MODE_VIDEO_OLD_FILM, OMX_OldFilm },
     { CameraParameters::SCENE_MODE_ACTION, OMX_TI_Action },
     { CameraParameters::SCENE_MODE_BEACH, OMX_TI_Beach },
     { CameraParameters::SCENE_MODE_CANDLELIGHT, OMX_TI_Candlelight },
@@ -97,22 +89,36 @@ const userToOMX_LUT scene_UserToOMX [] = {
     { CameraParameters::SCENE_MODE_SNOW, OMX_TI_Snow },
     { CameraParameters::SCENE_MODE_STEADYPHOTO, OMX_TI_Steadyphoto },
     { CameraParameters::SCENE_MODE_SUNSET, OMX_TI_Sunset },
-    { CameraParameters::SCENE_MODE_THEATRE, OMX_TI_Theatre }
+    { CameraParameters::SCENE_MODE_THEATRE, OMX_TI_Theatre },
+#ifdef OMAP_ENHANCEMENT
+    { TICameraParameters::SCENE_MODE_CLOSEUP, OMX_Closeup },
+    { TICameraParameters::SCENE_MODE_AQUA, OMX_Underwater },
+    { TICameraParameters::SCENE_MODE_SPORT, OMX_Sport },
+    { TICameraParameters::SCENE_MODE_MOOD, OMX_Mood },
+    { TICameraParameters::SCENE_MODE_NIGHT_INDOOR, OMX_NightIndoor },
+    { TICameraParameters::SCENE_MODE_DOCUMENT, OMX_Document },
+    { TICameraParameters::SCENE_MODE_BARCODE, OMX_Barcode },
+    { TICameraParameters::SCENE_MODE_VIDEO_SUPER_NIGHT, OMX_SuperNight },
+    { TICameraParameters::SCENE_MODE_VIDEO_CINE, OMX_Cine },
+    { TICameraParameters::SCENE_MODE_VIDEO_OLD_FILM, OMX_OldFilm },
+#endif
 };
 
 const userToOMX_LUT whiteBal_UserToOMX [] = {
     { CameraParameters::WHITE_BALANCE_AUTO, OMX_WhiteBalControlAuto },
     { CameraParameters::WHITE_BALANCE_DAYLIGHT, OMX_WhiteBalControlSunLight },
     { CameraParameters::WHITE_BALANCE_CLOUDY_DAYLIGHT, OMX_WhiteBalControlCloudy },
-    { TICameraParameters::WHITE_BALANCE_TUNGSTEN, OMX_WhiteBalControlTungsten },
     { CameraParameters::WHITE_BALANCE_FLUORESCENT, OMX_WhiteBalControlFluorescent },
     { CameraParameters::WHITE_BALANCE_INCANDESCENT, OMX_WhiteBalControlIncandescent },
-    { TICameraParameters::WHITE_BALANCE_HORIZON, OMX_WhiteBalControlHorizon },
     { CameraParameters::WHITE_BALANCE_SHADE, OMX_TI_WhiteBalControlShade },
     { CameraParameters::WHITE_BALANCE_TWILIGHT, OMX_TI_WhiteBalControlTwilight },
     { CameraParameters::WHITE_BALANCE_WARM_FLUORESCENT, OMX_TI_WhiteBalControlWarmFluorescent },
+#ifdef OMAP_ENHANCEMENT
+    { TICameraParameters::WHITE_BALANCE_TUNGSTEN, OMX_WhiteBalControlTungsten },
+    { TICameraParameters::WHITE_BALANCE_HORIZON, OMX_WhiteBalControlHorizon },
     { TICameraParameters::WHITE_BALANCE_FACE, WB_FACE_PRIORITY },
     { TICameraParameters::WHITE_BALANCE_SUNSET, OMX_TI_WhiteBalControlSunset }
+#endif
 };
 
 const userToOMX_LUT antibanding_UserToOMX [] = {
@@ -127,12 +133,13 @@ const userToOMX_LUT focus_UserToOMX [] = {
     { CameraParameters::FOCUS_MODE_INFINITY, OMX_IMAGE_FocusControlAutoInfinity },
     { CameraParameters::FOCUS_MODE_INFINITY, OMX_IMAGE_FocusControlHyperfocal },
     { CameraParameters::FOCUS_MODE_MACRO, OMX_IMAGE_FocusControlAutoMacro },
-    { TICameraParameters::FOCUS_MODE_PORTRAIT, OMX_IMAGE_FocusControlPortrait },
-    { TICameraParameters::FOCUS_MODE_EXTENDED, OMX_IMAGE_FocusControlExtended },
     { CameraParameters::FOCUS_MODE_CONTINUOUS_VIDEO, OMX_IMAGE_FocusControlAuto },
     { CameraParameters::FOCUS_MODE_CONTINUOUS_PICTURE, OMX_IMAGE_FocusControlAuto },
+#ifdef OMAP_ENHANCEMENT
     { TICameraParameters::FOCUS_MODE_FACE , FOCUS_FACE_PRIORITY },
-
+    { TICameraParameters::FOCUS_MODE_PORTRAIT, OMX_IMAGE_FocusControlPortrait },
+    { TICameraParameters::FOCUS_MODE_EXTENDED, OMX_IMAGE_FocusControlExtended },
+#endif
 };
 
 const userToOMX_LUT exposure_UserToOMX [] = {
@@ -155,7 +162,9 @@ const userToOMX_LUT flash_UserToOMX [] = {
     { CameraParameters::FLASH_MODE_AUTO          ,OMX_IMAGE_FlashControlAuto            },
     { CameraParameters::FLASH_MODE_TORCH         ,OMX_IMAGE_FlashControlTorch           },
     { CameraParameters::FLASH_MODE_RED_EYE        ,OMX_IMAGE_FlashControlRedEyeReduction },
+#ifdef OMAP_ENHANCEMENT
     { TICameraParameters::FLASH_MODE_FILL_IN        ,OMX_IMAGE_FlashControlFillin          }
+#endif
 };
 
 const LUTtype ExpLUT =