/*****************************************************************************
* trivial.c : trivial mixer plug-in (1 input, no downmixing)
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: trivial.c,v 1.7 2002/09/20 23:27:03 massiot Exp $
+ * Copyright (C) 2002 the VideoLAN team
+ * $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* 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
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <errno.h>
#include <stdlib.h> /* malloc(), free() */
#include <string.h>
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- set_description( _("trivial audio mixer module") );
+ set_category( CAT_AUDIO );
+ set_subcategory( SUBCAT_AUDIO_MISC );
+ set_description( _("Trivial audio mixer") );
set_capability( "audio mixer", 1 );
set_callbacks( Create, NULL );
vlc_module_end();
{
aout_instance_t * p_aout = (aout_instance_t *)p_this;
- if ( p_aout->mixer.mixer.i_format != AOUT_FMT_FLOAT32
- && p_aout->mixer.mixer.i_format != AOUT_FMT_FIXED32 )
+ if ( p_aout->mixer.mixer.i_format != VLC_FOURCC('f','l','3','2')
+ && p_aout->mixer.mixer.i_format != VLC_FOURCC('f','i','3','2') )
{
return -1;
}
*****************************************************************************/
static void DoWork( aout_instance_t * p_aout, 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;
-
- if ( p_input->b_error ) return;
+ int i = 0;
+ aout_input_t * p_input = p_aout->pp_inputs[i];
+ int i_nb_channels = aout_FormatNbChannels( &p_aout->mixer.mixer );
+ int i_nb_bytes = p_buffer->i_nb_samples * sizeof(int32_t)
+ * i_nb_channels;
+ byte_t * p_in;
+ byte_t * p_out;
+
+ while ( p_input->b_error )
+ {
+ p_input = p_aout->pp_inputs[++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->p_first_byte_to_mix;
+ 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 )
{
break;
}
}
+
+ /* Empty other FIFOs to avoid a memory leak. */
+ for ( i++; i < p_aout->i_nb_inputs; i++ )
+ {
+ aout_fifo_t * p_fifo;
+ aout_buffer_t * p_deleted;
+
+ p_input = p_aout->pp_inputs[i];
+ if ( p_input->b_error ) 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;
+ }
}