| commit | ffd6cbc2cfbd9fefa9ebad744c8a8364d1cf90cc | [log] [tgz] |
|---|---|---|
| author | James O'Leary <jamesoleary@google.com> | Fri Apr 26 10:56:03 2019 -0400 |
| committer | James O'Leary <jamesoleary@google.com> | Fri Apr 26 23:58:53 2019 -0400 |
| tree | a43dce1382c4482d4fb2c839c3869001604fb080 | |
| parent | 66ea39290308e4851a5c6fe149e576b7d6249e5f [diff] |
Fix Opus encoder being set to CBR The code is currently setting unconstrained CBR, instead of constrained VBR. The OPUS_SET_VBR argument should be 1, or not set at all, to be VBR. (libopus docs for OPUS_SET_VBR: https://mf4.xiph.org/jenkins/view/opus/job/opus/ws/doc/html/group__opus__encoderctls.html#ga34d09ae06cab7e1a6c49876249b67892) Bug: 131410994 Test: Verify AGSA Opus encoder receives varying Opus frame sizes. Change-Id: Ife8340f720a0faedd748c61d6a69bb30dfe30706
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;