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

Commit b7fdbeab authored by Treehugger Robot's avatar Treehugger Robot Committed by Wonsik Kim
Browse files

[resolved conflict] Merge "codec2: add missing C2StreamHdrDynamicMetadataInfo"... 

[resolved conflict] Merge "codec2: add missing C2StreamHdrDynamicMetadataInfo" am: 60898891 am: 78b34625 am: 1fc73e9b am: c4b25209 am: b9f4c1c4

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



Bug: 233917894
Change-Id: I0fc87803e1ac33785cc5319f5457070325cc13b9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b6b86418 b9f4c1c4

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: