[x264-devel] commit: Disable overflow compensation in CRF mode (Jason Garrett-Glaser )

[git at videolan.org]

x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Mon Nov  8 21:03:01 2010 -0800| [8d7c2d0d19c792c4de1310e2d1bf0cdf28095267] | committer: Jason Garrett-Glaser 

Disable overflow compensation in CRF mode
Wasn't designed with CRF in mind, and acts really weird with CRF+VBV.

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

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

diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c
index 290a928..e9f6288 100644
--- a/encoder/ratecontrol.c
+++ b/encoder/ratecontrol.c
@@ -2206,7 +2206,7 @@ static float rate_estimate_qscale( x264_t *h )
                 q = qp2qscale( rcc->accum_p_qp / rcc->accum_p_norm );
                 q /= fabs( h->param.rc.f_ip_factor );
             }
-            else if( h->i_frame > 0 )
+            else if( h->param.rc.i_rc_method != X264_RC_CRF && h->i_frame > 0 )
             {
                 /* Asymmetric clipping, because symmetric would prevent
                  * overflow control in areas of rapidly oscillating complexity */