HandBrake 0.7.1a2

Updated x264 base source to svn 604
Improved CQP and ABR handling

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk/libhb@71 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/encx264.c b/encx264.c
index 53950fa5e833a3d1ceb41c2aefae8ab279b5c0bd..a72a9603ef79131322ad2e393c1af024026788bf 100644 (file)
--- a/encx264.c
+++ b/encx264.c
@@ -78,33 +78,23 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job )
     if( job->vquality >= 0.0 && job->vquality <= 1.0 )
     {
         /* Constant QP */
+        param.rc.i_rc_method = X264_RC_CQP;
         param.rc.i_qp_constant = 51 - job->vquality * 51;
         hb_log( "encx264: encoding at constant QP %d",
                 param.rc.i_qp_constant );
     }
     else
     {
-
-               /* Rate control */
-               /* no longer in x264 - see rc.i_rc_method in x264.h */
-        /* param.rc.b_cbr     = 1; */
-               
-               /* these were the only settings I could use to get accurate ending video bitrate */
-               param.rc.i_rc_method    =  X264_RC_CRF;
-               param.rc.i_vbv_max_bitrate = job->vbitrate;
-        param.rc.i_vbv_buffer_size = 224;
-               param.rc.i_rf_constant = 1;
-               
+       /* Rate control */
+        param.rc.i_rc_method = X264_RC_ABR;
         param.rc.i_bitrate = job->vbitrate;
         switch( job->pass )
         {
             case 1:
-                               param.rc.i_rc_method    =  X264_RC_ABR;
                 param.rc.b_stat_write  = 1;
                 param.rc.psz_stat_out = pv->filename;
                 break;
             case 2:
-                               param.rc.i_rc_method    =  X264_RC_ABR;
                 param.rc.b_stat_read = 1;
                 param.rc.psz_stat_in = pv->filename;
                 break;