commit 6adfa708a0ecf8fdd83fe8da3322dc80e6dfb74e
author Felicia Lim <flim@google.com> Fri Jul 27 18:10:05 2018 -0700
committer Jean-Marc Valin <jmvalin@jmvalin.ca> Sat Jul 28 13:55:01 2018 -0400
tree 9f08504d5951c0d9efa856bacc4cb69d6aeaf2a8
parent bc4ecf1917bf70f289b969ec048a6e0d3eecb5bd

Fix bitrate allocation for channel mapping 2

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 52fd27e..c47830a 100644
--- a/src/opus_multistream_encoder.c
+++ b/src/opus_multistream_encoder.c
@@ -752,8 +752,10 @@
    const int rate_ratio_num = 4;
    const int rate_ratio_den = 3;
    const int nb_channels = st->layout.nb_streams + st->layout.nb_coupled_streams;
+   /* The omnidirectional ambisonics and non-diegetic stereo channels */
    const int nb_nondirectional_channels = st->layout.nb_coupled_streams * 2 + 1;
-   const int nb_directional_channels = st->layout.nb_streams - 1;
+   /* The remaining ambisonics channels */
+   const int nb_directional_channels = nb_channels - nb_nondirectional_channels;
 
    if (st->bitrate_bps==OPUS_AUTO)
    {