Commit 2a8f6da9 authored by Laurent Aimar's avatar Laurent Aimar

es_out: clean up.

parent 4e647fc9
...@@ -46,7 +46,6 @@ struct es_out_id_t ...@@ -46,7 +46,6 @@ struct es_out_id_t
struct es_out_sys_t struct es_out_sys_t
{ {
input_thread_t *p_input; input_thread_t *p_input;
vlc_bool_t b_convert_ts_auto; /* automatically convert TimeStamp */
/* all es */ /* all es */
int i_id; int i_id;
...@@ -99,7 +98,6 @@ es_out_t *input_EsOutNew( input_thread_t *p_input ) ...@@ -99,7 +98,6 @@ es_out_t *input_EsOutNew( input_thread_t *p_input )
out->p_sys = p_sys; out->p_sys = p_sys;
p_sys->p_input = p_input; p_sys->p_input = p_input;
p_sys->b_convert_ts_auto = VLC_TRUE;
p_sys->b_active = VLC_FALSE; p_sys->b_active = VLC_FALSE;
p_sys->i_mode = ES_OUT_MODE_AUTO; p_sys->i_mode = ES_OUT_MODE_AUTO;
...@@ -450,9 +448,6 @@ static es_out_id_t *EsOutAdd( es_out_t *out, es_format_t *fmt ) ...@@ -450,9 +448,6 @@ static es_out_id_t *EsOutAdd( es_out_t *out, es_format_t *fmt )
static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block ) static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
{ {
es_out_sys_t *p_sys = out->p_sys; es_out_sys_t *p_sys = out->p_sys;
if( p_sys->b_convert_ts_auto )
{
pgrm_descriptor_t *p_pgrm = es->p_es->p_pgrm; pgrm_descriptor_t *p_pgrm = es->p_es->p_pgrm;
input_thread_t *p_input = p_sys->p_input; input_thread_t *p_input = p_sys->p_input;
...@@ -472,7 +467,6 @@ static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block ) ...@@ -472,7 +467,6 @@ static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
p_block->i_pts = p_block->i_pts =
input_ClockGetTS( p_input, p_pgrm, ( p_block->i_pts + 11 )* 9 / 100 ); input_ClockGetTS( p_input, p_pgrm, ( p_block->i_pts + 11 )* 9 / 100 );
} }
}
vlc_mutex_lock( &out->p_sys->p_input->stream.stream_lock ); vlc_mutex_lock( &out->p_sys->p_input->stream.stream_lock );
p_block->i_rate = out->p_sys->p_input->stream.control.i_rate; p_block->i_rate = out->p_sys->p_input->stream.control.i_rate;
...@@ -701,30 +695,6 @@ static int EsOutControl( es_out_t *out, int i_query, va_list args ) ...@@ -701,30 +695,6 @@ static int EsOutControl( es_out_t *out, int i_query, va_list args )
} }
return VLC_SUCCESS; return VLC_SUCCESS;
case ES_OUT_CONVERT_TIMESTAMP:
case ES_OUT_CONVERT_GROUP_TIMESTAMP:
{
pgrm_descriptor_t *p_pgrm = NULL;
if( i_query == ES_OUT_CONVERT_TIMESTAMP )
{
p_pgrm = p_sys->p_input->stream.p_selected_program;
}
else
{
int i_group = (int)va_arg( args, int );
p_pgrm = input_FindProgram( p_sys->p_input, i_group );
}
if( p_pgrm )
{
int64_t *pi_ts = (int64_t*)va_arg( args, int64_t* );
*pi_ts = input_ClockGetTS( p_sys->p_input, p_pgrm, ( *pi_ts + 11 ) * 9 / 100 );
}
p_sys->b_convert_ts_auto = VLC_FALSE;
return VLC_SUCCESS;
}
default: default:
msg_Err( p_sys->p_input, "unknown query in es_out_Control" ); msg_Err( p_sys->p_input, "unknown query in es_out_Control" );
return VLC_EGENERIC; return VLC_EGENERIC;
......
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