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

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

AAC decoder: add support for controlling presentation parameters 

Control the dowmixing of the AAC decoder
Control the DRC processing of the AAC decoder

Bug 16740915

Change-Id: I9b06ea8785f56213ea120ed85eeb360c88223297
parent b97cc6a9

include/media/stagefright/ACodec.h

+10 −1
Original line number Diff line number Diff line
@@ -248,10 +248,19 @@ private: 
            int32_t width, int32_t height,

            OMX_VIDEO_CODINGTYPE compressionFormat);



    typedef struct drcParams {

        int32_t drcCut;

        int32_t drcBoost;

        int32_t heavyCompression;

        int32_t targetRefLevel;

        int32_t encodedTargetLevel;

    } drcParams_t;



    status_t setupAACCodec(

            bool encoder,

            int32_t numChannels, int32_t sampleRate, int32_t bitRate,

            int32_t aacProfile, bool isADTS, int32_t sbrMode);

            int32_t aacProfile, bool isADTS, int32_t sbrMode,

            int32_t maxOutputChannelCount, const drcParams_t& drc);



    status_t setupAC3Codec(bool encoder, int32_t numChannels, int32_t sampleRate);

media/libstagefright/ACodec.cpp

+46 −4
Original line number Diff line number Diff line
@@ -1290,6 +1290,8 @@ status_t ACodec::configureCodec( 
        } else {

            int32_t isADTS, aacProfile;

            int32_t sbrMode;

            int32_t maxOutputChannelCount;

            drcParams_t drc;

            if (!msg->findInt32("is-adts", &isADTS)) {

                isADTS = 0;

            }
@@ -1300,9 +1302,33 @@ status_t ACodec::configureCodec( 
                sbrMode = -1;

            }



            if (!msg->findInt32("aac-max-output-channel_count", &maxOutputChannelCount)) {

                maxOutputChannelCount = -1;

            }

            if (!msg->findInt32("aac-encoded-target-level", &drc.encodedTargetLevel)) {

                // value is unknown

                drc.encodedTargetLevel = -1;

            }

            if (!msg->findInt32("aac-drc-cut-level", &drc.drcCut)) {

                // value is unknown

                drc.drcCut = -1;

            }

            if (!msg->findInt32("aac-drc-boost-level", &drc.drcBoost)) {

                // value is unknown

                drc.drcBoost = -1;

            }

            if (!msg->findInt32("aac-drc-heavy-compression", &drc.heavyCompression)) {

                // value is unknown

                drc.heavyCompression = -1;

            }

            if (!msg->findInt32("aac-target-ref-level", &drc.targetRefLevel)) {

                // value is unknown

                drc.targetRefLevel = -1;

            }



            err = setupAACCodec(

                    encoder, numChannels, sampleRate, bitRate, aacProfile,

                    isADTS != 0, sbrMode);

                    isADTS != 0, sbrMode, maxOutputChannelCount, drc);

        }

    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AMR_NB)) {

        err = setupAMRCodec(encoder, false /* isWAMR */, bitRate);
@@ -1464,7 +1490,8 @@ status_t ACodec::selectAudioPortFormat( 


status_t ACodec::setupAACCodec(

        bool encoder, int32_t numChannels, int32_t sampleRate,

        int32_t bitRate, int32_t aacProfile, bool isADTS, int32_t sbrMode) {

        int32_t bitRate, int32_t aacProfile, bool isADTS, int32_t sbrMode,

        int32_t maxOutputChannelCount, const drcParams_t& drc) {

    if (encoder && isADTS) {

        return -EINVAL;

    }
@@ -1587,8 +1614,23 @@ status_t ACodec::setupAACCodec( 
            ? OMX_AUDIO_AACStreamFormatMP4ADTS

            : OMX_AUDIO_AACStreamFormatMP4FF;



    return mOMX->setParameter(

            mNode, OMX_IndexParamAudioAac, &profile, sizeof(profile));

    OMX_AUDIO_PARAM_ANDROID_AACPRESENTATIONTYPE presentation;

    presentation.nMaxOutputChannels = maxOutputChannelCount;

    presentation.nDrcCut = drc.drcCut;

    presentation.nDrcBoost = drc.drcBoost;

    presentation.nHeavyCompression = drc.heavyCompression;

    presentation.nTargetReferenceLevel = drc.targetRefLevel;

    presentation.nEncodedTargetLevel = drc.encodedTargetLevel;



    status_t res = mOMX->setParameter(mNode, OMX_IndexParamAudioAac, &profile, sizeof(profile));

    if (res == OK) {

        // optional parameters, will not cause configuration failure

        mOMX->setParameter(mNode, (OMX_INDEXTYPE)OMX_IndexParamAudioAndroidAacPresentation,

                &presentation, sizeof(presentation));

    } else {

        ALOGW("did not set AudioAndroidAacPresentation due to error %d when setting AudioAac", res);

    }

    return res;

}



status_t ACodec::setupAC3Codec(

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

+65 −1
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
#include <utils/Log.h>



#include "SoftAAC2.h"

#include <OMX_AudioExt.h>

#include <OMX_IndexExt.h>



#include <cutils/properties.h>

#include <media/stagefright/foundation/ADebug.h>
@@ -119,6 +121,7 @@ void SoftAAC2::initPorts() { 
}



status_t SoftAAC2::initDecoder() {

    ALOGV("initDecoder()");

    status_t status = UNKNOWN_ERROR;

    mAACDecoder = aacDecoder_Open(TT_MP4_ADIF, /* num layers */ 1);

    if (mAACDecoder != NULL) {
@@ -275,7 +278,7 @@ OMX_ERRORTYPE SoftAAC2::internalGetParameter( 


OMX_ERRORTYPE SoftAAC2::internalSetParameter(

        OMX_INDEXTYPE index, const OMX_PTR params) {

    switch (index) {

    switch ((int)index) {

        case OMX_IndexParamStandardComponentRole:

        {

            const OMX_PARAM_COMPONENTROLETYPE *roleParams =
@@ -311,6 +314,67 @@ OMX_ERRORTYPE SoftAAC2::internalSetParameter( 
            return OMX_ErrorNone;

        }



        case OMX_IndexParamAudioAndroidAacPresentation:

        {

            const OMX_AUDIO_PARAM_ANDROID_AACPRESENTATIONTYPE *aacPresParams =

                    (const OMX_AUDIO_PARAM_ANDROID_AACPRESENTATIONTYPE *)params;

            // for the following parameters of the OMX_AUDIO_PARAM_AACPROFILETYPE structure,

            // a value of -1 implies the parameter is not set by the application:

            //   nMaxOutputChannels     uses default platform properties, see configureDownmix()

            //   nDrcCut                uses default platform properties, see initDecoder()

            //   nDrcBoost                idem

            //   nHeavyCompression        idem

            //   nTargetReferenceLevel    idem

            //   nEncodedTargetLevel      idem

            if (aacPresParams->nMaxOutputChannels >= 0) {

                int max;

                if (aacPresParams->nMaxOutputChannels >= 8) { max = 8; }

                else if (aacPresParams->nMaxOutputChannels >= 6) { max = 6; }

                else if (aacPresParams->nMaxOutputChannels >= 2) { max = 2; }

                else {

                    // -1 or 0: disable downmix,  1: mono

                    max = aacPresParams->nMaxOutputChannels;

                }

                ALOGV("set nMaxOutputChannels=%d", max);

                aacDecoder_SetParam(mAACDecoder, AAC_PCM_MAX_OUTPUT_CHANNELS, max);

            }

            bool updateDrcWrapper = false;

            if (aacPresParams->nDrcBoost >= 0) {

                ALOGV("set nDrcBoost=%d", aacPresParams->nDrcBoost);

                mDrcWrap.setParam(DRC_PRES_MODE_WRAP_DESIRED_BOOST_FACTOR,

                        aacPresParams->nDrcBoost);

                updateDrcWrapper = true;

            }

            if (aacPresParams->nDrcCut >= 0) {

                ALOGV("set nDrcCut=%d", aacPresParams->nDrcCut);

                mDrcWrap.setParam(DRC_PRES_MODE_WRAP_DESIRED_ATT_FACTOR, aacPresParams->nDrcCut);

                updateDrcWrapper = true;

            }

            if (aacPresParams->nHeavyCompression >= 0) {

                ALOGV("set nHeavyCompression=%d", aacPresParams->nHeavyCompression);

                mDrcWrap.setParam(DRC_PRES_MODE_WRAP_DESIRED_HEAVY,

                        aacPresParams->nHeavyCompression);

                updateDrcWrapper = true;

            }

            if (aacPresParams->nTargetReferenceLevel >= 0) {

                ALOGV("set nTargetReferenceLevel=%d", aacPresParams->nTargetReferenceLevel);

                mDrcWrap.setParam(DRC_PRES_MODE_WRAP_DESIRED_TARGET,

                        aacPresParams->nTargetReferenceLevel);

                updateDrcWrapper = true;

            }

            if (aacPresParams->nEncodedTargetLevel >= 0) {

                ALOGV("set nEncodedTargetLevel=%d", aacPresParams->nEncodedTargetLevel);

                mDrcWrap.setParam(DRC_PRES_MODE_WRAP_ENCODER_TARGET,

                        aacPresParams->nEncodedTargetLevel);

                updateDrcWrapper = true;

            }

            if (updateDrcWrapper) {

                mDrcWrap.update();

            }



            return OMX_ErrorNone;

        }



        case OMX_IndexParamAudioPcm:

        {

            const OMX_AUDIO_PARAM_PCMMODETYPE *pcmParams =