CameraHAL: WA for #testSceneMode

testSceneMode requires parameters to be updated properly before
starting preview. OMX Camera doesn't currently support this so
we are just going to keep a hard-coded LUT for the scene modes
for now.

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

5 files changed, 298 insertions, 0 deletions

diff --git a/camera/CameraHal.cpp b/camera/CameraHal.cpp
index 36105599..7be49311 100644
--- a/camera/CameraHal.cpp
+++ b/camera/CameraHal.cpp
@@ -721,6 +721,9 @@ int CameraHal::setParameters(const CameraParameters& params)
         if ((valstr = params.get(CameraParameters::KEY_SCENE_MODE)) != NULL) {
             if (isParameterValid(valstr, mCameraProperties->get(CameraProperties::SUPPORTED_SCENE_MODES))) {
                 CAMHAL_LOGDB("Scene mode set %s", valstr);
+                doesSetParameterNeedUpdate(valstr,
+                                           mParameters.get(CameraParameters::KEY_SCENE_MODE),
+                                           updateRequired);
                 mParameters.set(CameraParameters::KEY_SCENE_MODE, valstr);
             } else {
                 CAMHAL_LOGEB("ERROR: Invalid Scene mode = %s", valstr);
diff --git a/camera/OMXCameraAdapter/OMX3A.cpp b/camera/OMXCameraAdapter/OMX3A.cpp
index 6c8d85fe..464fc592 100644
--- a/camera/OMXCameraAdapter/OMX3A.cpp
+++ b/camera/OMXCameraAdapter/OMX3A.cpp
@@ -37,6 +37,35 @@
 #define METERING_AREAS_RANGE 0xFF
 
 namespace android {
+const SceneModesEntry* OMXCameraAdapter::getSceneModeEntry(const char* name,
+                                                                  OMX_SCENEMODETYPE scene) {
+    const SceneModesEntry* cameraLUT = NULL;
+    const SceneModesEntry* entry = NULL;
+    unsigned int numEntries = 0;
+
+    // 1. Find camera's scene mode LUT
+    for (unsigned int i = 0; i < ARRAY_SIZE(CameraToSensorModesLUT); i++) {
+        if (strcmp(CameraToSensorModesLUT[i].name, name) == 0) {
+            cameraLUT = CameraToSensorModesLUT[i].Table;
+            numEntries = CameraToSensorModesLUT[i].size;
+            break;
+        }
+    }
+
+    // 2. Find scene mode entry in table
+    if (!cameraLUT) {
+        goto EXIT;
+    }
+
+    for (unsigned int i = 0; i < numEntries; i++) {
+        if(cameraLUT[i].scene == scene) {
+            entry = cameraLUT + i;
+            break;
+        }
+    }
+ EXIT:
+    return entry;
+}
 
 status_t OMXCameraAdapter::setParameters3A(const CameraParameters &params,
                                            BaseCameraAdapter::AdapterState state)
diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
index cae28150..5f0c96a6 100755
--- a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
+++ b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
@@ -624,6 +624,19 @@ void OMXCameraAdapter::getParameters(CameraParameters& params)
     if( mParameters3A.SceneMode != OMX_Manual ) {
        const char *valstr_supported = NULL;
 
+       // if preview is not started...we still need to feedback the proper params
+       // look up the settings in the LUT
+       if (((state & PREVIEW_ACTIVE) == 0) && mCapabilities) {
+           const SceneModesEntry* entry = NULL;
+           entry = getSceneModeEntry(mCapabilities->get(CameraProperties::CAMERA_NAME),
+                                    (OMX_SCENEMODETYPE) mParameters3A.SceneMode);
+           if(entry) {
+               mParameters3A.Focus = entry->focus;
+               mParameters3A.FlashMode = entry->flash;
+               mParameters3A.WhiteBallance = entry->wb;
+           }
+       }
+
        valstr = getLUTvalue_OMXtoHAL(mParameters3A.WhiteBallance, WBalLUT);
        valstr_supported = mParams.get(CameraParameters::KEY_SUPPORTED_WHITE_BALANCE);
        if (valstr && valstr_supported && strstr(valstr_supported, valstr))
diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
index 779a3851..f4814c63 100644
--- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
+++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
@@ -32,6 +32,7 @@
 #include "OMX_TI_Common.h"
 #include "OMX_TI_Image.h"
 #include "General3A_Settings.h"
+#include "OMXSceneModeTables.h"
 
 #include "BaseCameraAdapter.h"
 #include "Encoder_libjpeg.h"
@@ -478,7 +479,12 @@ private:
     //3A related parameters
     status_t setParameters3A(const CameraParameters &params,
                              BaseCameraAdapter::AdapterState state);
+
+    // scene modes
     status_t setScene(Gen3A_settings& Gen3A);
+    // returns pointer to SceneModesEntry from the LUT for camera given 'name' and 'scene'
+    static const SceneModesEntry* getSceneModeEntry(const char* name, OMX_SCENEMODETYPE scene);
+
 
     //Flash modes
     status_t setFlashMode(Gen3A_settings& Gen3A);
diff --git a/camera/inc/OMXCameraAdapter/OMXSceneModeTables.h b/camera/inc/OMXCameraAdapter/OMXSceneModeTables.h
new file mode 100644
index 00000000..205a87bc
--- /dev/null
+++ b/camera/inc/OMXCameraAdapter/OMXSceneModeTables.h
@@ -0,0 +1,247 @@
+/*
+ * Copyright (C) Texas Instruments - http://www.ti.com/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+* @file OMXSceneModeTables.h
+*
+* This holds scene mode settings for different omx cameras.
+*
+*/
+
+#include "OMX_TI_IVCommon.h"
+#include "OMX_TI_Common.h"
+#include "OMX_TI_Index.h"
+
+#ifndef OMXCAMERAADAPTER_SCENEMODES_H
+#define OMXCAMERAADAPTER_SCENEMODES_H
+
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(array) (sizeof((array)) / sizeof((array)[0]))
+#endif
+
+struct SceneModesEntry {
+    OMX_SCENEMODETYPE scene;
+    OMX_IMAGE_FLASHCONTROLTYPE flash;
+    int focus;
+    OMX_WHITEBALCONTROLTYPE wb;
+};
+
+struct CameraToSensorModesLUTEntry {
+    const char* name;
+    const SceneModesEntry* Table;
+    const unsigned int size;
+};
+
+static const SceneModesEntry S5K4E1GA_SceneModesLUT [] = {
+    { OMX_Closeup,
+      OMX_IMAGE_FlashControlAuto,
+      OMX_IMAGE_FocusControlAutoMacro,
+      OMX_WhiteBalControlAuto },
+    { OMX_Landscape,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_Underwater,
+      OMX_IMAGE_FlashControlAuto,
+      OMX_IMAGE_FocusControlAutoLock,
+      OMX_WhiteBalControlSunLight },
+    { OMX_Sport,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_Mood,
+       OMX_IMAGE_FlashControlAuto,
+      OMX_IMAGE_FocusControlAutoLock,
+      OMX_WhiteBalControlAuto },
+    { OMX_NightPortrait,
+      OMX_IMAGE_FlashControlAuto,
+      OMX_IMAGE_FocusControlPortrait,
+      OMX_WhiteBalControlAuto },
+    { OMX_NightIndoor,
+      OMX_IMAGE_FlashControlAuto,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_Fireworks,
+      OMX_IMAGE_FlashControlOn,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_Document,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlAutoMacro,
+      OMX_WhiteBalControlAuto },
+    { OMX_Barcode,
+      OMX_IMAGE_FlashControlAuto,
+      OMX_IMAGE_FocusControlAutoMacro,
+      OMX_WhiteBalControlAuto },
+    { OMX_SuperNight,
+      OMX_IMAGE_FlashControlAuto,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_Cine,
+      OMX_IMAGE_FlashControlAuto,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_OldFilm,
+      OMX_IMAGE_FlashControlAuto,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_TI_Action,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlAuto,
+      OMX_WhiteBalControlAuto },
+    { OMX_TI_Beach,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlAutoLock,
+      OMX_WhiteBalControlAuto },
+    { OMX_TI_Candlelight,
+      OMX_IMAGE_FlashControlAuto,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlIncandescent },
+    { OMX_TI_Night,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlAuto,
+      OMX_WhiteBalControlAuto },
+    { OMX_TI_Party,
+      OMX_IMAGE_FlashControlAuto,
+      OMX_IMAGE_FocusControlAuto,
+      OMX_WhiteBalControlAuto },
+    { OMX_TI_Portrait,
+      OMX_IMAGE_FlashControlAuto,
+      OMX_IMAGE_FocusControlPortrait,
+      OMX_WhiteBalControlAuto },
+    { OMX_TI_Snow,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlAutoLock,
+      OMX_WhiteBalControlAuto },
+    { OMX_TI_Steadyphoto,
+      OMX_IMAGE_FlashControlAuto,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_TI_Sunset,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlAuto,
+      OMX_WhiteBalControlSunLight },
+    { OMX_TI_Theatre,
+      OMX_IMAGE_FlashControlAuto,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+};
+
+static const SceneModesEntry S5K6A1GX03_SceneModesLUT [] = {
+    { OMX_Closeup,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_Landscape,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_Underwater,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlSunLight },
+    { OMX_Sport,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_SnowBeach,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_Mood,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_NightPortrait,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_NightIndoor,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_Fireworks,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_Document,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_Barcode,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_SuperNight,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_Cine,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_OldFilm,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_TI_Action,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_TI_Beach,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_TI_Candlelight,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlIncandescent },
+    { OMX_TI_Night,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_TI_Party,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_TI_Portrait,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_TI_Snow,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_TI_Steadyphoto,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+    { OMX_TI_Sunset,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlSunLight },
+    { OMX_TI_Theatre,
+      OMX_IMAGE_FlashControlOff,
+      OMX_IMAGE_FocusControlHyperfocal,
+      OMX_WhiteBalControlAuto },
+};
+
+static const CameraToSensorModesLUTEntry CameraToSensorModesLUT [] = {
+    { "S5K4E1GA", S5K4E1GA_SceneModesLUT, ARRAY_SIZE(S5K4E1GA_SceneModesLUT)},
+    { "S5K6A1GX03", S5K6A1GX03_SceneModesLUT, ARRAY_SIZE(S5K6A1GX03_SceneModesLUT)},
+};
+
+#endif