shithub: opus

Download patch

ref: f77410deb6922e8f557d6b53d9102763c4d28158
parent: 3252bf2a68272b887fabbd654e10ca88378039ca
author: Jean-Marc Valin <[email protected]>
date: Fri Apr 19 18:44:03 EDT 2013 

VBR bitrate calibration for variable duration.

Also fixes uninitialized value in previous commit.


--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -1163,7 +1163,7 @@
    const opus_int16 *eBands;
    int secondMdct;
    int signalBandwidth;
-   int transient_got_disabled;
+   int transient_got_disabled=0;
    ALLOC_STACK;
 
    mode = st->mode;
@@ -1576,6 +1576,7 @@
      opus_int32 min_allowed;
      int coded_bins;
      int coded_bands;
+     int tf_calibration;
      int lm_diff = mode->maxLM - LM;
      coded_bands = st->lastCodedBands ? st->lastCodedBands : nbEBands;
      coded_bins = eBands[coded_bands]<<LM;
@@ -1613,7 +1614,8 @@
      /* Boost the rate according to dynalloc (minus the dynalloc average for calibration). */
      target += tot_boost-(16<<LM);
      /* Apply transient boost, compensating for average boost. */
-     target += (opus_int32)SHL32(MULT16_32_Q15(tf_estimate-QCONST16(0.04f,14), target),1);
+     tf_calibration = st->variable_duration ? QCONST16(0.02f,14) : QCONST16(0.04f,14);
+     target += (opus_int32)SHL32(MULT16_32_Q15(tf_estimate-tf_calibration, target),1);
 
 #ifndef FIXED_POINT
      /* Apply tonality boost */