diff --git a/libcelt/celt.c b/libcelt/celt.c index 5131d3d3e96a48084f2c2a7fffd000d6bc6c84fe..92f896a279f2f5df22100047f4e4f991d37c79a3 100644 --- a/libcelt/celt.c +++ b/libcelt/celt.c @@ -1382,8 +1382,9 @@ int celt_encode_with_ec(CELTEncoder * restrict st, const opus_val16 * pcm, int f /* The target rate in 8th bits per frame */ opus_int32 target; opus_int32 min_allowed; + int lm_diff = st->mode->maxLM - LM; - target = vbr_rate + st->vbr_offset - ((40*C+20)<<BITRES); + target = vbr_rate + (st->vbr_offset>>lm_diff) - ((40*C+20)<<BITRES); /* Shortblocks get a large boost in bitrate, but since they are uncommon long blocks are not greatly affected */ @@ -1437,7 +1438,7 @@ 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-st->vbr_offset-st->vbr_drift); + st->vbr_drift += (opus_int32)MULT16_32_Q15(alpha,(delta<<lm_diff)-st->vbr_offset-st->vbr_drift); st->vbr_offset = -st->vbr_drift; /*printf ("%d\n", st->vbr_drift);*/