X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Fmixer.c;h=c13a107ec6b33e7431ba1deee2444c81974af704;hb=5d0ae5d7c860a4225264566e655993f2688a3506;hp=928cd5457e097ecd3f922b538e1e1f58ccdb7213;hpb=81442b6bf1af46dbaedc3388ea0b48f55bf13ae1;p=vlc diff --git a/src/audio_output/mixer.c b/src/audio_output/mixer.c index 928cd5457e..c13a107ec6 100644 --- a/src/audio_output/mixer.c +++ b/src/audio_output/mixer.c @@ -1,8 +1,8 @@ /***************************************************************************** * mixer.c : audio output mixing operations ***************************************************************************** - * Copyright (C) 2002 VideoLAN - * $Id: mixer.c,v 1.13 2002/09/19 21:56:40 massiot Exp $ + * Copyright (C) 2002-2004 the VideoLAN team + * $Id$ * * Authors: Christophe Massiot * @@ -10,7 +10,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -18,24 +18,26 @@ * * 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 +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif +#include -#include +#include +#include +#include #ifdef HAVE_ALLOCA_H -# include +# include #endif - -#include "audio_output.h" +#include #include "aout_internal.h" - /***************************************************************************** * aout_MixerNew: prepare a mixer plug-in ***************************************************************************** @@ -43,13 +45,38 @@ *****************************************************************************/ int aout_MixerNew( aout_instance_t * p_aout ) { - p_aout->mixer.p_module = module_Need( p_aout, "audio mixer", NULL ); - 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; } - return 0; + + /* */ + p_aout->p_mixer = p_mixer; + return VLC_SUCCESS; } /***************************************************************************** @@ -59,41 +86,73 @@ int aout_MixerNew( aout_instance_t * p_aout ) *****************************************************************************/ void aout_MixerDelete( aout_instance_t * p_aout ) { - module_Unneed( p_aout, p_aout->mixer.p_module ); + 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; } /***************************************************************************** * MixBuffer: try to prepare one output buffer + ***************************************************************************** + * Please note that you must hold the mixer lock. *****************************************************************************/ static int MixBuffer( aout_instance_t * p_aout ) { - int i; + 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; - vlc_mutex_lock( &p_aout->mixer_lock ); - vlc_mutex_lock( &p_aout->output_fifo_lock ); - vlc_mutex_lock( &p_aout->input_fifos_lock ); + if( !p_aout->p_mixer ) + { + /* Free all incoming buffers. */ + 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->mixer.fifo.p_first; + if ( p_input->b_error ) continue; + while ( p_buffer != NULL ) + { + aout_buffer_t * p_next = p_buffer->p_next; + aout_BufferFree( p_buffer ); + p_buffer = p_next; + } + } + aout_unlock_input_fifos( p_aout ); + return -1; + } + + + 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 (%lld), 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. */ @@ -103,10 +162,23 @@ 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 || p_input->b_paused ) + continue; + 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 (%"PRId64"), " + "trashing", mdate() - p_buffer->start_date ); + p_buffer = aout_FifoPop( p_aout, p_fifo ); + aout_BufferFree( p_buffer ); + p_buffer = p_fifo->p_first; + p_input->mixer.begin = NULL; + } + if ( p_buffer == NULL ) { break; @@ -114,7 +186,7 @@ static int MixBuffer( aout_instance_t * p_aout ) if ( !start_date || start_date < p_buffer->start_date ) { - aout_DateSet( &exact_start_date, p_buffer->start_date ); + date_Set( &exact_start_date, p_buffer->start_date ); start_date = p_buffer->start_date; } } @@ -122,23 +194,29 @@ 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 ); - vlc_mutex_unlock( &p_aout->mixer_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; + + 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; + } p_buffer = p_fifo->p_first; if ( p_buffer == NULL ) @@ -147,14 +225,16 @@ 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 ) + while ( p_buffer != NULL && p_buffer->end_date < start_date - 1 ) { + /* We authorize a +-1 because rounding errors get compensated + * regularly. */ aout_buffer_t * p_next = p_buffer->p_next; - msg_Err( p_aout, "the mixer got a packet in the past (%lld)", - start_date - p_buffer->end_date ); + msg_Warn( p_aout, "the mixer got a packet in the past (%"PRId64")", + start_date - p_buffer->end_date ); 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 ) { @@ -162,41 +242,6 @@ static int MixBuffer( aout_instance_t * p_aout ) break; } - if ( !AOUT_FMT_NON_LINEAR( &p_aout->mixer.mixer ) ) - { - /* Additionally check that p_first_byte_to_mix is well - * located. */ - unsigned long 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 - / 1000000; - ptrdiff_t mixer_nb_bytes; - - if ( p_input->p_first_byte_to_mix == NULL ) - { - p_input->p_first_byte_to_mix = p_buffer->p_buffer; - } - mixer_nb_bytes = p_input->p_first_byte_to_mix - - p_buffer->p_buffer; - - if ( !((i_nb_bytes + p_aout->mixer.mixer.i_bytes_per_frame - > mixer_nb_bytes) && - (i_nb_bytes < p_aout->mixer.mixer.i_bytes_per_frame - + mixer_nb_bytes)) ) - { - msg_Warn( p_aout, - "mixer start isn't output start (%d)", - i_nb_bytes - 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; - p_input->p_first_byte_to_mix = p_buffer->p_buffer - + i_nb_bytes; - } - } - /* Check that we have enough samples. */ for ( ; ; ) { @@ -213,7 +258,7 @@ static int MixBuffer( aout_instance_t * p_aout ) if ( prev_date != p_buffer->start_date ) { msg_Warn( p_aout, - "buffer hole, dropping packets (%lld)", + "buffer hole, dropping packets (%"PRId64")", p_buffer->start_date - prev_date ); b_drop_buffers = 1; break; @@ -235,55 +280,94 @@ static int MixBuffer( aout_instance_t * p_aout ) else break; } if ( p_buffer == NULL ) break; + + p_buffer = p_fifo->p_first; + 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->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->mixer.begin == NULL ) + { + p_input->mixer.begin = p_buffer->p_buffer; + } + mixer_nb_bytes = p_input->mixer.begin - p_buffer->p_buffer; + + if ( !((i_nb_bytes + p_aout->p_mixer->fmt.i_bytes_per_frame + > mixer_nb_bytes) && + (i_nb_bytes < p_aout->p_mixer->fmt.i_bytes_per_frame + + mixer_nb_bytes)) ) + { + msg_Warn( p_aout, "mixer start isn't output start (%"PRId64")", + i_nb_bytes - mixer_nb_bytes ); + + /* Round to the nearest multiple */ + i_nb_bytes /= p_aout->p_mixer->fmt.i_bytes_per_frame; + i_nb_bytes *= p_aout->p_mixer->fmt.i_bytes_per_frame; + 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 ); + date_Set( &exact_start_date, 0 ); + aout_unlock_output_fifo( p_aout ); + break; + } + + p_input->mixer.begin = p_buffer->p_buffer + i_nb_bytes; + } + } } - if ( i < p_aout->i_nb_inputs ) + 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 ); - vlc_mutex_unlock( &p_aout->mixer_lock ); + aout_unlock_input_fifos( p_aout ); return -1; } /* Run the mixer. */ - aout_BufferAlloc( &p_aout->mixer.output_alloc, - ((u64)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[0]->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 ); - vlc_mutex_unlock( &p_aout->mixer_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_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_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 ); - vlc_mutex_unlock( &p_aout->mixer_lock ); - return 0; } /***************************************************************************** * aout_MixerRun: entry point for the mixer & post-filters processing + ***************************************************************************** + * Please note that you must hold the mixer lock. *****************************************************************************/ void aout_MixerRun( aout_instance_t * p_aout ) { @@ -298,21 +382,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; + float f_old = p_aout->mixer_multiplier; + bool b_new_mixer = false; - if ( p_aout->mixer.mixer.i_format != AOUT_FMT_FLOAT32 ) + if ( p_aout->p_mixer ) { - msg_Warn( p_aout, "MixerMultiplierSet called for non-float32 mixer" ); - return -1; + aout_MixerDelete( p_aout ); + b_new_mixer = true; } - aout_MixerDelete( p_aout ); + p_aout->mixer_multiplier = f_multiplier; - p_aout->mixer.f_multiplier = f_multiplier; - - if ( aout_MixerNew( p_aout ) ) + 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; } @@ -328,13 +411,7 @@ int aout_MixerMultiplierSet( aout_instance_t * p_aout, float f_multiplier ) *****************************************************************************/ int aout_MixerMultiplierGet( aout_instance_t * p_aout, float * pf_multiplier ) { - if ( p_aout->mixer.mixer.i_format != AOUT_FMT_FLOAT32 ) - { - msg_Warn( p_aout, "MixerMultiplierGet called for non-float32 mixer" ); - return -1; - } - - *pf_multiplier = p_aout->mixer.f_multiplier; + *pf_multiplier = p_aout->mixer_multiplier; return 0; }