commit d609aa158a0b6a5313a55607e554821d1e1b209b
author James O'Leary <jamesoleary@google.com> Sat Apr 27 18:24:35 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 27 18:24:35 2019 +0000
tree b2d5913e3f33b0aecb0fd4710d9058445f381589
parent 4ed3e1bf4f50ad248601063036f40780878e671f
parent ffd6cbc2cfbd9fefa9ebad744c8a8364d1cf90cc

Merge "Fix Opus encoder being set to CBR" into qt-dev

media/codec2/components/opus/C2SoftOpusEnc.cpp

diff --git a/media/codec2/components/opus/C2SoftOpusEnc.cpp b/media/codec2/components/opus/C2SoftOpusEnc.cpp
index a0b2443..f1020c3 100644
--- a/media/codec2/components/opus/C2SoftOpusEnc.cpp
+++ b/media/codec2/components/opus/C2SoftOpusEnc.cpp
@@ -194,12 +194,12 @@
         return C2_BAD_VALUE;
     }
 
-    // Unconstrained VBR
-    if (opus_multistream_encoder_ctl(mEncoder, OPUS_SET_VBR(0) != OPUS_OK)) {
+    // Constrained VBR
+    if (opus_multistream_encoder_ctl(mEncoder, OPUS_SET_VBR(1) != OPUS_OK)) {
         ALOGE("failed to set vbr type");
         return C2_BAD_VALUE;
     }
-    if (opus_multistream_encoder_ctl(mEncoder, OPUS_SET_VBR_CONSTRAINT(0) !=
+    if (opus_multistream_encoder_ctl(mEncoder, OPUS_SET_VBR_CONSTRAINT(1) !=
             OPUS_OK)) {
         ALOGE("failed to set vbr constraint");
         return C2_BAD_VALUE;