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/Camera3SharedOutputStream.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3SharedOutputStream.cpp b/services/camera/libcameraservice/device3/Camera3SharedOutputStream.cpp
index 2bb9ff7..fb3ce4c 100644
--- a/services/camera/libcameraservice/device3/Camera3SharedOutputStream.cpp
+++ b/services/camera/libcameraservice/device3/Camera3SharedOutputStream.cpp
@@ -60,9 +60,8 @@
         }
     }
 
-    android::PixelFormat format = isFormatOverridden() ? getOriginalFormat() : getFormat();
     res = mStreamSplitter->connect(initialSurfaces, usage, mUsage, camera3_stream::max_buffers,
-            getWidth(), getHeight(), format, &mConsumer);
+            getWidth(), getHeight(), getFormat(), &mConsumer);
     if (res != OK) {
         ALOGE("%s: Failed to connect to stream splitter: %s(%d)",
                 __FUNCTION__, strerror(-res), res);