commit 78fc89a1f563fadde46c8955fd42115dd8cbf9d8
author Alec Mouri <alecmouri@google.com> Sun Nov 21 16:59:30 2021 -0800
committer Alec Mouri <alecmouri@google.com> Wed Nov 24 13:24:36 2021 -0800
tree fa4a161e1865615a419e874922bddc9826304831
parent 492c85c613ac94495c567465ad82b147b4526fb3

Plumb HDR metadata through ASurfaceTexture

This is just used for hwui's usage - HDR metadata on SurfaceTexture is
not publicly exposed.

Bug: 200309590
Test: builds, boots
Change-Id: I373e50ee2d2000cb46c6a73d01e58b965c168311

libs/nativedisplay/surfacetexture/ImageConsumer.cpp

diff --git a/libs/nativedisplay/surfacetexture/ImageConsumer.cpp b/libs/nativedisplay/surfacetexture/ImageConsumer.cpp
index 365e788..cf16739 100644
--- a/libs/nativedisplay/surfacetexture/ImageConsumer.cpp
+++ b/libs/nativedisplay/surfacetexture/ImageConsumer.cpp
@@ -28,7 +28,8 @@
 }
 
 sp<GraphicBuffer> ImageConsumer::dequeueBuffer(int* outSlotid, android_dataspace* outDataspace,
-                                               bool* outQueueEmpty, SurfaceTexture& st,
+                                               HdrMetadata* outHdrMetadata, bool* outQueueEmpty,
+                                               SurfaceTexture& st,
                                                SurfaceTexture_createReleaseFence createFence,
                                                SurfaceTexture_fenceWait fenceWait,
                                                void* fencePassThroughHandle) {
@@ -121,6 +122,7 @@
     st.computeCurrentTransformMatrixLocked();
 
     *outDataspace = item.mDataSpace;
+    *outHdrMetadata = item.mHdrMetadata;
     *outSlotid = slot;
     return st.mSlots[slot].mGraphicBuffer;
 }