diff options
author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2016-06-03 01:15:00 +0300 |
---|---|---|
committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2016-07-08 00:20:02 +0300 |
commit | 230e5f4e628645ba4e91eec9575153ae2de04860 (patch) | |
tree | 0c9b5d1d91837fa56ca1438732d5a066173e7074 | |
parent | 65dcfd33b5b73d3e7bc4943f0a23f552e384c5c1 (diff) |
Re-tuning compute_equiv_rate()
-rw-r--r-- | src/opus_encoder.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/opus_encoder.c b/src/opus_encoder.c index 130496bf..7b098d40 100644 --- a/src/opus_encoder.c +++ b/src/opus_encoder.c @@ -997,14 +997,14 @@ static opus_int32 compute_equiv_rate(opus_int32 bitrate, int channels, equiv -= (40*channels+20)*(frame_rate - 50); /* CBR is about a 10% penalty for both SILK and CELT. */ if (!vbr) - equiv = equiv*9/10; - /* Complexity makes about 10% difference (from 0 to 10) in general. */ + equiv -= equiv/12; + /* Complexity makes about 8% difference (from 0 to 10) in general. */ equiv = equiv * (90+complexity)/100; if (mode == MODE_SILK_ONLY || mode == MODE_HYBRID) { - /* SILK complexity 0-3 uses the non-delayed-decision NSQ, which + /* SILK complexity 0-1 uses the non-delayed-decision NSQ, which costs about 20%. */ - if (complexity<4) + if (complexity<2) equiv = equiv*4/5; } else if (mode == MODE_CELT_ONLY) { /* CELT complexity 0-4 doesn't have the pitch filter, which costs |