Commit f3575669 authored by Christophe Massiot's avatar Christophe Massiot

* modules/codec/ffmpeg: More sensible values for --sout-ffmpeg-strict-rc

   (default values borrowed from ffmpeg).
parent e6d75333
...@@ -386,6 +386,9 @@ int E_(OpenEncoder)( vlc_object_t *p_this ) ...@@ -386,6 +386,9 @@ int E_(OpenEncoder)( vlc_object_t *p_this )
{ {
p_context->rc_max_rate = p_enc->fmt_out.i_bitrate; p_context->rc_max_rate = p_enc->fmt_out.i_bitrate;
p_context->rc_buffer_size = p_sys->i_rc_buffer_size; p_context->rc_buffer_size = p_sys->i_rc_buffer_size;
/* This is from ffmpeg's ffmpeg.c : */
p_context->rc_initial_buffer_occupancy
= p_sys->i_rc_buffer_size * 3/4;
p_context->rc_buffer_aggressivity = p_sys->f_rc_buffer_aggressivity; p_context->rc_buffer_aggressivity = p_sys->f_rc_buffer_aggressivity;
} }
......
...@@ -143,9 +143,9 @@ vlc_module_begin(); ...@@ -143,9 +143,9 @@ vlc_module_begin();
ENC_PRE_ME_LONGTEXT, VLC_TRUE ); ENC_PRE_ME_LONGTEXT, VLC_TRUE );
add_bool( ENC_CFG_PREFIX "strict-rc", 0, NULL, ENC_RC_STRICT_TEXT, add_bool( ENC_CFG_PREFIX "strict-rc", 0, NULL, ENC_RC_STRICT_TEXT,
ENC_RC_STRICT_LONGTEXT, VLC_TRUE ); ENC_RC_STRICT_LONGTEXT, VLC_TRUE );
add_integer( ENC_CFG_PREFIX "rc-buffer-size", 224*1024*8 * 3/2, NULL, add_integer( ENC_CFG_PREFIX "rc-buffer-size", 224*1024*8, NULL,
ENC_RC_BUF_TEXT, ENC_RC_BUF_LONGTEXT, VLC_TRUE ); ENC_RC_BUF_TEXT, ENC_RC_BUF_LONGTEXT, VLC_TRUE );
add_float( ENC_CFG_PREFIX "rc-buffer-aggressivity", 0.1, NULL, add_float( ENC_CFG_PREFIX "rc-buffer-aggressivity", 1.0, NULL,
ENC_RC_BUF_AGGR_TEXT, ENC_RC_BUF_AGGR_LONGTEXT, VLC_TRUE ); ENC_RC_BUF_AGGR_TEXT, ENC_RC_BUF_AGGR_LONGTEXT, VLC_TRUE );
add_float( ENC_CFG_PREFIX "i-quant-factor", 0, NULL, add_float( ENC_CFG_PREFIX "i-quant-factor", 0, NULL,
ENC_IQUANT_FACTOR_TEXT, ENC_IQUANT_FACTOR_LONGTEXT, VLC_TRUE ); ENC_IQUANT_FACTOR_TEXT, ENC_IQUANT_FACTOR_LONGTEXT, VLC_TRUE );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment