X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Fmixer.c;h=ee2de270a080fdbc41b4a62a7e32b94578b85177;hb=593aeb2b2a5d78c502cc3aa1c27d9c65559e6efd;hp=13c7824c292eb3a2e48a0d9686e9f68c90c21dfa;hpb=d532cf3cad2ff8594510e8720b7c02ddc4c40311;p=vlc diff --git a/src/audio_output/mixer.c b/src/audio_output/mixer.c index 13c7824c29..ee2de270a0 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.19 2002/11/08 10:26:53 gbazin 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,7 +18,7 @@ * * 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. *****************************************************************************/ /***************************************************************************** @@ -30,12 +30,10 @@ #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,10 +41,10 @@ *****************************************************************************/ 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" ); + msg_Err( p_aout, "no suitable audio mixer" ); return -1; } p_aout->mixer.b_error = 0; @@ -58,13 +56,11 @@ int aout_MixerNew( aout_instance_t * p_aout ) ***************************************************************************** * Please note that you must hold the mixer lock. *****************************************************************************/ -int aout_MixerDelete( aout_instance_t * p_aout ) +void aout_MixerDelete( aout_instance_t * p_aout ) { - if ( p_aout->mixer.b_error ) return 0; + if ( p_aout->mixer.b_error ) return; module_Unneed( p_aout, p_aout->mixer.p_module ); p_aout->mixer.b_error = 1; - - return 0; } /***************************************************************************** @@ -118,7 +114,7 @@ static int MixBuffer( aout_instance_t * p_aout ) 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 ); @@ -140,8 +136,15 @@ static int MixBuffer( aout_instance_t * p_aout ) { msg_Warn( p_aout, "input PTS is out of range ("I64Fd"), " "trashing", mdate() - p_buffer->start_date ); - aout_BufferFree( aout_FifoPop( p_aout, p_fifo ) ); + p_buffer = aout_FifoPop( p_aout, p_fifo ); + aout_BufferFree( p_buffer ); + if( p_input->p_input_thread ) + { +// stats_UpdateInteger( p_input->p_input_thread, +// "lost_abuffers", 1 ); + } p_buffer = p_fifo->p_first; + p_input->p_first_byte_to_mix = NULL; } if ( p_buffer == NULL ) @@ -189,12 +192,19 @@ 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 ("I64Fd")", - 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 ); + if( p_input->p_input_thread ) + { +// stats_UpdateInteger( p_input->p_input_thread, +// "lost_abuffers", 1 ); + } p_fifo->p_first = p_buffer = p_next; p_input->p_first_byte_to_mix = NULL; } @@ -204,41 +214,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 ( ; ; ) { @@ -277,6 +252,47 @@ 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 ) + { + /* Is it really the best way to do it ? */ + aout_FifoSet( p_aout, &p_aout->output.fifo, 0 ); + aout_DateSet( &exact_start_date, 0 ); + break; + } + + p_input->p_first_byte_to_mix = p_buffer->p_buffer + i_nb_bytes; + } + } } if ( i < p_aout->i_nb_inputs || i_first_input == p_aout->i_nb_inputs ) @@ -288,7 +304,7 @@ static int MixBuffer( aout_instance_t * p_aout ) /* 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 : */