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

Commit 30c1d421 authored by Wonsik Kim's avatar Wonsik Kim
Browse files

CCodecConfig: don't read DRC_COMPRESSION_MODE back 

DRC_COMPRESSION_MODE is not meant to be read back from components

Bug: 149751672
Test: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small
Test: atest CtsMediaTestCases:DecoderTestAacDrc
Change-Id: I45750c75901fd1195fbea314291d39c69b2fde1b
parent 018b91ed

media/codec2/sfplugin/CCodecConfig.cpp

+2 −10
Original line number Original line Diff line number Diff line
@@ -765,21 +765,13 @@ void CCodecConfig::initializeStandardParams() { 




    // convert to compression type and add default

    // convert to compression type and add default

    add(ConfigMapper(KEY_AAC_DRC_HEAVY_COMPRESSION, C2_PARAMKEY_DRC_COMPRESSION_MODE, "value")

    add(ConfigMapper(KEY_AAC_DRC_HEAVY_COMPRESSION, C2_PARAMKEY_DRC_COMPRESSION_MODE, "value")

        .limitTo(D::AUDIO & D::DECODER & (D::CONFIG | D::PARAM | D::READ))

        .limitTo(D::AUDIO & D::DECODER & (D::CONFIG | D::PARAM))

        .withMappers([](C2Value v) -> C2Value {

        .withMapper([](C2Value v) -> C2Value {

            int32_t value;

            int32_t value;

            if (!v.get(&value) || value < 0) {

            if (!v.get(&value) || value < 0) {

                value = property_get_int32(PROP_DRC_OVERRIDE_HEAVY, DRC_DEFAULT_MOBILE_DRC_HEAVY);

                value = property_get_int32(PROP_DRC_OVERRIDE_HEAVY, DRC_DEFAULT_MOBILE_DRC_HEAVY);

            }

            }

            return value == 1 ? C2Config::DRC_COMPRESSION_HEAVY : C2Config::DRC_COMPRESSION_LIGHT;

            return value == 1 ? C2Config::DRC_COMPRESSION_HEAVY : C2Config::DRC_COMPRESSION_LIGHT;

        },[](C2Value v) -> C2Value {

            int32_t value;

            if (v.get(&value)) {

              return value;

            }

            else {

              return C2Value();

            }

        }));

        }));





    // convert to dBFS and add default

    // convert to dBFS and add default