X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Fmixer.c;h=41887cf47a1cdafd99a03d3e4cfc652305c6f39e;hb=acbad93b8b447ac9f776a53bf3e8f74f15132fe4;hp=ee2de270a080fdbc41b4a62a7e32b94578b85177;hpb=d3fe7f28797d4dba65ffcdd60bf932e758a48a9e;p=vlc diff --git a/src/audio_output/mixer.c b/src/audio_output/mixer.c index ee2de270a0..41887cf47a 100644 --- a/src/audio_output/mixer.c +++ b/src/audio_output/mixer.c @@ -24,10 +24,12 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* calloc(), malloc(), free() */ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include +#include +#include #ifdef HAVE_ALLOCA_H # include @@ -41,7 +43,7 @@ *****************************************************************************/ int aout_MixerNew( aout_instance_t * p_aout ) { - p_aout->mixer.p_module = module_Need( p_aout, "audio mixer", NULL, 0 ); + p_aout->mixer.p_module = module_need( p_aout, "audio mixer", NULL, 0 ); if ( p_aout->mixer.p_module == NULL ) { msg_Err( p_aout, "no suitable audio mixer" ); @@ -59,7 +61,7 @@ int aout_MixerNew( aout_instance_t * p_aout ) void aout_MixerDelete( aout_instance_t * p_aout ) { if ( p_aout->mixer.b_error ) return; - module_Unneed( p_aout, p_aout->mixer.p_module ); + module_unneed( p_aout, p_aout->mixer.p_module ); p_aout->mixer.b_error = 1; } @@ -78,7 +80,7 @@ static int MixBuffer( aout_instance_t * p_aout ) if ( p_aout->mixer.b_error ) { /* Free all incoming buffers. */ - vlc_mutex_lock( &p_aout->input_fifos_lock ); + aout_lock_input_fifos( p_aout ); for ( i = 0; i < p_aout->i_nb_inputs; i++ ) { aout_input_t * p_input = p_aout->pp_inputs[i]; @@ -91,13 +93,13 @@ static int MixBuffer( aout_instance_t * p_aout ) p_buffer = p_next; } } - vlc_mutex_unlock( &p_aout->input_fifos_lock ); + aout_unlock_input_fifos( p_aout ); return -1; } - vlc_mutex_lock( &p_aout->output_fifo_lock ); - vlc_mutex_lock( &p_aout->input_fifos_lock ); + aout_lock_output_fifo( p_aout ); + aout_lock_input_fifos( p_aout ); /* Retrieve the date of the next buffer. */ memcpy( &exact_start_date, &p_aout->output.fifo.end_date, @@ -109,14 +111,14 @@ static int MixBuffer( aout_instance_t * p_aout ) /* The output is _very_ late. This can only happen if the user * pauses the stream (or if the decoder is buggy, which cannot * happen :). */ - msg_Warn( p_aout, "output PTS is out of range ("I64Fd"), clearing out", + msg_Warn( p_aout, "output PTS is out of range (%"PRId64"), clearing out", mdate() - start_date ); aout_FifoSet( p_aout, &p_aout->output.fifo, 0 ); aout_DateSet( &exact_start_date, 0 ); start_date = 0; } - vlc_mutex_unlock( &p_aout->output_fifo_lock ); + aout_unlock_output_fifo( p_aout ); /* See if we have enough data to prepare a new buffer for the audio * output. First : start date. */ @@ -134,7 +136,7 @@ static int MixBuffer( aout_instance_t * p_aout ) p_buffer = p_fifo->p_first; while ( p_buffer != NULL && p_buffer->start_date < mdate() ) { - msg_Warn( p_aout, "input PTS is out of range ("I64Fd"), " + msg_Warn( p_aout, "input PTS is out of range (%"PRId64"), " "trashing", mdate() - p_buffer->start_date ); p_buffer = aout_FifoPop( p_aout, p_fifo ); aout_BufferFree( p_buffer ); @@ -162,7 +164,7 @@ static int MixBuffer( aout_instance_t * p_aout ) if ( i < p_aout->i_nb_inputs ) { /* Interrupted before the end... We can't run. */ - vlc_mutex_unlock( &p_aout->input_fifos_lock ); + aout_unlock_input_fifos( p_aout ); return -1; } } @@ -177,7 +179,7 @@ static int MixBuffer( aout_instance_t * p_aout ) aout_fifo_t * p_fifo = &p_input->fifo; aout_buffer_t * p_buffer; mtime_t prev_date; - vlc_bool_t b_drop_buffers; + bool b_drop_buffers; if ( p_input->b_error ) { @@ -197,7 +199,7 @@ static int MixBuffer( aout_instance_t * p_aout ) /* We authorize a +-1 because rounding errors get compensated * regularly. */ aout_buffer_t * p_next = p_buffer->p_next; - msg_Warn( p_aout, "the mixer got a packet in the past ("I64Fd")", + msg_Warn( p_aout, "the mixer got a packet in the past (%"PRId64")", start_date - p_buffer->end_date ); aout_BufferFree( p_buffer ); if( p_input->p_input_thread ) @@ -230,7 +232,7 @@ static int MixBuffer( aout_instance_t * p_aout ) if ( prev_date != p_buffer->start_date ) { msg_Warn( p_aout, - "buffer hole, dropping packets ("I64Fd")", + "buffer hole, dropping packets (%"PRId64")", p_buffer->start_date - prev_date ); b_drop_buffers = 1; break; @@ -276,7 +278,7 @@ static int MixBuffer( aout_instance_t * p_aout ) (i_nb_bytes < p_aout->mixer.mixer.i_bytes_per_frame + mixer_nb_bytes)) ) { - msg_Warn( p_aout, "mixer start isn't output start ("I64Fd")", + msg_Warn( p_aout, "mixer start isn't output start (%"PRId64")", i_nb_bytes - mixer_nb_bytes ); /* Round to the nearest multiple */ @@ -285,8 +287,10 @@ static int MixBuffer( aout_instance_t * p_aout ) if( i_nb_bytes < 0 ) { /* Is it really the best way to do it ? */ + aout_lock_output_fifo( p_aout ); aout_FifoSet( p_aout, &p_aout->output.fifo, 0 ); aout_DateSet( &exact_start_date, 0 ); + aout_unlock_output_fifo( p_aout ); break; } @@ -298,7 +302,7 @@ static int MixBuffer( aout_instance_t * p_aout ) if ( i < p_aout->i_nb_inputs || i_first_input == p_aout->i_nb_inputs ) { /* Interrupted before the end... We can't run. */ - vlc_mutex_unlock( &p_aout->input_fifos_lock ); + aout_unlock_input_fifos( p_aout ); return -1; } @@ -312,8 +316,7 @@ static int MixBuffer( aout_instance_t * p_aout ) p_output_buffer ); if ( p_output_buffer == NULL ) { - msg_Err( p_aout, "out of memory" ); - vlc_mutex_unlock( &p_aout->input_fifos_lock ); + aout_unlock_input_fifos( p_aout ); return -1; } /* This is again a bit kludgy - for the S/PDIF mixer. */ @@ -329,7 +332,7 @@ static int MixBuffer( aout_instance_t * p_aout ) p_aout->mixer.pf_do_work( p_aout, p_output_buffer ); - vlc_mutex_unlock( &p_aout->input_fifos_lock ); + aout_unlock_input_fifos( p_aout ); aout_OutputPlay( p_aout, p_output_buffer ); @@ -355,7 +358,7 @@ void aout_MixerRun( aout_instance_t * p_aout ) int aout_MixerMultiplierSet( aout_instance_t * p_aout, float f_multiplier ) { float f_old = p_aout->mixer.f_multiplier; - vlc_bool_t b_new_mixer = 0; + bool b_new_mixer = 0; if ( !p_aout->mixer.b_error ) {