commit 1484591656533c36b67615f7dd89e82c467b5f14
author Jean-Marc Valin <jmvalin@jmvalin.ca> Wed Jun 08 02:33:56 2016 -0400
committer Jean-Marc Valin <jmvalin@jmvalin.ca> Tue Jul 19 16:11:50 2016 -0400
tree 456eaf02c529142c230859c1dd0591e712707909
parent 2ca6df03df62154c9b76220a94108b56e4dfb34b

Fixes equiv_rate for CBR

celt/celt_encoder.c

diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c
index edb08e8..9be9de2 100644
--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -1365,7 +1365,7 @@
    opus_val16 surround_masking=0;
    opus_val16 temporal_vbr=0;
    opus_val16 surround_trim = 0;
-   opus_int32 equiv_rate = 510000;
+   opus_int32 equiv_rate;
    int hybrid;
    VARDECL(opus_val16, surround_dynalloc);
    ALLOC_STACK;
@@ -1461,8 +1461,9 @@
                (tmp+4*mode->Fs)/(8*mode->Fs)-!!st->signalling));
       effectiveBytes = nbCompressedBytes - nbFilledBytes;
    }
+   equiv_rate = ((opus_int32)nbCompressedBytes*8*50 >> (3-LM)) - (40*C+20)*((400>>LM) - 50);
    if (st->bitrate != OPUS_BITRATE_MAX)
-      equiv_rate = st->bitrate - (40*C+20)*((400>>LM) - 50);
+      equiv_rate = IMIN(equiv_rate, st->bitrate - (40*C+20)*((400>>LM) - 50));
 
    if (enc==NULL)
    {