summaryrefslogtreecommitdiff
path: root/libavcodec/aacpsy.c
diff options
context:
space:
mode:
authorNathan Caldwell <saintdev@gmail.com>2010-10-27 06:36:47 +0000
committerAnton Khirnov <wyskas@gmail.com>2010-10-27 06:36:47 +0000
commitc8dcb9dee1c5f337dc97f805eb868207064252e9 (patch)
tree89465eed864498dd39d9ef7dd0964f6d64364940 /libavcodec/aacpsy.c
parent4df5aebb811aac306751f42ccf7db8398161604e (diff)
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
Diffstat (limited to 'libavcodec/aacpsy.c')
-rw-r--r--libavcodec/aacpsy.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c
index 77eebb92d7..a3618ce57f 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];