| commit | c7c09d2cf3108c5a35f1d827fd669da7d618452b | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Apr 13 19:48:36 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 13 19:48:36 2022 +0000 |
| tree | 0b75683186166aa0ca9889d2fcb6279c11f3947e | |
| parent | 5f3bf8047c08890917d71cb16acd8cb7e85e402a [diff] | |
| parent | 11c25c5bfe086e2c1e3d173c592356797819fa6b [diff] |
Merge "codec2: check a validation of HDR static info" am: 0a10654635 am: 5fd9ff54ea am: 11c25c5bfe Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2058129 Change-Id: Ieade8830d0d07c2a780275ab287a2f24162a689e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp index 870660e..900046e 100644 --- a/media/codec2/sfplugin/CCodecBufferChannel.cpp +++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -923,6 +923,11 @@ hdr.validTypes |= HdrMetadata::CTA861_3; hdr.cta8613 = cta861_meta; } + + // does not have valid info + if (!(hdr.validTypes & (HdrMetadata::SMPTE2086 | HdrMetadata::CTA861_3))) { + hdrStaticInfo.reset(); + } } if (hdrDynamicInfo && hdrDynamicInfo->m.type_ == C2Config::HDR_DYNAMIC_METADATA_TYPE_SMPTE_2094_40) {