[FFmpeg-cvslog] aacenc: Fix target bitrate for twoloop quantiser search

Claudio Freire git at videolan.org
Wed May 15 09:53:39 CEST 2013


ffmpeg | branch: master | Claudio Freire <klaussfreire at gmail.com> | Sat May  4 18:36:37 2013 -0300| [f4d0a63b5b5c682c18df3bba730f97a9067408ba] | committer: Martin Storsjö

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 at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f4d0a63b5b5c682c18df3bba730f97a9067408ba
---

 libavcodec/aaccoder.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;



More information about the ffmpeg-cvslog mailing list