* Fixed filters which couldn't work with more than 2 channels ;

[vlc] / modules / audio_mixer / trivial.c

diff --git a/modules/audio_mixer/trivial.c b/modules/audio_mixer/trivial.c
index e681848a06eca4b80ab83d484404360b81d180c4..809620cd68de2939193fd10b06556993358e707c 100644 (file)
--- a/modules/audio_mixer/trivial.c
+++ b/modules/audio_mixer/trivial.c
@@ -2,7 +2,7 @@
  * trivial.c : trivial mixer plug-in (1 input, no downmixing)
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: trivial.c,v 1.5 2002/08/19 21:31:11 massiot Exp $
+ * $Id: trivial.c,v 1.10 2002/10/15 23:10:54 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -43,9 +43,8 @@ static void DoWork    ( aout_instance_t *, aout_buffer_t * );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("trivial aout mixer module") );
+    set_description( _("trivial audio mixer module") );
     set_capability( "audio mixer", 1 );
-    add_shortcut( "trivial" );
     set_callbacks( Create, NULL );
 vlc_module_end();
 
@@ -56,8 +55,8 @@ static int Create( vlc_object_t *p_this )
 {
     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;
     }
@@ -67,45 +66,35 @@ static int Create( vlc_object_t *p_this )
     return 0;
 }
 
-#if 0
-/*****************************************************************************
- * SparseCopy: trivially downmix or upmix a buffer
- *****************************************************************************/
-static void SparseCopy( u32 * p_dest, const u32 * p_src, size_t i_len,
-                        int i_output_stride, int i_input_stride )
-{
-    int i;
-    for ( i = 0; i < i_len; i++ )
-    {
-        int j;
-        for ( j = 0; j < i_output_stride; j++ )
-        {
-            p_dest[j] = p_src[j];
-        }
-        p_src += i_input_stride;
-        p_dest += i_output_stride;
-    }
-}
-#endif
-
 /*****************************************************************************
  * DoWork: mix a new output buffer
  *****************************************************************************/
 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(u32)
-                      * 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;
+    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(s32)
+                      * 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(u32)
-                                           * p_aout->mixer.mixer.i_channels;
+                                           * sizeof(s32)
+                                           * i_nb_channels;
 
         if ( i_available_bytes < i_nb_bytes )
         {
@@ -134,5 +123,25 @@ static void DoWork( aout_instance_t * p_aout, aout_buffer_t * p_buffer )
             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;
+    }
 }