From fa2578bf4791be31b67748ce6a815829d9a6f175 Mon Sep 17 00:00:00 2001 From: Michael Graczyk Date: Wed, 7 Sep 2016 15:26:51 -0700 Subject: [PATCH] Fix ambisonics bitrate when bitrate_bps is OPUS_AUTO Change-Id: I16bd4cd990d8ad5888c9e30016218ac25242ecb5 Signed-off-by: Jean-Marc Valin --- src/opus_multistream_encoder.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/opus_multistream_encoder.c b/src/opus_multistream_encoder.c index 30cafe11..c07132f1 100644 --- a/src/opus_multistream_encoder.c +++ b/src/opus_multistream_encoder.c @@ -747,7 +747,8 @@ static void ambisonics_rate_allocation( if (st->bitrate_bps==OPUS_AUTO) { - total_rate = num_channels * (20000 + st->layout.nb_streams*(Fs+60*Fs/frame_size)); + total_rate = (st->layout.nb_coupled_streams + st->layout.nb_streams) * + (Fs+60*Fs/frame_size) + st->layout.nb_streams * 15000; } else if (st->bitrate_bps==OPUS_BITRATE_MAX) { total_rate = num_channels * 320000;