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

Commit 3b1ed088 authored by Wonsik Kim's avatar Wonsik Kim Committed by Automerger Merge Worker
Browse files

Merge "C2SoftAacEnc: Fix setting SBR mode" am: df926d0e am: 23505a88 am:... 

Merge "C2SoftAacEnc: Fix setting SBR mode" am: df926d0e am: 23505a88 am: fb3a9d17 am: 1d0f36c1

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1670432

Change-Id: I6cb3418f9f4034a60286c75b63cd7fea2a47523c
parents ec609196 1d0f36c1

media/codec2/components/aac/C2SoftAacEnc.cpp

+3 −2
Original line number Diff line number Diff line
@@ -272,8 +272,9 @@ status_t C2SoftAacEnc::setAudioParams() { 
        return UNKNOWN_ERROR;

    }



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

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

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

        int aacSbrMode = sbrMode != C2Config::AAC_SBR_OFF;

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

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

            return UNKNOWN_ERROR;

        }