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

Commit a6b41c29 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 3677ce91 eb90c9b4

media/codec2/sfplugin/CCodecConfig.cpp

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

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





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

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

    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(

    add(ConfigMapper(

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

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

            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(

    add(ConfigMapper(

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

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

            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(

    add(ConfigMapper(

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

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

            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(

    add(ConfigMapper(

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

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

            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, "")

    add(ConfigMapper(C2_PARAMKEY_TEMPORAL_LAYERING, C2_PARAMKEY_TEMPORAL_LAYERING, "")

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

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