commit 2c3ec784019b0f81b9581b64c5bf1c06b9eefa1a
author Mansoor Aftab <maftab@codeaurora.org> Wed May 29 16:53:54 2013 -0700
committer The Android Automerger <android-build@android.com> Wed May 29 17:58:43 2013 -0700
tree c3a1151ee754b639497f9d653c7d8240be55a461
parent 06b94b44846045f7fb5f44950b01a43ed241341d

Camera3: Fix Preview Format & Scene mode parameters

* Populate preview formats list correctly
* Remove unsupported scene mode

Bug: 8970631
Bug: 9111949
Change-Id: I14e4e59103c244d0006bdfa45ff3eb1380ed26f0
Signed-off-by: Iliyan Malchev <malchev@google.com>

camera/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp
index 261bc93..ef4cca5 100644
--- a/camera/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp
@@ -75,7 +75,6 @@
 };
 
 const QCamera3HardwareInterface::QCameraMap QCamera3HardwareInterface::SCENE_MODES_MAP[] = {
-    { ANDROID_CONTROL_SCENE_MODE_UNSUPPORTED,    CAM_SCENE_MODE_OFF },
     { ANDROID_CONTROL_SCENE_MODE_ACTION,         CAM_SCENE_MODE_ACTION },
     { ANDROID_CONTROL_SCENE_MODE_PORTRAIT,       CAM_SCENE_MODE_PORTRAIT },
     { ANDROID_CONTROL_SCENE_MODE_LANDSCAPE,      CAM_SCENE_MODE_LANDSCAPE },
@@ -1669,13 +1668,8 @@
                       &gCamCapability[cameraId]->raw_min_duration,
                        1);
 
-    int32_t scalar_formats[CAM_FORMAT_MAX];
-    int scalar_formats_count = gCamCapability[cameraId]->supported_scalar_format_cnt;
-    for (int i = 0; i < scalar_formats_count; i++) {
-        scalar_formats[i] = getScalarFormat(gCamCapability[cameraId]->supported_scalar_fmts[i]);
-    }
-    scalar_formats[scalar_formats_count] = HAL_PIXEL_FORMAT_YCbCr_420_888;
-    scalar_formats_count++;
+    int32_t scalar_formats[] = {HAL_PIXEL_FORMAT_YCbCr_420_888};
+    int scalar_formats_count = 1;
     staticInfo.update(ANDROID_SCALER_AVAILABLE_FORMATS,
                       scalar_formats,
                       scalar_formats_count);