commit 2f074ce7ca8cce3189cebe0a0ce1b1ff402c814b
author Shuzhen Wang <shuzhenwang@google.com> Mon Aug 27 11:39:53 2018 -0700
committer Shuzhen Wang <shuzhenwang@google.com> Tue Aug 28 15:10:01 2018 +0000
tree 5da4ee065839e2fbca120d7c2e297678464d8a76
parent 0d97cec0533f47237b16b294fd92a827f2ebdc6f

Camera3: Handle stream format override for shared output stream

If HAL overrides stream format, use the overridden format to configure
the buffer queues.

Bug: 113326269
Test: Camera CTS
Change-Id: I6b198e8ebfeaeafbda530722d995a12f88f0b35a

services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp b/services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp
index 8a9402e..8bc208d 100644
--- a/services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp
+++ b/services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp
@@ -182,12 +182,19 @@
         return BAD_VALUE;
     }
 
-  status_t res = native_window_set_buffers_dimensions(outputQueue.get(),
+    status_t res = native_window_set_buffers_dimensions(outputQueue.get(),
             mWidth, mHeight);
     if (res != NO_ERROR) {
         SP_LOGE("addOutput: failed to set buffer dimensions (%d)", res);
         return res;
     }
+    res = native_window_set_buffers_format(outputQueue.get(),
+            mFormat);
+    if (res != OK) {
+        ALOGE("%s: Unable to configure stream buffer format %#x for surfaceId %zu",
+                __FUNCTION__, mFormat, surfaceId);
+        return res;
+    }
 
     sp<IGraphicBufferProducer> gbp = outputQueue->getIGraphicBufferProducer();
     // Connect to the buffer producer