commit 82db9e6126812dd2ee74e33e4c475cae2c7e48f6
author Igor Murashkin <iam@google.com> Tue May 21 11:38:49 2013 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 22 17:30:23 2013 +0000
tree 78bf55cea9028079fde7993069538d446fe8a3d2
parent f21daf4718bbd5662eae843f5a56e039bd34a2f4

camera3: Fix recording failure when switching resolutions while preview on

Bug: 9069574
Change-Id: Ife2ae5467f799dbe37e66714b3a6c9a51e1fe328

services/camera/libcameraservice/Camera2Client.cpp

diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp
index 2e01dae..dd50e3c 100644
--- a/services/camera/libcameraservice/Camera2Client.cpp
+++ b/services/camera/libcameraservice/Camera2Client.cpp
@@ -889,7 +889,10 @@
         }
     }
 
-    res = mStreamingProcessor->updateRecordingStream(params);
+    res = updateProcessorStream<
+            StreamingProcessor,
+            &StreamingProcessor::updateRecordingStream>(mStreamingProcessor,
+                                                        params);
     if (res != OK) {
         ALOGE("%s: Camera %d: Unable to update recording stream: %s (%d)",
                 __FUNCTION__, mCameraId, strerror(-res), res);
@@ -1608,9 +1611,20 @@
 template <typename ProcessorT>
 status_t Camera2Client::updateProcessorStream(sp<ProcessorT> processor,
                                               camera2::Parameters params) {
+    // No default template arguments until C++11, so we need this overload
+    return updateProcessorStream<ProcessorT, &ProcessorT::updateStream>(
+            processor, params);
+}
+
+template <typename ProcessorT,
+          status_t (ProcessorT::*updateStreamF)(const Parameters &)>
+status_t Camera2Client::updateProcessorStream(sp<ProcessorT> processor,
+                                              Parameters params) {
     status_t res;
 
-    res = processor->updateStream(params);
+    // Get raw pointer since sp<T> doesn't have operator->*
+    ProcessorT *processorPtr = processor.get();
+    res = (processorPtr->*updateStreamF)(params);
 
     /**
      * Can't update the stream if it's busy?
@@ -1631,7 +1645,7 @@
                     __FUNCTION__, mCameraId, strerror(-res), res);
         }
 
-        res = processor->updateStream(params);
+        res = (processorPtr->*updateStreamF)(params);
         if (res != OK) {
             ALOGE("%s: Camera %d: Failed to update processing stream "
                   " despite having halted streaming first: %s (%d)",