commit cc94b55e2d6a95b278d43b4951ae3139fb4759c5
author Mansoor Aftab <maftab@codeaurora.org> Tue Aug 05 11:45:25 2014 -0700
committer Vineeta Srivastava <vsrivastava@google.com> Tue Aug 05 23:03:45 2014 -0700
tree c4e4885553f9424a9f3e11909258a941967e0f8e
parent e716f7d7a70a3df07f8f3a995e4bc17240f63041

Hammerhead: Camera3: Set appropriate lens shading map mode

- Set the correct lens shading map mode based on capture intent
and raw support
- Remove duplicate command for lens shading

Bug: 16605355
Change-Id: I5c4b8b87309c36ed35840934d43ab8dfab0f783b

camera/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp
index 1b4e6b2..48e3fe0 100644
--- a/camera/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp
@@ -4457,8 +4457,13 @@
     static const uint8_t hotPixelMapMode = ANDROID_STATISTICS_HOT_PIXEL_MAP_MODE_OFF;
     settings.update(ANDROID_STATISTICS_HOT_PIXEL_MAP_MODE, &hotPixelMapMode, 1);
 
-    static const uint8_t lensShadingMode = ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_OFF;
-    settings.update(ANDROID_STATISTICS_LENS_SHADING_MAP_MODE, &lensShadingMode, 1);
+    /* Lens shading map mode */
+    uint8_t shadingMapMode = ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_OFF;
+    if (type == CAMERA3_TEMPLATE_STILL_CAPTURE &&
+        gCamCapability[mCameraId]->supported_raw_dim_cnt) {
+      shadingMapMode = ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_ON;
+    }
+    settings.update(ANDROID_STATISTICS_LENS_SHADING_MAP_MODE, &shadingMapMode, 1);
 
     static const uint8_t blackLevelLock = ANDROID_BLACK_LEVEL_LOCK_OFF;
     settings.update(ANDROID_BLACK_LEVEL_LOCK, &blackLevelLock, 1);
@@ -4575,10 +4580,6 @@
     uint8_t facedetect_mode = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;
     settings.update(ANDROID_STATISTICS_FACE_DETECT_MODE, &facedetect_mode, 1);
 
-    /* lens shading map mode */
-    uint8_t shadingmap_mode = ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_OFF;
-    settings.update(ANDROID_STATISTICS_LENS_SHADING_MAP_MODE, &shadingmap_mode, 1);
-
     //special defaults for manual template
     if (type == CAMERA3_TEMPLATE_MANUAL) {
         static const uint8_t manualControlMode = ANDROID_CONTROL_MODE_OFF;