Update help and cleanup in ratecontrol.c

Deal with some out-of-date information.

diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c
index f33c63ea2a4663096e029e1c00989d3178dc768f..65bc51be89b8af8d3b9e0ea76cc6b531a5a68400 100644 (file)
--- a/encoder/ratecontrol.c
+++ b/encoder/ratecontrol.c
@@ -883,12 +883,7 @@ void x264_ratecontrol_start( x264_t *h, int i_force_qp )
     if( rce )
         rce->new_qp = rc->qp;
 
-    /* accum_p_qp needs to be here so that future frames can benefit from the
-     * data before this frame is done. but this only works because threading
-     * guarantees to not re-encode any frames. so the non-threaded case does
-     * accum_p_qp later. */
-    if( h->param.i_threads > 1 )
-        accum_p_qp_update( h, rc->qp );
+    accum_p_qp_update( h, rc->qp );
 
     if( h->sh.i_type != SLICE_TYPE_B )
         rc->last_non_b_pict_type = h->sh.i_type;
@@ -1142,9 +1137,6 @@ void x264_ratecontrol_end( x264_t *h, int bits )
         rc->cplxr_sum *= rc->cbr_decay;
         rc->wanted_bits_window += rc->bitrate / rc->fps;
         rc->wanted_bits_window *= rc->cbr_decay;
-
-        if( h->param.i_threads == 1 )
-            accum_p_qp_update( h, rc->qpa_rc );
     }
 
     if( rc->b_2pass )

diff --git a/x264.c b/x264.c
index 8edc39c531de17baab2ee57912805c6c972e729f..c3b4f29e90c065b8ef82e1d44547f0a1f6b796ce 100644 (file)
--- a/x264.c
+++ b/x264.c
@@ -204,8 +204,8 @@ static void Help( x264_param_t *defaults, int b_longhelp )
     H0( "  -q, --qp <integer>          Set QP (0-51, 0=lossless)\n" );
     H0( "  -B, --bitrate <integer>     Set bitrate (kbit/s)\n" );
     H0( "      --crf <float>           Quality-based VBR (0-51, 0=lossless) [%.1f]\n", defaults->rc.f_rf_constant );
-    H1( "      --vbv-maxrate <integer> Max local bitrate (kbit/s) [%d]\n", defaults->rc.i_vbv_max_bitrate );
-    H0( "      --vbv-bufsize <integer> Enable CBR and set size of the VBV buffer (kbit) [%d]\n", defaults->rc.i_vbv_buffer_size );
+    H0( "      --vbv-maxrate <integer> Max local bitrate (kbit/s) [%d]\n", defaults->rc.i_vbv_max_bitrate );
+    H0( "      --vbv-bufsize <integer> Set size of the VBV buffer (kbit) [%d]\n", defaults->rc.i_vbv_buffer_size );
     H1( "      --vbv-init <float>      Initial VBV buffer occupancy [%.1f]\n", defaults->rc.f_vbv_buffer_init );
     H1( "      --qpmin <integer>       Set min QP [%d]\n", defaults->rc.i_qp_min );
     H1( "      --qpmax <integer>       Set max QP [%d]\n", defaults->rc.i_qp_max );