X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Fmixer.c;h=502833e30c09dc7f1843f7d961ff48eea6bc3499;hb=7a87d5768beaecfc8132a875d08b53ec5b780bee;hp=972f12e44b0dd196d54bc14ca802aa9380133a23;hpb=9b52a805d106bf9fa8dc9de4d628cecf84c51410;p=vlc diff --git a/src/audio_output/mixer.c b/src/audio_output/mixer.c index 972f12e44b..502833e30c 100644 --- a/src/audio_output/mixer.c +++ b/src/audio_output/mixer.c @@ -1,7 +1,7 @@ /***************************************************************************** * mixer.c : audio output mixing operations ***************************************************************************** - * Copyright (C) 2002-2004 VideoLAN + * Copyright (C) 2002-2004 the VideoLAN team * $Id$ * * Authors: Christophe Massiot @@ -18,24 +18,23 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* calloc(), malloc(), free() */ -#include - -#include - -#ifdef HAVE_ALLOCA_H -# include +#ifdef HAVE_CONFIG_H +# include "config.h" #endif +#include -#include "audio_output.h" -#include "aout_internal.h" +#include +#include +#include +#include +#include "aout_internal.h" /***************************************************************************** * aout_MixerNew: prepare a mixer plug-in ***************************************************************************** @@ -43,14 +42,38 @@ *****************************************************************************/ int aout_MixerNew( aout_instance_t * p_aout ) { - p_aout->mixer.p_module = module_Need( p_aout, "audio mixer", NULL, 0 ); - if ( p_aout->mixer.p_module == NULL ) + assert( !p_aout->p_mixer ); + vlc_assert_locked( &p_aout->input_fifos_lock ); + + aout_mixer_t *p_mixer = vlc_object_create( p_aout, sizeof(*p_mixer) ); + if( !p_mixer ) + return VLC_EGENERIC; + + p_mixer->fmt = p_aout->mixer_format; + p_mixer->allocation = p_aout->mixer_allocation; + p_mixer->multiplier = p_aout->mixer_multiplier; + p_mixer->input_count = p_aout->i_nb_inputs; + p_mixer->input = calloc( p_mixer->input_count, sizeof(*p_mixer->input) ); + for( int i = 0; i < p_aout->i_nb_inputs; i++ ) + p_mixer->input[i] = &p_aout->pp_inputs[i]->mixer; + p_mixer->mix = NULL; + p_mixer->sys = NULL; + + vlc_object_attach( p_mixer, p_aout ); + + p_mixer->module = module_need( p_mixer, "audio mixer", NULL, false ); + if( !p_mixer->module ) { - msg_Err( p_aout, "no suitable aout mixer" ); - return -1; + msg_Err( p_aout, "no suitable audio mixer" ); + vlc_object_detach( p_mixer ); + free( p_mixer->input ); + vlc_object_release( p_mixer ); + return VLC_EGENERIC; } - p_aout->mixer.b_error = 0; - return 0; + + /* */ + p_aout->p_mixer = p_mixer; + return VLC_SUCCESS; } /***************************************************************************** @@ -60,9 +83,18 @@ 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 ); - p_aout->mixer.b_error = 1; + if( !p_aout->p_mixer ) + return; + + vlc_object_detach( p_aout->p_mixer ); + + module_unneed( p_aout->p_mixer, p_aout->p_mixer->module ); + + free( p_aout->p_mixer->input ); + vlc_object_release( p_aout->p_mixer ); + + /* */ + p_aout->p_mixer = NULL; } /***************************************************************************** @@ -75,16 +107,16 @@ static int MixBuffer( aout_instance_t * p_aout ) int i, i_first_input = 0; aout_buffer_t * p_output_buffer; mtime_t start_date, end_date; - audio_date_t exact_start_date; + date_t exact_start_date; - if ( p_aout->mixer.b_error ) + if( !p_aout->p_mixer ) { /* 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]; - aout_buffer_t * p_buffer = p_input->fifo.p_first; + aout_buffer_t * p_buffer = p_input->mixer.fifo.p_first; if ( p_input->b_error ) continue; while ( p_buffer != NULL ) { @@ -93,32 +125,31 @@ 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, - sizeof(audio_date_t) ); - start_date = aout_DateGet( &exact_start_date ); + exact_start_date = p_aout->output.fifo.end_date; + start_date = date_Get( &exact_start_date ); if ( start_date != 0 && start_date < mdate() ) { /* 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 ); + date_Set( &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. */ @@ -128,20 +159,21 @@ static int MixBuffer( aout_instance_t * p_aout ) for ( i = 0; i < p_aout->i_nb_inputs; i++ ) { aout_input_t * p_input = p_aout->pp_inputs[i]; - aout_fifo_t * p_fifo = &p_input->fifo; + aout_fifo_t * p_fifo = &p_input->mixer.fifo; aout_buffer_t * p_buffer; - if ( p_input->b_error ) continue; + if ( p_input->b_error || p_input->b_paused ) + continue; p_buffer = p_fifo->p_first; - while ( p_buffer != NULL && p_buffer->start_date < mdate() ) + while ( p_buffer != NULL && p_buffer->i_pts < mdate() ) { - msg_Warn( p_aout, "input PTS is out of range ("I64Fd"), " - "trashing", mdate() - p_buffer->start_date ); + msg_Warn( p_aout, "input PTS is out of range (%"PRId64"), " + "trashing", mdate() - p_buffer->i_pts ); p_buffer = aout_FifoPop( p_aout, p_fifo ); aout_BufferFree( p_buffer ); p_buffer = p_fifo->p_first; - p_input->p_first_byte_to_mix = NULL; + p_input->mixer.begin = NULL; } if ( p_buffer == NULL ) @@ -149,34 +181,35 @@ static int MixBuffer( aout_instance_t * p_aout ) break; } - if ( !start_date || start_date < p_buffer->start_date ) + if ( !start_date || start_date < p_buffer->i_pts ) { - aout_DateSet( &exact_start_date, p_buffer->start_date ); - start_date = p_buffer->start_date; + date_Set( &exact_start_date, p_buffer->i_pts ); + start_date = p_buffer->i_pts; } } 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; } } - aout_DateIncrement( &exact_start_date, p_aout->output.i_nb_samples ); - end_date = aout_DateGet( &exact_start_date ); + date_Increment( &exact_start_date, p_aout->output.i_nb_samples ); + end_date = date_Get( &exact_start_date ); /* Check that start_date and end_date are available for all input * streams. */ for ( i = 0; i < p_aout->i_nb_inputs; i++ ) { aout_input_t * p_input = p_aout->pp_inputs[i]; - aout_fifo_t * p_fifo = &p_input->fifo; + aout_fifo_t * p_fifo = &p_input->mixer.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 ) + p_input->mixer.is_invalid = p_input->b_error || p_input->b_paused; + if ( p_input->mixer.is_invalid ) { if ( i_first_input == i ) i_first_input++; continue; @@ -189,16 +222,17 @@ static int MixBuffer( aout_instance_t * p_aout ) } /* Check for the continuity of start_date */ - while ( p_buffer != NULL && p_buffer->end_date < start_date - 1 ) + while ( p_buffer != NULL + && p_buffer->i_pts + p_buffer->i_length < start_date - 1 ) { /* 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")", - start_date - p_buffer->end_date ); + msg_Warn( p_aout, "the mixer got a packet in the past (%"PRId64")", + start_date - (p_buffer->i_pts + p_buffer->i_length) ); aout_BufferFree( p_buffer ); p_fifo->p_first = p_buffer = p_next; - p_input->p_first_byte_to_mix = NULL; + p_input->mixer.begin = NULL; } if ( p_buffer == NULL ) { @@ -211,24 +245,24 @@ static int MixBuffer( aout_instance_t * p_aout ) { p_buffer = p_fifo->p_first; if ( p_buffer == NULL ) break; - if ( p_buffer->end_date >= end_date ) break; + if ( p_buffer->i_pts + p_buffer->i_length >= end_date ) break; /* Check that all buffers are contiguous. */ - prev_date = p_fifo->p_first->end_date; + prev_date = p_fifo->p_first->i_pts + p_fifo->p_first->i_length; p_buffer = p_buffer->p_next; b_drop_buffers = 0; for ( ; p_buffer != NULL; p_buffer = p_buffer->p_next ) { - if ( prev_date != p_buffer->start_date ) + if ( prev_date != p_buffer->i_pts ) { msg_Warn( p_aout, - "buffer hole, dropping packets ("I64Fd")", - p_buffer->start_date - prev_date ); + "buffer hole, dropping packets (%"PRId64")", + p_buffer->i_pts - prev_date ); b_drop_buffers = 1; break; } - if ( p_buffer->end_date >= end_date ) break; - prev_date = p_buffer->end_date; + if ( p_buffer->i_pts + p_buffer->i_length >= end_date ) break; + prev_date = p_buffer->i_pts + p_buffer->i_length; } if ( b_drop_buffers ) { @@ -246,38 +280,45 @@ static int MixBuffer( aout_instance_t * p_aout ) if ( p_buffer == NULL ) break; p_buffer = p_fifo->p_first; - if ( !AOUT_FMT_NON_LINEAR( &p_aout->mixer.mixer ) ) + if ( !AOUT_FMT_NON_LINEAR( &p_aout->p_mixer->fmt ) ) { /* Additionally check that p_first_byte_to_mix is well * located. */ - mtime_t i_nb_bytes = (start_date - p_buffer->start_date) - * p_aout->mixer.mixer.i_bytes_per_frame - * p_aout->mixer.mixer.i_rate - / p_aout->mixer.mixer.i_frame_length + mtime_t i_buffer = (start_date - p_buffer->i_pts) + * p_aout->p_mixer->fmt.i_bytes_per_frame + * p_aout->p_mixer->fmt.i_rate + / p_aout->p_mixer->fmt.i_frame_length / 1000000; ptrdiff_t mixer_nb_bytes; - if ( p_input->p_first_byte_to_mix == NULL ) + if ( p_input->mixer.begin == NULL ) { - p_input->p_first_byte_to_mix = p_buffer->p_buffer; + p_input->mixer.begin = p_buffer->p_buffer; } - mixer_nb_bytes = p_input->p_first_byte_to_mix - p_buffer->p_buffer; + mixer_nb_bytes = p_input->mixer.begin - p_buffer->p_buffer; - if ( !((i_nb_bytes + p_aout->mixer.mixer.i_bytes_per_frame + if ( !((i_buffer + p_aout->p_mixer->fmt.i_bytes_per_frame > mixer_nb_bytes) && - (i_nb_bytes < p_aout->mixer.mixer.i_bytes_per_frame + (i_buffer < p_aout->p_mixer->fmt.i_bytes_per_frame + mixer_nb_bytes)) ) { - msg_Warn( p_aout, "mixer start isn't output start ("I64Fd")", - i_nb_bytes - mixer_nb_bytes ); + msg_Warn( p_aout, "mixer start isn't output start (%"PRId64")", + i_buffer - mixer_nb_bytes ); /* Round to the nearest multiple */ - i_nb_bytes /= p_aout->mixer.mixer.i_bytes_per_frame; - i_nb_bytes *= p_aout->mixer.mixer.i_bytes_per_frame; - - if( i_nb_bytes < 0 ) break; /* FIXME: reset state properly */ + i_buffer /= p_aout->p_mixer->fmt.i_bytes_per_frame; + i_buffer *= p_aout->p_mixer->fmt.i_bytes_per_frame; + if( i_buffer < 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 ); + date_Set( &exact_start_date, 0 ); + aout_unlock_output_fifo( p_aout ); + break; + } - p_input->p_first_byte_to_mix = p_buffer->p_buffer + i_nb_bytes; + p_input->mixer.begin = p_buffer->p_buffer + i_buffer; } } } @@ -285,38 +326,36 @@ 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; } /* Run the mixer. */ - aout_BufferAlloc( &p_aout->mixer.output_alloc, - ((uint64_t)p_aout->output.i_nb_samples * 1000000) - / p_aout->output.output.i_rate, - /* This is a bit kludgy, but is actually only used - * for the S/PDIF dummy mixer : */ - p_aout->pp_inputs[i_first_input]->fifo.p_first, - p_output_buffer ); + p_output_buffer = aout_BufferAlloc( &p_aout->p_mixer->allocation, + ((uint64_t)p_aout->output.i_nb_samples * 1000000) + / p_aout->output.output.i_rate, + /* This is a bit kludgy, but is actually only used + * for the S/PDIF dummy mixer : */ + p_aout->pp_inputs[i_first_input]->mixer.fifo.p_first); 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. */ - if ( p_aout->mixer.output_alloc.i_alloc_type != AOUT_ALLOC_NONE ) + if ( p_aout->p_mixer->allocation.b_alloc ) { p_output_buffer->i_nb_samples = p_aout->output.i_nb_samples; - p_output_buffer->i_nb_bytes = p_aout->output.i_nb_samples - * p_aout->mixer.mixer.i_bytes_per_frame - / p_aout->mixer.mixer.i_frame_length; + p_output_buffer->i_buffer = p_aout->output.i_nb_samples + * p_aout->p_mixer->fmt.i_bytes_per_frame + / p_aout->p_mixer->fmt.i_frame_length; } - p_output_buffer->start_date = start_date; - p_output_buffer->end_date = end_date; + p_output_buffer->i_pts = start_date; + p_output_buffer->i_length = end_date - start_date; - p_aout->mixer.pf_do_work( p_aout, p_output_buffer ); + p_aout->p_mixer->mix( p_aout->p_mixer, p_output_buffer ); - vlc_mutex_unlock( &p_aout->input_fifos_lock ); + aout_unlock_input_fifos( p_aout ); aout_OutputPlay( p_aout, p_output_buffer ); @@ -341,20 +380,20 @@ 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; + float f_old = p_aout->mixer_multiplier; + bool b_new_mixer = false; - if ( !p_aout->mixer.b_error ) + if ( p_aout->p_mixer ) { aout_MixerDelete( p_aout ); - b_new_mixer = 1; + b_new_mixer = true; } - p_aout->mixer.f_multiplier = f_multiplier; + p_aout->mixer_multiplier = f_multiplier; if ( b_new_mixer && aout_MixerNew( p_aout ) ) { - p_aout->mixer.f_multiplier = f_old; + p_aout->mixer_multiplier = f_old; aout_MixerNew( p_aout ); return -1; } @@ -370,7 +409,7 @@ int aout_MixerMultiplierSet( aout_instance_t * p_aout, float f_multiplier ) *****************************************************************************/ int aout_MixerMultiplierGet( aout_instance_t * p_aout, float * pf_multiplier ) { - *pf_multiplier = p_aout->mixer.f_multiplier; + *pf_multiplier = p_aout->mixer_multiplier; return 0; }