Skip to content

V
vlc
Commit a6b9a013 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

WaveOut: don't access b_starving (not really needed here)

parent 0707bc75
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 22 deletions
modules/audio_output/waveout.c
View file @ a6b9a013
...@@ -895,10 +895,9 @@ static void* WaveOutThread( void *data ) ...@@ -895,10 +895,9 @@ static void* WaveOutThread( void *data )
#define waveout_warn(msg) msg_Warn( p_aout, "aout_OutputNextBuffer no buffer "\ #define waveout_warn(msg) msg_Warn( p_aout, "aout_OutputNextBuffer no buffer "\
"got next_date=%d ms, "\ "got next_date=%d ms, "\
"%d frames to play, "\ "%d frames to play, %s",\
"starving? %d, %s",(int)(next_date/(mtime_t)1000), \ (int)(next_date/(mtime_t)1000), \
i_queued_frames, \ i_queued_frames, msg);
p_aout->output.b_starving, msg);
next_date = mdate(); next_date = mdate();
while( !vlc_atomic_get(&p_aout->output.p_sys->abort) ) while( !vlc_atomic_get(&p_aout->output.p_sys->abort) )
...@@ -930,25 +929,19 @@ static void* WaveOutThread( void *data ) ...@@ -930,25 +929,19 @@ static void* WaveOutThread( void *data )
if(!p_buffer) if(!p_buffer)
{ {
#if 0 #if 0
msg_Dbg( p_aout, "aout_OutputNextBuffer no buffer "\ msg_Dbg( p_aout, "aout_OutputNextBuffer no buffer "
"got next_date=%d ms, "\ "got next_date=%d ms, "
"%d frames to play, "\ "%d frames to play",
"starving? %d",(int)(next_date/(mtime_t)1000), (int)(next_date/(mtime_t)1000),
i_queued_frames, i_queued_frames);
p_aout->output.b_starving);
#endif #endif
if(p_aout->output.b_starving) // means we are too early to request a new buffer?
{ waveout_warn("waiting...")
// means we are too early to request a new buffer? next_date = aout_FifoFirstDate( p_aout, &p_aout->output.fifo );
waveout_warn("waiting...") mwait( next_date - AOUT_PTS_TOLERANCE/4 );
next_date = aout_FifoFirstDate( p_aout, &p_aout->output.fifo ); next_date = mdate();
mwait( next_date - AOUT_PTS_TOLERANCE/4 ); p_buffer = aout_OutputNextBuffer( p_aout, next_date,
next_date = mdate(); b_sleek );
p_buffer = aout_OutputNextBuffer( p_aout,
next_date,
b_sleek
);
}
} }
if( !p_buffer && i_queued_frames ) if( !p_buffer && i_queued_frames )
......
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