commit 944026cabf903a3ba6b3d53fdd2e4caeadf8bf19
author Shuzhen Wang <shuzhenw@codeaurora.org> Fri Sep 20 13:55:05 2013 -0700
committer Iliyan Malchev <malchev@google.com> Fri Sep 20 14:12:41 2013 -0700
tree a59f4ed84f807a0150c73faad84fca032abfc3ad
parent a28de82ba37e90996bb85a27365e28f04e7aa3e7

Camera3: Fix send stream info.

Stream info should be send before register channel
buffers for second channel.

Bug: 10825274
Change-Id: Ieac823ab6a9c08aa57538f1f07b764f731b8b612

camera/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp
index 18d9d86..4778dc9 100644
--- a/camera/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp
@@ -663,6 +663,22 @@
             // Do nothing for now
         }
     }
+
+    int32_t hal_version = CAM_HAL_V3;
+    stream_config_info.num_streams = streamList->num_streams;
+
+    // settings/parameters don't carry over for new configureStreams
+    memset(mParameters, 0, sizeof(parm_buffer_t));
+
+    mParameters->first_flagged_entry = CAM_INTF_PARM_MAX;
+    AddSetParmEntryToBatch(mParameters, CAM_INTF_PARM_HAL_VERSION,
+                sizeof(hal_version), &hal_version);
+
+    AddSetParmEntryToBatch(mParameters, CAM_INTF_META_STREAM_INFO,
+                sizeof(stream_config_info), &stream_config_info);
+
+    mCameraHandle->ops->set_parms(mCameraHandle->camera_handle, mParameters);
+
     /*For the streams to be reconfigured we need to register the buffers
       since the framework wont*/
     for (List<stream_info_t *>::iterator it = mStreamInfo.begin();
@@ -703,20 +719,6 @@
             m = mStoredMetadataList.erase(m);
         }
     }
-    int32_t hal_version = CAM_HAL_V3;
-    stream_config_info.num_streams = streamList->num_streams;
-
-    //settings/parameters don't carry over for new configureStreams
-    memset(mParameters, 0, sizeof(parm_buffer_t));
-
-    mParameters->first_flagged_entry = CAM_INTF_PARM_MAX;
-    AddSetParmEntryToBatch(mParameters, CAM_INTF_PARM_HAL_VERSION,
-                sizeof(hal_version), &hal_version);
-
-    AddSetParmEntryToBatch(mParameters, CAM_INTF_META_STREAM_INFO,
-                sizeof(stream_config_info), &stream_config_info);
-
-    mCameraHandle->ops->set_parms(mCameraHandle->camera_handle, mParameters);
 
     mFirstRequest = true;