[SCM] libav/experimental: aacenc: Remove energy 'normalization' modification from the 3GPP psymodel

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit c8dcb9dee1c5f337dc97f805eb868207064252e9
Author: Nathan Caldwell <saintdev at gmail.com>
Date:   Wed Oct 27 06:36:47 2010 +0000

    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
    
    Originally committed as revision 25589 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c
index 77eebb9..a3618ce 100644
--- a/libavcodec/aacpsy.c
+++ b/libavcodec/aacpsy.c
@@ -404,7 +404,6 @@ static void psy_3gpp_analyze(FFPsyContext *ctx, int channel,
             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];
 

-- 
Libav/FFmpeg packaging