[FFmpeg-cvslog] r25589 - trunk/libavcodec/aacpsy.c

[elenril]

Author: elenril
Date: Wed Oct 27 08:36:47 2010
New Revision: 25589

Log:
aacenc: Remove energy 'normalization' modification from the 3GPP psymodel

This greatly improves bitrate handling. You will now get within a few
kbps of your requested bitrate instead of 20-40kbps higher.

There is absolutely no analog to this line in the 3GPP spec, that I
can find.

patch by Nathan Caldwell saintdev (at) gmail

Modified:
   trunk/libavcodec/aacpsy.c

Modified: trunk/libavcodec/aacpsy.c
==============================================================================
--- trunk/libavcodec/aacpsy.c	Wed Oct 27 07:54:44 2010	(r25588)
+++ trunk/libavcodec/aacpsy.c	Wed Oct 27 08:36:47 2010	(r25589)
@@ -404,7 +404,6 @@ static void psy_3gpp_analyze(FFPsyContex
             band->energy = 0.0f;
             for (i = 0; i < band_sizes[g]; i++)
                 band->energy += coefs[start+i] * coefs[start+i];
-            band->energy *= 1.0f / (512*512);
             band->thr     = band->energy * 0.001258925f;
             start        += band_sizes[g];