From b33db8f3182e847bfef28360962625a024875d5f Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jmvalin@jmvalin.ca>
Date: Wed, 12 Dec 2012 14:45:16 -0500
Subject: [PATCH] Makes tonality boost less aggressive

Some tests like Kamedo's HA test suggested that our tonal boost was a bit
too extreme.
---
 celt/celt_encoder.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c
index e8e6c9a5..fd4a821a 100644
--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -1568,14 +1568,14 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_val16 * pcm,
         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