Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f683da78 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "codec2: check a validation of HDR static info" am: 0a106546 am:... 

Merge "codec2: check a validation of HDR static info" am: 0a106546 am: 5fd9ff54 am: 11c25c5b am: c7c09d2c am: b3ec9d54

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



Change-Id: I51c28a8583e4fa73eb5beabda94503f77c4ca46e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 64515557 b3ec9d54

media/codec2/sfplugin/CCodecBufferChannel.cpp

+5 −0
Original line number Diff line number Diff line
@@ -923,6 +923,11 @@ status_t CCodecBufferChannel::renderOutputBuffer( 
                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) {