diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2016-06-08 02:33:56 -0400 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2016-07-19 16:11:50 -0400 |
| commit | 1484591656533c36b67615f7dd89e82c467b5f14 (patch) | |
| tree | 456eaf02c529142c230859c1dd0591e712707909 | |
| parent | 2ca6df03df62154c9b76220a94108b56e4dfb34b (diff) | |
| download | opus-1484591656533c36b67615f7dd89e82c467b5f14.tar.gz | |
Fixes equiv_rate for CBR
| -rw-r--r-- | celt/celt_encoder.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c index edb08e80..9be9de2f 100644 --- a/celt/celt_encoder.c +++ b/celt/celt_encoder.c @@ -1365,7 +1365,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_val16 * pcm, 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 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_val16 * pcm, (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) { |