# HG changeset patch # User ranma # Date 1119277641 0 # Node ID 051bd310f04cb8bf2926573986d0299ef9a036b5 # Parent 490dff9ee43fcf6436884b1d8dcd42adda25aa59 Add vrc_init_occupancy to lavcopts diff -r 490dff9ee43f -r 051bd310f04c DOCS/man/de/mplayer.1 --- a/DOCS/man/de/mplayer.1 Mon Jun 20 14:16:59 2005 +0000 +++ b/DOCS/man/de/mplayer.1 Mon Jun 20 14:27:21 2005 +0000 @@ -6840,6 +6840,10 @@ anfängliche Komplexität (Durchlauf 1) . .TP +.B vrc_init_occupancy=<0.0\-1.0> +initiale Pufferbelegung als Bruchteil von vrc_buf_size (Standard: 0.9) +. +.TP .B vqsquish=<0|1> Gibt an, wie die Quantisierungsparameter zwischen qmin und qmax gehalten werden (Durchlauf 1/\:2): diff -r 490dff9ee43f -r 051bd310f04c DOCS/man/en/mplayer.1 --- a/DOCS/man/en/mplayer.1 Mon Jun 20 14:16:59 2005 +0000 +++ b/DOCS/man/en/mplayer.1 Mon Jun 20 14:27:21 2005 +0000 @@ -6612,6 +6612,10 @@ initial complexity (pass\ 1) . .TP +.B vrc_init_occupancy=<0.0\-1.0> +initial buffer occupancy, as a fraction of vrc_buf_size (default: 0.9) +. +.TP .B vqsquish=<0|1> Specify how to keep the quantizer between qmin and qmax (pass\ 1/\:2). .PD 0 diff -r 490dff9ee43f -r 051bd310f04c libmpcodecs/ve_lavc.c --- a/libmpcodecs/ve_lavc.c Mon Jun 20 14:16:59 2005 +0000 +++ b/libmpcodecs/ve_lavc.c Mon Jun 20 14:27:21 2005 +0000 @@ -93,6 +93,7 @@ static int lavc_param_rc_max_rate=0; static int lavc_param_rc_min_rate=0; static float lavc_param_rc_initial_cplx=0; +static int lavc_param_rc_initial_buffer_occupancy=0.9; static int lavc_param_mpeg_quant=0; static int lavc_param_fdct=0; static int lavc_param_idct=0; @@ -211,6 +212,7 @@ {"vrc_buf_size", &lavc_param_rc_buffer_size, CONF_TYPE_INT, CONF_RANGE, 4, 24000000, NULL}, {"vrc_buf_aggressivity", &lavc_param_rc_buffer_aggressivity, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 99.0, NULL}, {"vrc_init_cplx", &lavc_param_rc_initial_cplx, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 9999999.0, NULL}, + {"vrc_init_occupancy", &lavc_param_rc_initial_buffer_occupancy, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL}, {"vfdct", &lavc_param_fdct, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL}, {"aspect", &lavc_param_aspect, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"autoaspect", &lavc_param_autoaspect, CONF_TYPE_FLAG, 0, 0, 1, NULL}, @@ -395,6 +397,9 @@ lavc_venc_context->rc_max_rate= lavc_param_rc_max_rate*1000; lavc_venc_context->rc_min_rate= lavc_param_rc_min_rate*1000; lavc_venc_context->rc_buffer_size= lavc_param_rc_buffer_size*1000; + lavc_venc_context->rc_initial_buffer_occupancy= + lavc_venc_context->rc_buffer_size * + lavc_param_rc_initial_buffer_occupancy; lavc_venc_context->rc_buffer_aggressivity= lavc_param_rc_buffer_aggressivity; lavc_venc_context->rc_initial_cplx= lavc_param_rc_initial_cplx; #if LIBAVCODEC_BUILD >= 4642