commit d0e4114c465b8e2bb4ab45a4820798f1f25c6540
author James O'Leary <jamesoleary@google.com> Mon Apr 29 23:35:33 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Apr 29 23:35:33 2019 -0700
tree 6610804b6cb7d694730213afd80ed6ddc1b34358
parent ffc608eedcfcd6f0d98dffc92b769a4efdfbca97
parent 09615d445d4482afaf434b7277ea9c7900b37746

Merge "Fix Opus encoder being set to CBR" into qt-dev am: d609aa158a
am: 09615d445d

Change-Id: I602490e2c0c41d86a2ca9c5c342920682c7ffe90

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;