From: Claudio Freire <klaussfreire@gmail.com>
Date: Sat, 4 May 2013 21:36:37 +0000 (-0300)
Subject: aacenc: Fix target bitrate for twoloop quantiser search
X-Git-Tag: v10_alpha1~1574
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f4d0a63b5b5c682c18df3bba730f97a9067408ba;p=platform%2Fupstream%2Flibav.git

aacenc: Fix target bitrate for twoloop quantiser search

This fixes a case where multichannel bitrate isn't accurately
targetted by psy model alone, never achieving the target bitrate.

Signed-off-by: Martin Storsjö <martin@martin.st>
---

diff --git a/libavcodec/aaccoder.c b/libavcodec/aaccoder.c
index d65d8d9..35b98a9 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;