diff options
| author | ranma <ranma@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-06-20 14:27:21 +0000 |
|---|---|---|
| committer | ranma <ranma@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-06-20 14:27:21 +0000 |
| commit | ab1937346e91dd52dfb7839595bd2562b3d4373b (patch) | |
| tree | 88a0b6f89605761f674e6416a58212c74a3491f3 | |
| parent | a3e5eab301b877ca7aaaeeb70e5fd7454f20d0bd (diff) | |
| download | mpv-ab1937346e91dd52dfb7839595bd2562b3d4373b.tar.bz2 mpv-ab1937346e91dd52dfb7839595bd2562b3d4373b.tar.xz | |
Add vrc_init_occupancy to lavcopts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15782 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | DOCS/man/de/mplayer.1 | 4 | ||||
| -rw-r--r-- | DOCS/man/en/mplayer.1 | 4 | ||||
| -rw-r--r-- | libmpcodecs/ve_lavc.c | 5 |
3 files changed, 13 insertions, 0 deletions
diff --git a/DOCS/man/de/mplayer.1 b/DOCS/man/de/mplayer.1 index 940bfa1e5b..3bbf0d0835 100644 --- a/DOCS/man/de/mplayer.1 +++ b/DOCS/man/de/mplayer.1 @@ -6840,6 +6840,10 @@ Qualitätskorrektur in % 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 --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 5c184509c1..944ebed0cc 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -6612,6 +6612,10 @@ quality correction in % 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 --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index dbe0d0c56e..f050365dad 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -93,6 +93,7 @@ static float lavc_param_rc_buffer_aggressivity=1.0; 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 @@ m_option_t lavcopts_conf[]={ {"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 @@ static int config(struct vf_instance_s* vf, 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 |