Merge "Remove non-(calibrated, api, or verified) 3A settings" into ics-mr0

2 files changed, 10 insertions, 13 deletions

diff --git a/camera/OMXCameraAdapter/OMXCapabilities.cpp b/camera/OMXCameraAdapter/OMXCapabilities.cpp
index 054605e..db7a46b 100644
--- a/camera/OMXCameraAdapter/OMXCapabilities.cpp
+++ b/camera/OMXCameraAdapter/OMXCapabilities.cpp
@@ -803,9 +803,6 @@ status_t OMXCameraAdapter::insertWBModes(CameraProperties::Properties* params, O
         }
     }
 
-    //These modes are not supported by the capability feature
-    strncat(supported, TICameraParameters::WHITE_BALANCE_FACE, MAX_PROP_NAME_LENGTH);
-
     params->set(CameraProperties::SUPPORTED_WHITE_BALANCE, supported);
 
     LOG_FUNCTION_NAME;
@@ -854,9 +851,6 @@ status_t OMXCameraAdapter::insertExpModes(CameraProperties::Properties* params,
         }
     }
 
-    //These modes are not supported by the capability feature
-    strncat(supported, TICameraParameters::EXPOSURE_MODE_FACE, MAX_PROP_NAME_LENGTH);
-
     params->set(CameraProperties::SUPPORTED_EXPOSURE_MODES, supported);
 
     LOG_FUNCTION_NAME;
@@ -940,8 +934,6 @@ status_t OMXCameraAdapter::insertFocusModes(CameraProperties::Properties* params
     } else {
         // Focus is supported but these modes are not supported by the
         // capability feature. Apply manually
-        strncat(supported, TICameraParameters::FOCUS_MODE_FACE, MAX_PROP_NAME_LENGTH);
-        strncat(supported, PARAM_SEP, 1);
         strncat(supported, CameraParameters::FOCUS_MODE_CONTINUOUS_PICTURE, MAX_PROP_NAME_LENGTH);
     }
 
diff --git a/camera/inc/General3A_Settings.h b/camera/inc/General3A_Settings.h
index c4287fc..dab1f8e 100644
--- a/camera/inc/General3A_Settings.h
+++ b/camera/inc/General3A_Settings.h
@@ -77,19 +77,22 @@ const userToOMX_LUT effects_UserToOMX [] = {
 
 const userToOMX_LUT scene_UserToOMX [] = {
     { CameraParameters::SCENE_MODE_AUTO, OMX_Manual },
+    { CameraParameters::SCENE_MODE_ACTION, OMX_TI_Action },
+    { CameraParameters::SCENE_MODE_NIGHT, OMX_TI_Night },
+    { CameraParameters::SCENE_MODE_PARTY, OMX_TI_Party },
+    { CameraParameters::SCENE_MODE_SUNSET, OMX_TI_Sunset },
+/*********** TODO: These scene modes are not verified. ************
+ ***************** Have to verify and reeable later. **************
+    { CameraParameters::SCENE_MODE_THEATRE, OMX_TI_Theatre },
     { CameraParameters::SCENE_MODE_LANDSCAPE, OMX_Landscape },
     { CameraParameters::SCENE_MODE_NIGHT_PORTRAIT, OMX_NightPortrait },
     { CameraParameters::SCENE_MODE_FIREWORKS, OMX_Fireworks },
-    { CameraParameters::SCENE_MODE_ACTION, OMX_TI_Action },
     { CameraParameters::SCENE_MODE_BEACH, OMX_TI_Beach },
     { CameraParameters::SCENE_MODE_CANDLELIGHT, OMX_TI_Candlelight },
-    { CameraParameters::SCENE_MODE_NIGHT, OMX_TI_Night },
-    { CameraParameters::SCENE_MODE_PARTY, OMX_TI_Party },
     { CameraParameters::SCENE_MODE_PORTRAIT, OMX_TI_Portrait },
     { 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 },
+*********************************************************************/
 #ifdef OMAP_ENHANCEMENT
     { TICameraParameters::SCENE_MODE_CLOSEUP, OMX_Closeup },
     { TICameraParameters::SCENE_MODE_AQUA, OMX_Underwater },
@@ -110,9 +113,11 @@ const userToOMX_LUT whiteBal_UserToOMX [] = {
     { CameraParameters::WHITE_BALANCE_CLOUDY_DAYLIGHT, OMX_WhiteBalControlCloudy },
     { CameraParameters::WHITE_BALANCE_FLUORESCENT, OMX_WhiteBalControlFluorescent },
     { CameraParameters::WHITE_BALANCE_INCANDESCENT, OMX_WhiteBalControlIncandescent },
+/********************** THESE ARE CURRENT NOT TUNED PROPERLY *************************
     { 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 },