shithub: opus

Download patch

ref: be5a7da1622c973d25daf11226fde34128b22254
parent: e775896ed3ffb4da9d2958a30f77fd6462c2c7f7
author: Jean-Marc Valin <jmvalin@jmvalin.ca>
date: Thu Jun 2 14:15:00 EDT 2016 

Re-tuning compute_equiv_rate()


--- a/src/opus_encoder.c
+++ b/src/opus_encoder.c
@@ -997,14 +997,14 @@
    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