Commit 951c16c7 authored by Ilkka Ollakka's avatar Ilkka Ollakka

set rc_method = X264_RC_CQP if qp is set

set qpmin/qpmax even without qp set.
more constant on x264 parameters handling.
parent 30b0fc05
...@@ -771,9 +771,17 @@ static int Open ( vlc_object_t *p_this ) ...@@ -771,9 +771,17 @@ static int Open ( vlc_object_t *p_this )
var_Get( p_enc, SOUT_CFG_PREFIX "qpstep", &val ); var_Get( p_enc, SOUT_CFG_PREFIX "qpstep", &val );
if( val.i_int >= 0 && val.i_int <= 51 ) p_sys->param.rc.i_qp_step = val.i_int; if( val.i_int >= 0 && val.i_int <= 51 ) p_sys->param.rc.i_qp_step = val.i_int;
var_Get( p_enc, SOUT_CFG_PREFIX "qpmin", &val ); var_Get( p_enc, SOUT_CFG_PREFIX "qpmin", &val );
if( val.i_int >= 0 && val.i_int <= 51 ) i_qmin = val.i_int; if( val.i_int >= 0 && val.i_int <= 51 )
{
i_qmin = val.i_int;
p_sys->param.rc.i_qp_min = i_qmin;
}
var_Get( p_enc, SOUT_CFG_PREFIX "qpmax", &val ); var_Get( p_enc, SOUT_CFG_PREFIX "qpmax", &val );
if( val.i_int >= 0 && val.i_int <= 51 ) i_qmax = val.i_int; if( val.i_int >= 0 && val.i_int <= 51 )
{
i_qmax = val.i_int;
p_sys->param.rc.i_qp_max = i_qmax;
}
var_Get( p_enc, SOUT_CFG_PREFIX "qp", &val ); var_Get( p_enc, SOUT_CFG_PREFIX "qp", &val );
if( val.i_int >= 0 && val.i_int <= 51 ) if( val.i_int >= 0 && val.i_int <= 51 )
...@@ -781,6 +789,7 @@ static int Open ( vlc_object_t *p_this ) ...@@ -781,6 +789,7 @@ static int Open ( vlc_object_t *p_this )
if( i_qmin > val.i_int ) i_qmin = val.i_int; if( i_qmin > val.i_int ) i_qmin = val.i_int;
if( i_qmax < val.i_int ) i_qmax = val.i_int; if( i_qmax < val.i_int ) i_qmax = val.i_int;
p_sys->param.rc.i_rc_method = X264_RC_CQP;
#if X264_BUILD >= 0x000a #if X264_BUILD >= 0x000a
p_sys->param.rc.i_qp_constant = val.i_int; p_sys->param.rc.i_qp_constant = val.i_int;
p_sys->param.rc.i_qp_min = i_qmin; p_sys->param.rc.i_qp_min = i_qmin;
......
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