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

Commit b09409a0 authored by Manisha Jajoo's avatar Manisha Jajoo Committed by Wonsik Kim
Browse files

C2SoftAacEnc: add support for setting Profile and SBR mode 

Test: Manually using AMediaCodec based application
Test: atest android.media.cts.EncoderTest#testAACEncoders

Bug: 133482105

Change-Id: If2e3f0ffde38610ae1ae1b7e860e65bfea6e56b8
parent 315f7aab

media/codec2/components/aac/C2SoftAacEnc.cpp

+41 −24
Original line number Diff line number Diff line
@@ -103,11 +103,24 @@ public: 
                })

                .withSetter(ProfileLevelSetter)

                .build());



       addParameter(

                DefineParam(mSBRMode, C2_PARAMKEY_AAC_SBR_MODE)

                .withDefault(new C2StreamAacSbrModeTuning::input(0u, AAC_SBR_AUTO))

                .withFields({C2F(mSBRMode, value).oneOf({

                            C2Config::AAC_SBR_OFF,

                            C2Config::AAC_SBR_SINGLE_RATE,

                            C2Config::AAC_SBR_DUAL_RATE,

                            C2Config::AAC_SBR_AUTO })})

                .withSetter(Setter<decltype(*mSBRMode)>::NonStrictValueWithNoDeps)

                .build());

    }



    uint32_t getSampleRate() const { return mSampleRate->value; }

    uint32_t getChannelCount() const { return mChannelCount->value; }

    uint32_t getBitrate() const { return mBitrate->value; }

    uint32_t getSBRMode() const { return mSBRMode->value; }

    uint32_t getProfile() const { return mProfileLevel->profile; }

    static C2R ProfileLevelSetter(bool mayBlock, C2P<C2StreamProfileLevelInfo::output> &me) {

        (void)mayBlock;

        (void)me;  // TODO: validate
@@ -129,6 +142,7 @@ private: 
    std::shared_ptr<C2StreamBitrateInfo::output> mBitrate;

    std::shared_ptr<C2StreamMaxBufferSizeInfo::input> mInputMaxBufSize;

    std::shared_ptr<C2StreamProfileLevelInfo::output> mProfileLevel;

    std::shared_ptr<C2StreamAacSbrModeTuning::input> mSBRMode;

};



C2SoftAacEnc::C2SoftAacEnc(
@@ -138,9 +152,6 @@ C2SoftAacEnc::C2SoftAacEnc( 
    : SimpleC2Component(std::make_shared<SimpleInterface<IntfImpl>>(name, id, intfImpl)),

      mIntf(intfImpl),

      mAACEncoder(nullptr),

      mSBRMode(-1),

      mSBRRatio(0),

      mAACProfile(AOT_AAC_LC),

      mNumBytesPerInputFrame(0u),

      mOutBufferSize(0u),

      mSentCodecSpecificData(false),
@@ -208,31 +219,37 @@ static CHANNEL_MODE getChannelMode(uint32_t nChannels) { 
    return chMode;

}



//static AUDIO_OBJECT_TYPE getAOTFromProfile(OMX_U32 profile) {

//    if (profile == OMX_AUDIO_AACObjectLC) {

//        return AOT_AAC_LC;

//    } else if (profile == OMX_AUDIO_AACObjectHE) {

//        return AOT_SBR;

//    } else if (profile == OMX_AUDIO_AACObjectHE_PS) {

//        return AOT_PS;

//    } else if (profile == OMX_AUDIO_AACObjectLD) {

//        return AOT_ER_AAC_LD;

//    } else if (profile == OMX_AUDIO_AACObjectELD) {

//        return AOT_ER_AAC_ELD;

//    } else {

//        ALOGW("Unsupported AAC profile - defaulting to AAC-LC");

//        return AOT_AAC_LC;

//    }

//}

static AUDIO_OBJECT_TYPE getAOTFromProfile(uint32_t profile) {

   if (profile == C2Config::PROFILE_AAC_LC) {

       return AOT_AAC_LC;

   } else if (profile == C2Config::PROFILE_AAC_HE) {

       return AOT_SBR;

   } else if (profile == C2Config::PROFILE_AAC_HE_PS) {

       return AOT_PS;

   } else if (profile == C2Config::PROFILE_AAC_LD) {

       return AOT_ER_AAC_LD;

   } else if (profile == C2Config::PROFILE_AAC_ELD) {

       return AOT_ER_AAC_ELD;

   } else {

       ALOGW("Unsupported AAC profile - defaulting to AAC-LC");

       return AOT_AAC_LC;

   }

}



status_t C2SoftAacEnc::setAudioParams() {

    // We call this whenever sample rate, number of channels, bitrate or SBR mode change

    // in reponse to setParameter calls.

    int32_t sbrRatio = 0;

    uint32_t sbrMode = mIntf->getSBRMode();

    if (sbrMode == AAC_SBR_SINGLE_RATE) sbrRatio = 1;

    else if (sbrMode == AAC_SBR_DUAL_RATE) sbrRatio = 2;



    ALOGV("setAudioParams: %u Hz, %u channels, %u bps, %i sbr mode, %i sbr ratio",

         mIntf->getSampleRate(), mIntf->getChannelCount(), mIntf->getBitrate(), mSBRMode, mSBRRatio);

         mIntf->getSampleRate(), mIntf->getChannelCount(), mIntf->getBitrate(),

         sbrMode, sbrRatio);



    if (AACENC_OK != aacEncoder_SetParam(mAACEncoder, AACENC_AOT, mAACProfile)) {

    uint32_t aacProfile = mIntf->getProfile();

    if (AACENC_OK != aacEncoder_SetParam(mAACEncoder, AACENC_AOT, getAOTFromProfile(aacProfile))) {

        ALOGE("Failed to set AAC encoder parameters");

        return UNKNOWN_ERROR;

    }
@@ -255,8 +272,8 @@ status_t C2SoftAacEnc::setAudioParams() { 
        return UNKNOWN_ERROR;

    }



    if (mSBRMode != -1 && mAACProfile == AOT_ER_AAC_ELD) {

        if (AACENC_OK != aacEncoder_SetParam(mAACEncoder, AACENC_SBR_MODE, mSBRMode)) {

    if (sbrMode != -1 && aacProfile == C2Config::PROFILE_AAC_ELD) {

        if (AACENC_OK != aacEncoder_SetParam(mAACEncoder, AACENC_SBR_MODE, sbrMode)) {

            ALOGE("Failed to set AAC encoder parameters");

            return UNKNOWN_ERROR;

        }
@@ -268,7 +285,7 @@ status_t C2SoftAacEnc::setAudioParams() { 
       1: Downsampled SBR (default for ELD)

       2: Dualrate SBR (default for HE-AAC)

     */

    if (AACENC_OK != aacEncoder_SetParam(mAACEncoder, AACENC_SBR_RATIO, mSBRRatio)) {

    if (AACENC_OK != aacEncoder_SetParam(mAACEncoder, AACENC_SBR_RATIO, sbrRatio)) {

        ALOGE("Failed to set AAC encoder parameters");

        return UNKNOWN_ERROR;

    }

media/codec2/components/aac/C2SoftAacEnc.h

+0 −3
Original line number Diff line number Diff line
@@ -50,9 +50,6 @@ private: 


    HANDLE_AACENCODER mAACEncoder;



    int32_t mSBRMode;

    int32_t mSBRRatio;

    AUDIO_OBJECT_TYPE mAACProfile;

    UINT mNumBytesPerInputFrame;

    UINT mOutBufferSize;