[opus] [PATCH] Fix ambisonics bitrate when bitrate_bps is OPUS_AUTO

[Jean-Marc Valin]

Hi Michael,

Thanks for the fix. It's now merged in master.

	Jean-Marc

On 07/09/16 06:26 PM, Michael Graczyk wrote:
> Change-Id: I16bd4cd990d8ad5888c9e30016218ac25242ecb5
> ---
>  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 30cafe1..c07132f 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;
>