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

Commit 5b8a973c authored by Taehwan Kim's avatar Taehwan Kim Committed by Wonsik Kim
Browse files

[resolved conflict] codec2: add missing C2StreamHdrDynamicMetadataInfo am:... 

[resolved conflict] codec2: add missing C2StreamHdrDynamicMetadataInfo am: 2d222b8f am: 0387b105

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



Bug: 234021117
Change-Id: I303f8245d09c6fa734f05849994862e37ce668b1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 04eb7c0a 0387b105

media/codec2/sfplugin/CCodec.cpp

+2 −1
Original line number Diff line number Diff line
@@ -2425,7 +2425,8 @@ void CCodec::onMessageReceived(const sp<AMessage> &msg) { 
                        C2StreamColorAspectsInfo::output::PARAM_TYPE,

                        C2StreamDataSpaceInfo::output::PARAM_TYPE,

                        C2StreamHdrStaticInfo::output::PARAM_TYPE,

                        C2StreamHdr10PlusInfo::output::PARAM_TYPE,

                        C2StreamHdr10PlusInfo::output::PARAM_TYPE,  // will be deprecated

                        C2StreamHdrDynamicMetadataInfo::output::PARAM_TYPE,

                        C2StreamPixelAspectRatioInfo::output::PARAM_TYPE,

                        C2StreamSurfaceScalingInfo::output::PARAM_TYPE

                    };

media/codec2/sfplugin/Codec2InfoBuilder.cpp

+3 −1
Original line number Diff line number Diff line
@@ -136,7 +136,9 @@ bool addSupportedProfileLevels( 
                continue;

            }

            switch (type.coreIndex()) {

            case C2StreamHdr10PlusInfo::CORE_INDEX:

            case C2StreamHdrDynamicMetadataInfo::CORE_INDEX:

                [[fallthrough]];

            case C2StreamHdr10PlusInfo::CORE_INDEX:  // will be deprecated

                supportsHdr10Plus = true;

                break;

            case C2StreamHdrStaticInfo::CORE_INDEX: