[x264-devel] commit: Fix stupid bug in B-frame VBV size prediction ( Jason Garrett-Glaser )

[git at videolan.org]

x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Mon Nov  8 19:56:29 2010 -0800| [5dfbfc357406e641c80d9de74c85fce4ece6b5ba] | committer: Jason Garrett-Glaser 

Fix stupid bug in B-frame VBV size prediction

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=5dfbfc357406e641c80d9de74c85fce4ece6b5ba
---

 encoder/ratecontrol.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c
index c6d78d3..290a928 100644
--- a/encoder/ratecontrol.c
+++ b/encoder/ratecontrol.c
@@ -2053,9 +2053,9 @@ static float rate_estimate_qscale( x264_t *h )
             q += rcc->pb_offset;
 
         if( rcc->b_2pass && rcc->b_vbv )
-            rcc->frame_size_planned = qscale2bits( &rce, q );
+            rcc->frame_size_planned = qscale2bits( &rce, qp2qscale( q ) );
         else
-            rcc->frame_size_planned = predict_size( rcc->pred_b_from_p, q, h->fref1[h->i_ref1-1]->i_satd );
+            rcc->frame_size_planned = predict_size( rcc->pred_b_from_p, qp2qscale( q ), h->fref1[h->i_ref1-1]->i_satd );
         h->rc->frame_size_estimated = rcc->frame_size_planned;
 
         /* For row SATDs */