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

Commit 23505a88 authored by Wonsik Kim's avatar Wonsik Kim Committed by Automerger Merge Worker
Browse files

Merge "C2SoftAacEnc: Fix setting SBR mode" am: df926d0e 

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

Change-Id: I5d34568e3487e662e902036a9ed4e5564655c19e
parents a1a3d48f df926d0e

media/codec2/components/aac/C2SoftAacEnc.cpp

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

        return UNKNOWN_ERROR;

    }

    }





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

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

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

        int aacSbrMode = sbrMode != C2Config::AAC_SBR_OFF;

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

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

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

            return UNKNOWN_ERROR;

            return UNKNOWN_ERROR;

        }

        }