shithub: opus

Download patch

ref: b33db8f3182e847bfef28360962625a024875d5f
parent: 41fd7a12b548399ef627904437ae700f3c40a3fe
author: Jean-Marc Valin <[email protected]>
date: Wed Dec 12 09:45:16 EST 2012 

Makes tonality boost less aggressive

Some tests like Kamedo's HA test suggested that our tonal boost was a bit
too extreme.


--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -1568,14 +1568,14 @@
         float tonal;
 
         /* Compensates for the average tonality boost */
-        target -= MULT16_16_Q15(QCONST16(0.13f,15),coded_bins<<BITRES);
+        target -= MULT16_16_Q15(QCONST16(0.11f,15),coded_bins<<BITRES);
 
-        tonal = MAX16(0,st->analysis.tonality-.2);
-        tonal_target = target + (coded_bins<<BITRES)*2.0f*tonal;
+        tonal = MAX16(0,st->analysis.tonality-.15);
+        tonal_target = target + (coded_bins<<BITRES)*1.2f*tonal;
         if (pitch_change)
            tonal_target +=  (coded_bins<<BITRES)*.8;
         /*printf("%f %f ", st->analysis.tonality, tonal);*/
-        target = IMAX(tonal_target,target);
+        target = tonal_target;
      }
 #endif