From b00de70e59cac3419d7b53cf70bb801c09472c88 Mon Sep 17 00:00:00 2001 From: handbrake Date: Sat, 16 Dec 2006 05:41:22 +0000 Subject: 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@71 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- libhb/encx264.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'libhb') diff --git a/libhb/encx264.c b/libhb/encx264.c index 53950fa5e..a72a9603e 100644 --- a/libhb/encx264.c +++ b/libhb/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; -- cgit v1.2.3