Skip to content

V
vlc-1.1
Commit 88988e01 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* src/input/input_clock.c: avoid using mwait() for long periods of time... 

* src/input/input_clock.c: avoid using mwait() for long periods of time without checking p_input->b_die. This will make VLC more resilient to bad streams.
parent 76e67e8c
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 2 deletions
src/input/input_clock.c
View file @ 88988e01
......@@ -250,7 +250,13 @@ void input_ClockManageRef( input_thread_t * p_input,
p_pgrm->last_cr = i_clock;
if( !p_input->b_out_pace_control )
{
mwait( ClockToSysdate( p_input, p_pgrm, i_clock ) );
mtime_t i_wakeup = ClockToSysdate( p_input, p_pgrm, i_clock );
while( (i_wakeup - mdate()) / CLOCK_FREQ > 1 )
{
msleep( CLOCK_FREQ );
if( p_input->b_die ) i_wakeup = mdate();
}
mwait( i_wakeup );
}
}
else
......@@ -285,7 +291,13 @@ void input_ClockManageRef( input_thread_t * p_input,
* clock of the selected program. */
if( !p_input->b_out_pace_control )
{
mwait( ClockToSysdate( p_input, p_pgrm, i_clock ) );
mtime_t i_wakeup = ClockToSysdate( p_input, p_pgrm, i_clock );
while( (i_wakeup - mdate()) / CLOCK_FREQ > 1 )
{
msleep( CLOCK_FREQ );
if( p_input->b_die ) i_wakeup = mdate();
}
mwait( i_wakeup );
}
/* Now take into account interface changes. */
......
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