Skip to content

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

Protect against bogus time in vout while paused.

parent d92600e0
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
src/video_output/video_output.c
View file @ db4b1b44
...@@ -1059,7 +1059,7 @@ static void* RunThread( vlc_object_t *p_this ) ...@@ -1059,7 +1059,7 @@ static void* RunThread( vlc_object_t *p_this )
/* Compute FPS rate */ /* Compute FPS rate */
p_vout->p->p_fps_sample[ p_vout->p->c_fps_samples++ % VOUT_FPS_SAMPLES ] = display_date; p_vout->p->p_fps_sample[ p_vout->p->c_fps_samples++ % VOUT_FPS_SAMPLES ] = display_date;
if( display_date > current_date + VOUT_DISPLAY_DELAY && !p_vout->p->b_paused ) if( !p_vout->p->b_paused && display_date > current_date + VOUT_DISPLAY_DELAY )
{ {
/* A picture is ready to be rendered, but its rendering date /* A picture is ready to be rendered, but its rendering date
* is far from the current one so the thread will perform an * is far from the current one so the thread will perform an
...@@ -1084,6 +1084,11 @@ static void* RunThread( vlc_object_t *p_this ) ...@@ -1084,6 +1084,11 @@ static void* RunThread( vlc_object_t *p_this )
display_date = current_date + p_vout->p->render_time; display_date = current_date + p_vout->p->render_time;
} }
} }
else if( p_vout->p->b_paused && display_date > current_date + VOUT_DISPLAY_DELAY )
{
display_date = current_date + VOUT_DISPLAY_DELAY;
}
if( p_picture ) if( p_picture )
{ {
if( p_picture->date > 1 ) if( p_picture->date > 1 )
......
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