aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaudio Freire <klaussfreire@gmail.com>2013-05-04 18:36:37 -0300
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-06-02 16:26:36 +0200
commitc320f9f5e9982e1e516ba620518f9a66887de04a (patch)
tree1559b3cbf254fe8b934e81eadd87808c6cc96a82
parenta98775026765b4dae2d63680f946ca7915d157b5 (diff)
downloadffmpeg-c320f9f5e9982e1e516ba620518f9a66887de04a.tar.gz
AAC encoder: Fix rate control on twoloop.
Fixes a case where multichannel bitrate isn't accurately targetted by psy model alone, never achieving the target bitrate. Now fixed. Fixes ticket #2625. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
-rw-r--r--libavcodec/aaccoder.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aaccoder.c b/libavcodec/aaccoder.c
index 994de286c9..45fbc2dedf 100644
--- a/libavcodec/aaccoder.c
+++ b/libavcodec/aaccoder.c
@@ -710,7 +710,7 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx,
const float lambda)
{
int start = 0, i, w, w2, g;
- int destbits = avctx->bit_rate * 1024.0 / avctx->sample_rate / avctx->channels;
+ int destbits = avctx->bit_rate * 1024.0 / avctx->sample_rate / avctx->channels * (lambda / 120.f);
float dists[128] = { 0 }, uplims[128];
float maxvals[128];
int fflag, minscaler;