Skip to content

V
vlc-1.1
Commit 6bbeeca1 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Removed dead code.

parent f2fb8b7f
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 175 deletions
src/input/clock.c
View file @ 6bbeeca1
......@@ -143,95 +143,6 @@ void input_ClockInit( input_clock_t *cl, vlc_bool_t b_master, int i_cr_average )
cl->b_master = b_master;
}
#if 0
/*****************************************************************************
* input_ClockManageControl: handles the messages from the interface
*****************************************************************************
* Returns UNDEF_S if nothing happened, PAUSE_S if the stream was paused
*****************************************************************************/
int input_ClockManageControl( input_thread_t * p_input,
input_clock_t *cl, mtime_t i_clock )
{
#if 0
vlc_value_t val;
int i_return_value = UNDEF_S;
vlc_mutex_lock( &p_input->p->stream.stream_lock );
if( p_input->p->stream.i_new_status == PAUSE_S )
{
int i_old_status;
vlc_mutex_lock( &p_input->p->stream.control.control_lock );
i_old_status = p_input->p->stream.control.i_status;
p_input->p->stream.control.i_status = PAUSE_S;
vlc_mutex_unlock( &p_input->p->stream.control.control_lock );
vlc_cond_wait( &p_input->p->stream.stream_wait,
&p_input->p->stream.stream_lock );
ClockNewRef( p_pgrm, i_clock, p_pgrm->last_pts > mdate() ?
p_pgrm->last_pts : mdate() );
if( p_input->p->stream.i_new_status == PAUSE_S )
{
/* PAUSE_S undoes the pause state: Return to old state. */
vlc_mutex_lock( &p_input->p->stream.control.control_lock );
p_input->p->stream.control.i_status = i_old_status;
vlc_mutex_unlock( &p_input->p->stream.control.control_lock );
p_input->p->stream.i_new_status = UNDEF_S;
p_input->p->stream.i_new_rate = UNDEF_S;
}
/* We handle i_new_status != PAUSE_S below... */
i_return_value = PAUSE_S;
}
if( p_input->p->stream.i_new_status != UNDEF_S )
{
vlc_mutex_lock( &p_input->p->stream.control.control_lock );
p_input->p->stream.control.i_status = p_input->stream.i_new_status;
ClockNewRef( p_pgrm, i_clock,
ClockToSysdate( p_input, p_pgrm, i_clock ) );
if( p_input->p->stream.control.i_status == PLAYING_S )
{
p_input->p->stream.control.i_rate = DEFAULT_RATE;
p_input->p->stream.control.b_mute = 0;
}
else
{
p_input->p->stream.control.i_rate = p_input->stream.i_new_rate;
p_input->p->stream.control.b_mute = 1;
/* Feed the audio decoders with a NULL packet to avoid
* discontinuities. */
input_EscapeAudioDiscontinuity( p_input );
}
val.i_int = p_input->p->stream.control.i_rate;
var_Change( p_input, "rate", VLC_VAR_SETVALUE, &val, NULL );
val.i_int = p_input->p->stream.control.i_status;
var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
p_input->p->stream.i_new_status = UNDEF_S;
p_input->p->stream.i_new_rate = UNDEF_S;
vlc_mutex_unlock( &p_input->p->stream.control.control_lock );
}
vlc_mutex_unlock( &p_input->p->stream.stream_lock );
return( i_return_value );
#endif
return UNDEF_S;
}
#endif
/*****************************************************************************
* input_ClockSetPCR: manages a clock reference
*****************************************************************************/
......@@ -280,10 +191,6 @@ void input_ClockSetPCR( input_thread_t *p_input,
* stream ?). */
msg_Warn( p_input, "clock gap, unexpected stream discontinuity" );
input_ClockInit( cl, cl->b_master, cl->i_cr_average );
/* FIXME needed ? */
#if 0
input_EscapeDiscontinuity( p_input );
#endif
}
cl->last_cr = i_clock;
......@@ -303,11 +210,6 @@ void input_ClockSetPCR( input_thread_t *p_input,
}
mwait( i_wakeup );
}
/* FIXME Not needed anymore ? */
#if 0
/* Now take into account interface changes. */
input_ClockManageControl( p_input, cl, i_clock );
#endif
}
else if ( mdate() - cl->last_sysdate > 200000 )
{
......
src/input/decoder.c
View file @ 6bbeeca1
......@@ -295,83 +295,6 @@ void input_DecoderPreroll( decoder_t *p_dec, int64_t i_preroll_end )
{
p_dec->p_owner->i_preroll_end = i_preroll_end;
}
#if 0
/**
* Create a NULL packet for padding in case of a data loss
*
* \param p_input the input thread
* \param p_es es descriptor
* \return nothing
*/
static void input_NullPacket( input_thread_t * p_input,
es_descriptor_t * p_es )
{
#if 0
block_t *p_block = block_New( p_input, PADDING_PACKET_SIZE );
if( p_block )
{
memset( p_block->p_buffer, 0, PADDING_PACKET_SIZE );
p_block->i_flags |= BLOCK_FLAG_DISCONTINUITY;
block_FifoPut( p_es->p_dec->p_owner->p_fifo, p_block );
}
#endif
}
/**
* Send a NULL packet to the decoders
*
* \param p_input the input thread
* \return nothing
*/
void input_EscapeDiscontinuity( input_thread_t * p_input )
{
#if 0
unsigned int i_es, i;
for( i_es = 0; i_es < p_input->p->stream.i_selected_es_number; i_es++ )
{
es_descriptor_t * p_es = p_input->p->stream.pp_selected_es[i_es];
if( p_es->p_dec != NULL )
{
for( i = 0; i < PADDING_PACKET_NUMBER; i++ )
{
input_NullPacket( p_input, p_es );
}
}
}
#endif
}
/**
* Send a NULL packet to the audio decoders
*
* \param p_input the input thread
* \return nothing
*/
void input_EscapeAudioDiscontinuity( input_thread_t * p_input )
{
#if 0
unsigned int i_es, i;
for( i_es = 0; i_es < p_input->p->stream.i_selected_es_number; i_es++ )
{
es_descriptor_t * p_es = p_input->p->stream.pp_selected_es[i_es];
if( p_es->p_dec != NULL && p_es->i_cat == AUDIO_ES )
{
for( i = 0; i < PADDING_PACKET_NUMBER; i++ )
{
input_NullPacket( p_input, p_es );
}
}
}
#endif
}
#endif
/**
* Create a decoder object
*
......
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