X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Fmixer.c;h=972f12e44b0dd196d54bc14ca802aa9380133a23;hb=9b52a805d106bf9fa8dc9de4d628cecf84c51410;hp=928cd5457e097ecd3f922b538e1e1f58ccdb7213;hpb=81442b6bf1af46dbaedc3388ea0b48f55bf13ae1;p=vlc diff --git a/src/audio_output/mixer.c b/src/audio_output/mixer.c index 928cd5457e..972f12e44b 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 VideoLAN + * $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 @@ -30,7 +30,7 @@ #include #ifdef HAVE_ALLOCA_H -# include +# include #endif #include "audio_output.h" @@ -43,12 +43,13 @@ *****************************************************************************/ int aout_MixerNew( aout_instance_t * p_aout ) { - p_aout->mixer.p_module = module_Need( p_aout, "audio mixer", NULL ); + 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 aout mixer" ); return -1; } + p_aout->mixer.b_error = 0; return 0; } @@ -59,20 +60,44 @@ 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; } /***************************************************************************** * 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; - vlc_mutex_lock( &p_aout->mixer_lock ); + if ( p_aout->mixer.b_error ) + { + /* Free all incoming buffers. */ + vlc_mutex_lock( &p_aout->input_fifos_lock ); + 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; + 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; + } + } + vlc_mutex_unlock( &p_aout->input_fifos_lock ); + return -1; + } + + vlc_mutex_lock( &p_aout->output_fifo_lock ); vlc_mutex_lock( &p_aout->input_fifos_lock ); @@ -86,12 +111,12 @@ 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 (%lld), clearing out", + msg_Warn( p_aout, "output PTS is out of range ("I64Fd"), 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 ); @@ -106,7 +131,19 @@ static int MixBuffer( aout_instance_t * p_aout ) aout_fifo_t * p_fifo = &p_input->fifo; aout_buffer_t * p_buffer; + if ( p_input->b_error ) 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 ("I64Fd"), " + "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->p_first_byte_to_mix = NULL; + } + if ( p_buffer == NULL ) { break; @@ -123,7 +160,6 @@ static int MixBuffer( aout_instance_t * p_aout ) { /* Interrupted before the end... We can't run. */ vlc_mutex_unlock( &p_aout->input_fifos_lock ); - vlc_mutex_unlock( &p_aout->mixer_lock ); return -1; } } @@ -140,6 +176,12 @@ static int MixBuffer( aout_instance_t * p_aout ) mtime_t prev_date; vlc_bool_t b_drop_buffers; + if ( p_input->b_error ) + { + if ( i_first_input == i ) i_first_input++; + continue; + } + p_buffer = p_fifo->p_first; if ( p_buffer == NULL ) { @@ -147,11 +189,13 @@ 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 ("I64Fd")", + 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; @@ -162,41 +206,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 +222,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 ("I64Fd")", p_buffer->start_date - prev_date ); b_drop_buffers = 1; break; @@ -235,29 +244,63 @@ 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->mixer.mixer ) ) + { + /* 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 + / 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 ("I64Fd")", + 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; + + if( i_nb_bytes < 0 ) break; /* FIXME: reset state properly */ + + p_input->p_first_byte_to_mix = 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 ); return -1; } /* Run the mixer. */ aout_BufferAlloc( &p_aout->mixer.output_alloc, - ((u64)p_aout->output.i_nb_samples * 1000000) + ((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[0]->fifo.p_first, + p_aout->pp_inputs[i_first_input]->fifo.p_first, p_output_buffer ); 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 ); return -1; } /* This is again a bit kludgy - for the S/PDIF mixer. */ @@ -277,13 +320,13 @@ static int MixBuffer( aout_instance_t * 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 ) { @@ -299,18 +342,17 @@ 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; - if ( p_aout->mixer.mixer.i_format != AOUT_FMT_FLOAT32 ) + if ( !p_aout->mixer.b_error ) { - msg_Warn( p_aout, "MixerMultiplierSet called for non-float32 mixer" ); - return -1; + aout_MixerDelete( p_aout ); + b_new_mixer = 1; } - aout_MixerDelete( p_aout ); - 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; aout_MixerNew( p_aout ); @@ -328,12 +370,6 @@ 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; return 0; }