commit 3d9c61eee5256354215b9c7e5eb8bef5be9357f8
author Mansoor Aftab <maftab@codeaurora.org> Thu May 23 17:55:37 2013 -0700
committer Iliyan Malchev <malchev@google.com> Thu May 23 18:14:46 2013 -0700
tree 39ba244f835ede3f75a90d95b1fd24dab8dca5ea
parent 172e44f8d2e0ac854b0c25fd78d3ec81aa2269ef

Camera3: Remove the hardcoding for thumbnail size

1) Use the thumbnail size set by the framework
2) Send correct available thumbnail sizes

Bug: 9107486
Change-Id: Idf55d3904561c36da467063f8bc399c8362d9d72

camera/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp
index d4aaa5f..91720db 100644
--- a/camera/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp
@@ -123,6 +123,8 @@
     { ANDROID_FLASH_MODE_TORCH,  CAM_FLASH_MODE_TORCH}
 };
 
+const int32_t available_thumbnail_sizes[] = {512, 288, 480, 288, 256, 154, 432, 288,
+                                             320, 240, 176, 144, 0, 0};
 
 camera3_device_ops_t QCamera3HardwareInterface::mCameraOps = {
     initialize:                         QCamera3HardwareInterface::initialize,
@@ -1721,8 +1723,8 @@
                 (gCamCapability[cameraId]->picture_sizes_tbl_cnt * 2));
 
     staticInfo.update(ANDROID_JPEG_AVAILABLE_THUMBNAIL_SIZES,
-                      available_jpeg_sizes,
-                      (gCamCapability[cameraId]->picture_sizes_tbl_cnt * 2));
+                      available_thumbnail_sizes,
+                      sizeof(available_thumbnail_sizes)/sizeof(int32_t));
 
     int32_t max_jpeg_size = 0;
     int temp_width, temp_height;
@@ -2725,11 +2727,9 @@
             jpeg_settings.find(ANDROID_JPEG_THUMBNAIL_SIZE).data.i32[0];
         mJpegSettings->thumbnail_size.height =
             jpeg_settings.find(ANDROID_JPEG_THUMBNAIL_SIZE).data.i32[1];
-        mJpegSettings->thumbnail_size.width = 320;
-        mJpegSettings->thumbnail_size.height = 240;
     } else {
-        mJpegSettings->thumbnail_size.width = 640;
-        mJpegSettings->thumbnail_size.height = 480;
+        mJpegSettings->thumbnail_size.width = 0;
+        mJpegSettings->thumbnail_size.height = 0;
     }
     if (jpeg_settings.exists(ANDROID_JPEG_GPS_COORDINATES)) {
         for (int i = 0; i < 3; i++) {