commit df926d0e14fbf4be21e145a92346afe27157b57d
author Wonsik Kim <wonsik@google.com> Tue Apr 13 05:30:59 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 13 05:30:59 2021 +0000
tree 23cf365236c7c9dd6fc92adec7591c65ae1d6593
parent f81e44f2f341318394204cdb5718a133358e7de1
parent bc1a277ade69a780947bae94252a87981a8901af

Merge "C2SoftAacEnc: Fix setting SBR mode"

media/codec2/components/aac/C2SoftAacEnc.cpp

diff --git a/media/codec2/components/aac/C2SoftAacEnc.cpp b/media/codec2/components/aac/C2SoftAacEnc.cpp
index ea76cbb..d865ab2 100644
--- a/media/codec2/components/aac/C2SoftAacEnc.cpp
+++ b/media/codec2/components/aac/C2SoftAacEnc.cpp
@@ -272,8 +272,9 @@
         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;
         }