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

Commit 2d222b8f authored May 12, 2022 by Taehwan Kim Committed by Cherrypicker Worker May 25, 2022

codec2: add missing C2StreamHdrDynamicMetadataInfo



Bug: 232439925

Change-Id: Iba0fb7b062ee4993f15c6490e9f579792d34b815
Signed-off-by: Taehwan Kim <t_h.kim@samsung.com>
(cherry picked from commit 3a37c4d7)
Merged-In: Iba0fb7b062ee4993f15c6490e9f579792d34b815

parent 866b6639

media/codec2/hidl/plugin/samples/SampleFilterPlugin.cpp

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -807,7 +807,8 @@ const FilterPlugin_V1::Descriptor SampleToneMappingFilter::Interface::DESCRIPTOR
	// affectedParams		// affectedParams
	{		{
	C2StreamHdrStaticInfo::output::PARAM_TYPE,		C2StreamHdrStaticInfo::output::PARAM_TYPE,
	C2StreamHdr10PlusInfo::output::PARAM_TYPE,		C2StreamHdr10PlusInfo::output::PARAM_TYPE, // will be deprecated
			C2StreamHdrDynamicMetadataInfo::output::PARAM_TYPE,
	C2StreamColorAspectsInfo::output::PARAM_TYPE,		C2StreamColorAspectsInfo::output::PARAM_TYPE,
	},		},
	};		};

media/codec2/sfplugin/CCodec.cpp

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2425,7 +2425,8 @@ void CCodec::onMessageReceived(const sp<AMessage> &msg) {
	C2StreamColorAspectsInfo::output::PARAM_TYPE,		C2StreamColorAspectsInfo::output::PARAM_TYPE,
	C2StreamDataSpaceInfo::output::PARAM_TYPE,		C2StreamDataSpaceInfo::output::PARAM_TYPE,
	C2StreamHdrStaticInfo::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,		C2StreamPixelAspectRatioInfo::output::PARAM_TYPE,
	C2StreamSurfaceScalingInfo::output::PARAM_TYPE		C2StreamSurfaceScalingInfo::output::PARAM_TYPE
	};		};

media/codec2/sfplugin/Codec2InfoBuilder.cpp

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -136,7 +136,9 @@ bool addSupportedProfileLevels(
	continue;		continue;
	}		}
	switch (type.coreIndex()) {		switch (type.coreIndex()) {
	case C2StreamHdr10PlusInfo::CORE_INDEX:		case C2StreamHdrDynamicMetadataInfo::CORE_INDEX:
			[[fallthrough]];
			case C2StreamHdr10PlusInfo::CORE_INDEX: // will be deprecated
	supportsHdr10Plus = true;		supportsHdr10Plus = true;
	break;		break;
	case C2StreamHdrStaticInfo::CORE_INDEX:		case C2StreamHdrStaticInfo::CORE_INDEX: