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

Commit 94a89ece authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "CCodecConfig: split input/output HDR dynamic metadata" into udc-dev am:... 

Merge "CCodecConfig: split input/output HDR dynamic metadata" into udc-dev am: a6b41c29 am: e541dc93

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



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

media/codec2/sfplugin/CCodecConfig.cpp

+6 −6
Original line number Diff line number Diff line
@@ -625,30 +625,30 @@ void CCodecConfig::initializeStandardParams() { 
        .limitTo(D::OUTPUT & D::READ));



    deprecated(ConfigMapper(KEY_HDR10_PLUS_INFO, C2_PARAMKEY_INPUT_HDR10_PLUS_INFO, "value")

        .limitTo(D::VIDEO & D::PARAM & D::INPUT));

        .limitTo(D::VIDEO & D::PARAM & D::INPUT & (D::CONFIG | D::PARAM)));



    deprecated(ConfigMapper(KEY_HDR10_PLUS_INFO, C2_PARAMKEY_OUTPUT_HDR10_PLUS_INFO, "value")

        .limitTo(D::VIDEO & D::OUTPUT));

        .limitTo(D::VIDEO & D::OUTPUT & D::READ));



    add(ConfigMapper(

            std::string(C2_PARAMKEY_INPUT_HDR_DYNAMIC_INFO) + ".type",

            C2_PARAMKEY_INPUT_HDR_DYNAMIC_INFO, "type")

        .limitTo(D::VIDEO & D::PARAM & D::INPUT));

        .limitTo(D::VIDEO & D::PARAM & D::INPUT & (D::CONFIG | D::PARAM)));



    add(ConfigMapper(

            std::string(C2_PARAMKEY_INPUT_HDR_DYNAMIC_INFO) + ".data",

            C2_PARAMKEY_INPUT_HDR_DYNAMIC_INFO, "data")

        .limitTo(D::VIDEO & D::PARAM & D::INPUT));

        .limitTo(D::VIDEO & D::PARAM & D::INPUT & (D::CONFIG | D::PARAM)));



    add(ConfigMapper(

            std::string(C2_PARAMKEY_OUTPUT_HDR_DYNAMIC_INFO) + ".type",

            C2_PARAMKEY_OUTPUT_HDR_DYNAMIC_INFO, "type")

        .limitTo(D::VIDEO & D::OUTPUT));

        .limitTo(D::VIDEO & D::OUTPUT & D::READ));



    add(ConfigMapper(

            std::string(C2_PARAMKEY_OUTPUT_HDR_DYNAMIC_INFO) + ".data",

            C2_PARAMKEY_OUTPUT_HDR_DYNAMIC_INFO, "data")

        .limitTo(D::VIDEO & D::OUTPUT));

        .limitTo(D::VIDEO & D::OUTPUT & D::READ));



    add(ConfigMapper(C2_PARAMKEY_TEMPORAL_LAYERING, C2_PARAMKEY_TEMPORAL_LAYERING, "")

        .limitTo(D::ENCODER & D::VIDEO & D::OUTPUT));