Merge commit 'bbf71d46db3417b43bcbd745cbf235e8e2ff69ae'

[ffmpeg] / libavcodec / aacenc_tns.h

diff --git a/libavcodec/aacenc_tns.h b/libavcodec/aacenc_tns.h
index f0e75569ae2ac8323df1c9e156713089ce9c9fb0..a7c119f3688547cd64791d7d7b8863be6e222c97 100644 (file)
--- a/libavcodec/aacenc_tns.h
+++ b/libavcodec/aacenc_tns.h
@@ -33,9 +33,12 @@
 /* Could be set to 3 to save an additional bit at the cost of little quality */
 #define TNS_Q_BITS 4
 
+/* Coefficient resolution in short windows */
+#define TNS_Q_BITS_SHORT 3
+
 /* TNS will only be used if the LPC gain is within these margins */
-#define TNS_GAIN_THRESHOLD_LOW  1.395f
-#define TNS_GAIN_THRESHOLD_HIGH 11.19f
+#define TNS_GAIN_THRESHOLD_LOW  1.437f
+#define TNS_GAIN_THRESHOLD_HIGH 21.19f
 
 /* If the energy ratio between the low SFBs vs the high SFBs is not between
  * those two values, use 2 filters instead */
@@ -43,7 +46,7 @@
 #define TNS_E_RATIO_HIGH 1.23
 
 /* Do not use TNS if the psy band spread is below this value */
-#define TNS_SPREAD_THRESHOLD 37.081512f
+#define TNS_SPREAD_THRESHOLD 0.5f
 
 void ff_aac_encode_tns_info(AACEncContext *s, SingleChannelElement *sce);
 void ff_aac_apply_tns(AACEncContext *s, SingleChannelElement *sce);