X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_mixer%2Ftrivial.c;h=de911673422325b6164f582bff361c5ebab86572;hb=58e3521ce030f64ec1026f66e4a08f658fcd4b49;hp=73d86b5134f37d2398d831a587fda39c17fec4af;hpb=1c13a9874579b0640d294389a5f888b81a8926fc;p=vlc diff --git a/modules/audio_mixer/trivial.c b/modules/audio_mixer/trivial.c index 73d86b5134..de91167342 100644 --- a/modules/audio_mixer/trivial.c +++ b/modules/audio_mixer/trivial.c @@ -1,8 +1,8 @@ /***************************************************************************** * trivial.c : trivial mixer plug-in (1 input, no downmixing) ***************************************************************************** - * Copyright (C) 2002 VideoLAN - * $Id: trivial.c,v 1.6 2002/08/21 22:41:59 massiot Exp $ + * Copyright (C) 2002 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,50 +18,54 @@ * * 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 -#include /* malloc(), free() */ -#include -#include -#include "audio_output.h" -#include "aout_internal.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include /***************************************************************************** * Local prototypes *****************************************************************************/ static int Create ( vlc_object_t * ); -static void DoWork ( aout_instance_t *, aout_buffer_t * ); +static void DoWork ( aout_mixer_t *, aout_buffer_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( _("trivial audio mixer module") ); - set_capability( "audio mixer", 1 ); - set_callbacks( Create, NULL ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_MISC ) + set_description( N_("Trivial audio mixer") ) + set_capability( "audio mixer", 1 ) + set_callbacks( Create, NULL ) +vlc_module_end () /***************************************************************************** * Create: allocate trivial mixer *****************************************************************************/ static int Create( vlc_object_t *p_this ) { - aout_instance_t * p_aout = (aout_instance_t *)p_this; + aout_mixer_t *p_mixer = (aout_mixer_t *)p_this; - if ( p_aout->mixer.mixer.i_format != AOUT_FMT_FLOAT32 - && p_aout->mixer.mixer.i_format != AOUT_FMT_FIXED32 ) + if ( p_mixer->fmt.i_format != VLC_CODEC_FL32 + && p_mixer->fmt.i_format != VLC_CODEC_FI32 ) { return -1; } - p_aout->mixer.pf_do_work = DoWork; + p_mixer->mix = DoWork; return 0; } @@ -69,48 +73,78 @@ static int Create( vlc_object_t *p_this ) /***************************************************************************** * DoWork: mix a new output buffer *****************************************************************************/ -static void DoWork( aout_instance_t * p_aout, aout_buffer_t * p_buffer ) +static void DoWork( aout_mixer_t *p_mixer, aout_buffer_t * p_buffer ) { - aout_input_t * p_input = p_aout->pp_inputs[0]; - int i_nb_bytes = p_buffer->i_nb_samples * sizeof(s32) - * p_aout->mixer.mixer.i_channels; - byte_t * p_in = p_input->p_first_byte_to_mix; - byte_t * p_out = p_buffer->p_buffer; + unsigned i = 0; + aout_mixer_input_t * p_input = p_mixer->input[i]; + int i_nb_channels = aout_FormatNbChannels( &p_mixer->fmt ); + int i_buffer = p_buffer->i_nb_samples * sizeof(int32_t) + * i_nb_channels; + uint8_t * p_in; + uint8_t * p_out; + + while ( p_input->is_invalid ) + { + p_input = p_mixer->input[++i]; + /* This can't crash because if no input has b_error == 0, the + * audio mixer cannot run and we can't be here. */ + } + p_in = p_input->begin; + p_out = p_buffer->p_buffer; for ( ; ; ) { ptrdiff_t i_available_bytes = (p_input->fifo.p_first->p_buffer - p_in) + p_input->fifo.p_first->i_nb_samples - * sizeof(s32) - * p_aout->mixer.mixer.i_channels; + * sizeof(int32_t) + * i_nb_channels; - if ( i_available_bytes < i_nb_bytes ) + if ( i_available_bytes < i_buffer ) { aout_buffer_t * p_old_buffer; - if ( i_available_bytes > 0 ) - p_aout->p_vlc->pf_memcpy( p_out, p_in, i_available_bytes ); - i_nb_bytes -= i_available_bytes; + vlc_memcpy( p_out, p_in, i_available_bytes ); + i_buffer -= i_available_bytes; p_out += i_available_bytes; /* Next buffer */ - p_old_buffer = aout_FifoPop( p_aout, &p_input->fifo ); + p_old_buffer = aout_FifoPop( NULL, &p_input->fifo ); aout_BufferFree( p_old_buffer ); if ( p_input->fifo.p_first == NULL ) { - msg_Err( p_aout, "internal amix error" ); + msg_Err( p_mixer, "internal amix error" ); return; } p_in = p_input->fifo.p_first->p_buffer; } else { - if ( i_nb_bytes > 0 ) - p_aout->p_vlc->pf_memcpy( p_out, p_in, i_nb_bytes ); - p_input->p_first_byte_to_mix = p_in + i_nb_bytes; + vlc_memcpy( p_out, p_in, i_buffer ); + p_input->begin = p_in + i_buffer; break; } } + + /* Empty other FIFOs to avoid a memory leak. */ + for ( i++; i < p_mixer->input_count; i++ ) + { + aout_fifo_t * p_fifo; + aout_buffer_t * p_deleted; + + p_input = p_mixer->input[i]; + if ( p_input->is_invalid ) + continue; + p_fifo = &p_input->fifo; + p_deleted = p_fifo->p_first; + while ( p_deleted != NULL ) + { + aout_buffer_t * p_next = p_deleted->p_next; + aout_BufferFree( p_deleted ); + p_deleted = p_next; + } + p_fifo->p_first = NULL; + p_fifo->pp_last = &p_fifo->p_first; + } }