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

Commit eb90c9b4 authored by Wonsik Kim's avatar Wonsik Kim Committed by Cherrypicker Worker
Browse files

CCodecConfig: split input/output HDR dynamic metadata 

Bug: 275651696
Test: android.mediav2.cts.DecoderHDRInfoTest
(cherry picked from https://android-review.googlesource.com/q/commit:48e98a1dd9e19fad565fda2b5a3f0fec3dbd7528)
Merged-In: I7352730a9cbc988e3264b42c399db3cf8d97b13c
Change-Id: I7352730a9cbc988e3264b42c399db3cf8d97b13c
parent ecc9843c

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