Skip to content

V
vlc-1.1
Commit 5cde6e77 authored by Rémi Duraffort's avatar Rémi Duraffort
Browse files
Options

Use var_Get* when applicable.

parent f2da8f85
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 18 deletions
modules/mux/mpeg/ts.c
View file @ 5cde6e77
...@@ -650,8 +650,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -650,8 +650,7 @@ static int Open( vlc_object_t *p_this )
p_sys->b_sdt = false; p_sys->b_sdt = false;
#endif #endif
var_Get( p_mux, SOUT_CFG_PREFIX "alignment", &val ); p_sys->b_data_alignment = var_GetBool( p_mux, SOUT_CFG_PREFIX "alignment" );
p_sys->b_data_alignment = val.b_bool;
var_Get( p_mux, SOUT_CFG_PREFIX "program-pmt", &val ); var_Get( p_mux, SOUT_CFG_PREFIX "program-pmt", &val );
if( val.psz_string && *val.psz_string ) if( val.psz_string && *val.psz_string )
...@@ -705,22 +704,19 @@ static int Open( vlc_object_t *p_this ) ...@@ -705,22 +704,19 @@ static int Open( vlc_object_t *p_this )
p_sys->i_pid_free = p_sys->pmt[p_sys->i_num_pmt - 1].i_pid + 1; p_sys->i_pid_free = p_sys->pmt[p_sys->i_num_pmt - 1].i_pid + 1;
var_Get( p_mux, SOUT_CFG_PREFIX "pid-video", &val ); p_sys->i_pid_video = var_GetInteger( p_mux, SOUT_CFG_PREFIX "pid-video" );
p_sys->i_pid_video = val.i_int;
if ( p_sys->i_pid_video > p_sys->i_pid_free ) if ( p_sys->i_pid_video > p_sys->i_pid_free )
{ {
p_sys->i_pid_free = p_sys->i_pid_video + 1; p_sys->i_pid_free = p_sys->i_pid_video + 1;
} }
var_Get( p_mux, SOUT_CFG_PREFIX "pid-audio", &val ); p_sys->i_pid_audio = var_GetInteger( p_mux, SOUT_CFG_PREFIX "pid-audio" );
p_sys->i_pid_audio = val.i_int;
if ( p_sys->i_pid_audio > p_sys->i_pid_free ) if ( p_sys->i_pid_audio > p_sys->i_pid_free )
{ {
p_sys->i_pid_free = p_sys->i_pid_audio + 1; p_sys->i_pid_free = p_sys->i_pid_audio + 1;
} }
var_Get( p_mux, SOUT_CFG_PREFIX "pid-spu", &val ); p_sys->i_pid_spu = var_GetInteger( p_mux, SOUT_CFG_PREFIX "pid-spu" );
p_sys->i_pid_spu = val.i_int;
if ( p_sys->i_pid_spu > p_sys->i_pid_free ) if ( p_sys->i_pid_spu > p_sys->i_pid_free )
{ {
p_sys->i_pid_free = p_sys->i_pid_spu + 1; p_sys->i_pid_free = p_sys->i_pid_spu + 1;
...@@ -734,11 +730,9 @@ static int Open( vlc_object_t *p_this ) ...@@ -734,11 +730,9 @@ static int Open( vlc_object_t *p_this )
p_sys->i_null_continuity_counter = 0; p_sys->i_null_continuity_counter = 0;
/* Allow to create constrained stream */ /* Allow to create constrained stream */
var_Get( p_mux, SOUT_CFG_PREFIX "bmin", &val ); p_sys->i_bitrate_min = var_GetInteger( p_mux, SOUT_CFG_PREFIX "bmin" );
p_sys->i_bitrate_min = val.i_int;
var_Get( p_mux, SOUT_CFG_PREFIX "bmax", &val ); p_sys->i_bitrate_max = var_GetInteger( p_mux, SOUT_CFG_PREFIX "bmax" );
p_sys->i_bitrate_max = val.i_int;
if( p_sys->i_bitrate_min > 0 && p_sys->i_bitrate_max > 0 && if( p_sys->i_bitrate_min > 0 && p_sys->i_bitrate_max > 0 &&
p_sys->i_bitrate_min > p_sys->i_bitrate_max ) p_sys->i_bitrate_min > p_sys->i_bitrate_max )
...@@ -781,8 +775,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -781,8 +775,7 @@ static int Open( vlc_object_t *p_this )
msg_Dbg( p_mux, "shaping=%"PRId64" pcr=%"PRId64" dts_delay=%"PRId64, msg_Dbg( p_mux, "shaping=%"PRId64" pcr=%"PRId64" dts_delay=%"PRId64,
p_sys->i_shaping_delay, p_sys->i_pcr_delay, p_sys->i_dts_delay ); p_sys->i_shaping_delay, p_sys->i_pcr_delay, p_sys->i_dts_delay );
var_Get( p_mux, SOUT_CFG_PREFIX "use-key-frames", &val ); p_sys->b_use_key_frames = var_GetBool( p_mux, SOUT_CFG_PREFIX "use-key-frames" );
p_sys->b_use_key_frames = val.b_bool;
/* for TS generation */ /* for TS generation */
p_sys->i_pcr = 0; p_sys->i_pcr = 0;
...@@ -847,11 +840,9 @@ static int Open( vlc_object_t *p_this ) ...@@ -847,11 +840,9 @@ static int Open( vlc_object_t *p_this )
} }
free( val.psz_string ); free( val.psz_string );
var_Get( p_mux, SOUT_CFG_PREFIX "crypt-audio", &val ); p_sys->b_crypt_audio = var_GetBool( p_mux, SOUT_CFG_PREFIX "crypt-audio" );
p_sys->b_crypt_audio = val.b_bool;
var_Get( p_mux, SOUT_CFG_PREFIX "crypt-video", &val ); p_sys->b_crypt_video = var_GetBool( p_mux, SOUT_CFG_PREFIX "crypt-video" );
p_sys->b_crypt_video = val.b_bool;
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
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