diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2011-11-07 14:58:20 -0500 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2012-07-03 14:39:41 -0400 |
| commit | e856d245568901e6beb064d54a711ff4baf74f60 (patch) | |
| tree | b92d41ce964f08ba7eef3ec0ede3ab27649f4a84 | |
| parent | 161623024529233d7aeceb5508b7c4e51cb0abea (diff) | |
| download | opus-e856d245568901e6beb064d54a711ff4baf74f60.tar.gz | |
Unconstrained VBR no longer attempt to hit an average rate
| -rw-r--r-- | celt/celt.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/celt/celt.c b/celt/celt.c index cfdfaafe..db348bd4 100644 --- a/celt/celt.c +++ b/celt/celt.c @@ -1388,7 +1388,9 @@ int celt_encode_with_ec(CELTEncoder * restrict st, const opus_val16 * pcm, int f /* Don't attempt to use more than 510 kb/s, even for frames smaller than 20 ms. The CELT allocator will just not be able to use more than that anyway. */ nbCompressedBytes = IMIN(nbCompressedBytes,1275>>(3-LM)); - target = vbr_rate + (st->vbr_offset>>lm_diff) - ((40*C+20)<<BITRES); + target = vbr_rate - ((40*C+20)<<BITRES); + if (st->constrained_vbr) + target += (st->vbr_offset>>lm_diff); /* Shortblocks get a large boost in bitrate, but since they are uncommon long blocks are not greatly affected */ @@ -1442,8 +1444,11 @@ int celt_encode_with_ec(CELTEncoder * restrict st, const opus_val16 * pcm, int f /*printf ("%d\n", st->vbr_reservoir);*/ /* Compute the offset we need to apply in order to reach the target */ - st->vbr_drift += (opus_int32)MULT16_32_Q15(alpha,(delta*(1<<lm_diff))-st->vbr_offset-st->vbr_drift); - st->vbr_offset = -st->vbr_drift; + if (st->constrained_vbr) + { + st->vbr_drift += (opus_int32)MULT16_32_Q15(alpha,(delta*(1<<lm_diff))-st->vbr_offset-st->vbr_drift); + st->vbr_offset = -st->vbr_drift; + } /*printf ("%d\n", st->vbr_drift);*/ if (st->constrained_vbr && st->vbr_reservoir < 0) |