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

Commit edf942bd authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

AAC decoder: enable set/get of DRC parameters during decoding 

Enable setting/getting the following parameters at runtime (after
decoder creation):
KEY_AAC_DRC_TARGET_REFERENCE_LEVEL
KEY_AAC_DRC_TARGET_ATTENUATION_FACTOR
KEY_AAC_DRC_TARGET_BOOST_FACTOR
KEY_AAC_DRC_TARGET_HEAVY_COMPRESSION
KEY_AAC_DRC_EFFECT_TYPE
KEY_AAC_ENCODED_TARGET_LEVEL

Bug: 148559932
Test: atest android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: Id9a0151f0cdf00297dd4cac7185669fba51b6a0d
parent 0f97ee5a

media/codec2/components/aac/C2SoftAacDec.cpp

+33 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ status_t C2SoftAacDec::initDecoder() { 


    //  DRC_PRES_MODE_WRAP_DESIRED_HEAVY

    int32_t compressMode = mIntf->getDrcCompressMode();

    ALOGV("AAC decoder using desried DRC heavy compression switch of %d", compressMode);

    ALOGV("AAC decoder using desired DRC heavy compression switch of %d", compressMode);

    mDrcWrap.setParam(DRC_PRES_MODE_WRAP_DESIRED_HEAVY, (unsigned)compressMode);



    // DRC_PRES_MODE_WRAP_ENCODER_TARGET
@@ -640,6 +640,38 @@ void C2SoftAacDec::process( 


        // run DRC check

        mDrcWrap.submitStreamData(mStreamInfo);



        // apply runtime updates

        //  DRC_PRES_MODE_WRAP_DESIRED_TARGET

        int32_t targetRefLevel = mIntf->getDrcTargetRefLevel();

        ALOGV("AAC decoder using desired DRC target reference level of %d", targetRefLevel);

        mDrcWrap.setParam(DRC_PRES_MODE_WRAP_DESIRED_TARGET, (unsigned)targetRefLevel);



        //  DRC_PRES_MODE_WRAP_DESIRED_ATT_FACTOR

        int32_t attenuationFactor = mIntf->getDrcAttenuationFactor();

        ALOGV("AAC decoder using desired DRC attenuation factor of %d", attenuationFactor);

        mDrcWrap.setParam(DRC_PRES_MODE_WRAP_DESIRED_ATT_FACTOR, (unsigned)attenuationFactor);



        //  DRC_PRES_MODE_WRAP_DESIRED_BOOST_FACTOR

        int32_t boostFactor = mIntf->getDrcBoostFactor();

        ALOGV("AAC decoder using desired DRC boost factor of %d", boostFactor);

        mDrcWrap.setParam(DRC_PRES_MODE_WRAP_DESIRED_BOOST_FACTOR, (unsigned)boostFactor);



        //  DRC_PRES_MODE_WRAP_DESIRED_HEAVY

        int32_t compressMode = mIntf->getDrcCompressMode();

        ALOGV("AAC decoder using desried DRC heavy compression switch of %d", compressMode);

        mDrcWrap.setParam(DRC_PRES_MODE_WRAP_DESIRED_HEAVY, (unsigned)compressMode);



        // DRC_PRES_MODE_WRAP_ENCODER_TARGET

        int32_t encTargetLevel = mIntf->getDrcEncTargetLevel();

        ALOGV("AAC decoder using encoder-side DRC reference level of %d", encTargetLevel);

        mDrcWrap.setParam(DRC_PRES_MODE_WRAP_ENCODER_TARGET, (unsigned)encTargetLevel);



        // AAC_UNIDRC_SET_EFFECT

        int32_t effectType = mIntf->getDrcEffectType();

        ALOGV("AAC decoder using MPEG-D DRC effect type %d", effectType);

        aacDecoder_SetParam(mAACDecoder, AAC_UNIDRC_SET_EFFECT, effectType);



        mDrcWrap.update();



        UINT inBufferUsedLength = inBufferLength[0] - bytesValid[0];

media/codec2/sfplugin/CCodecConfig.cpp

+61 −15
Original line number Diff line number Diff line
@@ -700,63 +700,101 @@ void CCodecConfig::initializeStandardParams() { 


    // convert to dBFS and add default

    add(ConfigMapper(KEY_AAC_DRC_TARGET_REFERENCE_LEVEL, C2_PARAMKEY_DRC_TARGET_REFERENCE_LEVEL, "value")

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

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

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

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

            int32_t value;

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

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

                value = property_get_int32(PROP_DRC_OVERRIDE_REF_LEVEL, DRC_DEFAULT_MOBILE_REF_LEVEL);

            }

            return float(-0.25 * c2_min(value, 127));

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

            float value;

            if (v.get(&value)) {

                return (int32_t) (-4. * value);

            }

            return C2Value();

        }));



    // convert to 0-1 (%) and add default

    add(ConfigMapper(KEY_AAC_DRC_ATTENUATION_FACTOR, C2_PARAMKEY_DRC_ATTENUATION_FACTOR, "value")

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

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

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

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

            int32_t value;

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

                value = property_get_int32(PROP_DRC_OVERRIDE_CUT, DRC_DEFAULT_MOBILE_DRC_CUT);

            }

            return float(c2_min(value, 127) / 127.);

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

            float value;

            if (v.get(&value)) {

              return (int32_t) (value * 127. + 0.5);

            }

            else {

              return C2Value();

            }

        }));



    // convert to 0-1 (%) and add default

    add(ConfigMapper(KEY_AAC_DRC_BOOST_FACTOR, C2_PARAMKEY_DRC_BOOST_FACTOR, "value")

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

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

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

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

            int32_t value;

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

                value = property_get_int32(PROP_DRC_OVERRIDE_BOOST, DRC_DEFAULT_MOBILE_DRC_BOOST);

            }

            return float(c2_min(value, 127) / 127.);

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

            float value;

            if (v.get(&value)) {

              return (int32_t) (value * 127. + 0.5);

            }

            else {

              return C2Value();

            }

        }));



    // convert to compression type and add default

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

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

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

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

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

            int32_t value;

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

                value = property_get_int32(PROP_DRC_OVERRIDE_HEAVY, DRC_DEFAULT_MOBILE_DRC_HEAVY);

            }

            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

    add(ConfigMapper(KEY_AAC_ENCODED_TARGET_LEVEL, C2_PARAMKEY_DRC_ENCODED_TARGET_LEVEL, "value")

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

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

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

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

            int32_t value;

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

                value = property_get_int32(PROP_DRC_OVERRIDE_ENC_LEVEL, DRC_DEFAULT_MOBILE_ENC_LEVEL);

            }

            return float(-0.25 * c2_min(value, 127));

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

            float value;

            if (v.get(&value)) {

              return (int32_t) (-4. * value);

            }

            else {

              return C2Value();

            }

        }));



    // convert to effect type (these map to SDK values) and add default

    add(ConfigMapper(KEY_AAC_DRC_EFFECT_TYPE, C2_PARAMKEY_DRC_EFFECT_TYPE, "value")

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

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

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

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

            int32_t value;

            if (!v.get(&value) || value < -1 || value > 8) {

                value = property_get_int32(PROP_DRC_OVERRIDE_EFFECT, DRC_DEFAULT_MOBILE_DRC_EFFECT);
@@ -766,13 +804,21 @@ void CCodecConfig::initializeStandardParams() { 
                }

            }

            return value;

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

            int32_t value;

            if (v.get(&value)) {

              return  value;

            }

            else {

              return C2Value();

            }

        }));



    add(ConfigMapper(KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT, C2_PARAMKEY_MAX_CHANNEL_COUNT, "value")

        .limitTo(D::AUDIO));

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



    add(ConfigMapper(KEY_AAC_SBR_MODE, C2_PARAMKEY_AAC_SBR_MODE, "value")

        .limitTo(D::AUDIO & D::ENCODER & D::CONFIG)

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

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

            int32_t value;

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