commit a79c552b1992fd3bbd0136073387a94116f5028e
author Wonsik Kim <wonsik@google.com> Tue Jan 18 16:29:24 2022 -0800
committer Wonsik Kim <wonsik@google.com> Mon Jan 24 17:00:16 2022 -0800
tree b23889ba8d7cf6b00cb9128aa4e5afcb9b3730cb
parent 2d30cff421dc9ebbb10e4c5ef032514bd2c5e084

codec2: support gralloc4 metadata

Bug: 211517301
Test: cts/media/device-small
Change-Id: Ia8f9e872fc6160823a0c0a212351c9304ef67ff3

media/codec2/sfplugin/C2OMXNode.cpp

diff --git a/media/codec2/sfplugin/C2OMXNode.cpp b/media/codec2/sfplugin/C2OMXNode.cpp
index c049187..ed7d69c 100644
--- a/media/codec2/sfplugin/C2OMXNode.cpp
+++ b/media/codec2/sfplugin/C2OMXNode.cpp
@@ -42,6 +42,7 @@
 
 #include "utils/Codec2Mapper.h"
 #include "C2OMXNode.h"
+#include "Codec2Buffer.h"
 
 namespace android {
 
@@ -466,6 +467,18 @@
                 new Buffer2D(block->share(
                         C2Rect(block->width(), block->height()), ::C2Fence())));
         work->input.buffers.push_back(c2Buffer);
+        std::shared_ptr<C2StreamHdrStaticInfo::input> staticInfo;
+        std::shared_ptr<C2StreamHdrDynamicMetadataInfo::input> dynamicInfo;
+        GetHdrMetadataFromGralloc4Handle(
+                block->handle(),
+                &staticInfo,
+                &dynamicInfo);
+        if (staticInfo && *staticInfo) {
+            c2Buffer->setInfo(staticInfo);
+        }
+        if (dynamicInfo && *dynamicInfo) {
+            c2Buffer->setInfo(dynamicInfo);
+        }
     }
     work->worklets.clear();
     work->worklets.emplace_back(new C2Worklet);