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

Commit e8fd837b authored by Wonsik Kim's avatar Wonsik Kim Committed by Automerger Merge Worker
Browse files

Merge "CCodecConfig: split input/output HDR dynamic metadata" am: 4ae9adfb... 

Merge "CCodecConfig: split input/output HDR dynamic metadata" am: 4ae9adfb am: f114f90f am: 38dd70b9

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



Change-Id: I44df11d3cf2962c98395481af2b6cbfc2c252fb8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a9b9adcc 38dd70b9

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));