commit fa2578bf4791be31b67748ce6a815829d9a6f175
author Michael Graczyk <mgraczyk@google.com> Wed Sep 07 15:26:51 2016 -0700
committer Jean-Marc Valin <jmvalin@jmvalin.ca> Thu Sep 08 11:34:42 2016 -0400
tree cb173dae64ff571b7636bb10dd4c93454971bbde
parent ac9fabc7be6576dc9fed463eeda0c6c3574aa9c9

Fix ambisonics bitrate when bitrate_bps is OPUS_AUTO

Change-Id: I16bd4cd990d8ad5888c9e30016218ac25242ecb5

Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>

src/opus_multistream_encoder.c

diff --git a/src/opus_multistream_encoder.c b/src/opus_multistream_encoder.c
index 30cafe1..c07132f 100644
--- a/src/opus_multistream_encoder.c
+++ b/src/opus_multistream_encoder.c
@@ -747,7 +747,8 @@
 
    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;