commit 772858d000940849a6d57316fa4f7139b3df84dc
author Yichi Chen <yichichen@google.com> Thu Jun 18 15:12:42 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 18 15:12:42 2020 +0000
tree fcd263e941e6aacadb697340f0625844fe9fd224
parent 34246ad4f5a496cbb7dfce352b584e7ee68ff2c8
parent c30b81eea819aef996ffef102b3b5f2ff65053c4

Merge "CCodec: Validate hdr10PlusInfo with the flexCount" into rvc-dev am: d3c372d58b am: c30b81eea8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11863719

Change-Id: Ic8143f951f437db0dac417a01793fc9493156f8c

media/codec2/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp
index 2cd357b..0626c8d 100644
--- a/media/codec2/sfplugin/CCodecBufferChannel.cpp
+++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -732,6 +732,9 @@
     std::shared_ptr<const C2StreamHdr10PlusInfo::output> hdr10PlusInfo =
         std::static_pointer_cast<const C2StreamHdr10PlusInfo::output>(
                 c2Buffer->getInfo(C2StreamHdr10PlusInfo::output::PARAM_TYPE));
+    if (hdr10PlusInfo && hdr10PlusInfo->flexCount() == 0) {
+        hdr10PlusInfo.reset();
+    }
 
     {
         Mutexed<OutputSurface>::Locked output(mOutputSurface);
@@ -783,7 +786,7 @@
                     .maxLuminance = hdrStaticInfo->mastering.maxLuminance,
                     .minLuminance = hdrStaticInfo->mastering.minLuminance,
                 };
-                hdr.validTypes = HdrMetadata::SMPTE2086;
+                hdr.validTypes |= HdrMetadata::SMPTE2086;
                 hdr.smpte2086 = smpte2086_meta;
             }
             // If the content light level fields are 0, do not use them, it