commit 87d1d00ec84f3a6f00759149e860509643e71665
author Mansoor Aftab <maftab@codeaurora.org> Thu May 08 23:18:47 2014 -0700
committer Vineeta Srivastava <vsrivastava@google.com> Mon May 12 09:18:12 2014 -0700
tree 548e51264f40ff2f98e4684bd29f431a0edab022
parent b1c65696a6d18a18736ea6d80e601b30508cbe56

Camera3: Add support for raw stall durations

Add the stall durations for raw stream type in
available stall durations static metadata

Bug: 12958258
Change-Id: Id570f49f3215c78729f2fd4c47b90b4ae1f9655f

camera/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp
index 1975d52..8284dbf 100644
--- a/camera/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp
@@ -3686,19 +3686,29 @@
 
     /*available stall durations depend on the hw + sw and will be different for different devices */
     /*have to add for raw after implementation*/
-    int32_t stall_formats[] = {HAL_PIXEL_FORMAT_BLOB};
+    int32_t stall_formats[] = {HAL_PIXEL_FORMAT_BLOB, ANDROID_SCALER_AVAILABLE_FORMATS_RAW16};
     size_t stall_formats_count = sizeof(stall_formats)/sizeof(int32_t);
 
     size_t available_stall_size = gCamCapability[cameraId]->picture_sizes_tbl_cnt * 4;
     int64_t available_stall_durations[available_stall_size];
     idx = 0;
     for (uint32_t j = 0; j < stall_formats_count; j++) {
-       for (uint32_t i = 0; i < gCamCapability[cameraId]->picture_sizes_tbl_cnt; i++) {
-          available_stall_durations[idx]   = stall_formats[j];
-          available_stall_durations[idx+1] = gCamCapability[cameraId]->picture_sizes_tbl[i].width;
-          available_stall_durations[idx+2] = gCamCapability[cameraId]->picture_sizes_tbl[i].height;
-          available_stall_durations[idx+3] = gCamCapability[cameraId]->stall_durations[i];
-          idx+=4;
+       if (stall_formats[j] == HAL_PIXEL_FORMAT_BLOB) {
+          for (uint32_t i = 0; i < gCamCapability[cameraId]->picture_sizes_tbl_cnt; i++) {
+             available_stall_durations[idx]   = stall_formats[j];
+             available_stall_durations[idx+1] = gCamCapability[cameraId]->picture_sizes_tbl[i].width;
+             available_stall_durations[idx+2] = gCamCapability[cameraId]->picture_sizes_tbl[i].height;
+             available_stall_durations[idx+3] = gCamCapability[cameraId]->jpeg_stall_durations[i];
+             idx+=4;
+          }
+       } else {
+          for (uint32_t i = 0; i < gCamCapability[cameraId]->supported_raw_dim_cnt; i++) {
+             available_stall_durations[idx]   = stall_formats[j];
+             available_stall_durations[idx+1] = gCamCapability[cameraId]->raw_dim[i].width;
+             available_stall_durations[idx+2] = gCamCapability[cameraId]->raw_dim[i].height;
+             available_stall_durations[idx+3] = gCamCapability[cameraId]->raw16_stall_durations[i];
+             idx+=4;
+          }
        }
     }
     staticInfo.update(ANDROID_SCALER_AVAILABLE_STALL_DURATIONS,

camera/QCamera2/stack/common/cam_intf.h

diff --git a/camera/QCamera2/stack/common/cam_intf.h b/camera/QCamera2/stack/common/cam_intf.h
index bf7b2a8..5c144b5 100644
--- a/camera/QCamera2/stack/common/cam_intf.h
+++ b/camera/QCamera2/stack/common/cam_intf.h
@@ -292,8 +292,9 @@
 
     uint8_t supported_test_pattern_modes_cnt;
     cam_test_pattern_mode_t supported_test_pattern_modes[MAX_TEST_PATTERN_CNT];
-    
-    int64_t stall_durations[MAX_SIZES_CNT];
+
+    int64_t jpeg_stall_durations[MAX_SIZES_CNT];
+    int64_t raw16_stall_durations[MAX_SIZES_CNT];
     cam_illuminant_t reference_illuminant1;
     cam_illuminant_t reference_illuminant2;
     cam_rational_type_t forward_matrix1[3][3];