X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_mixer%2Ffloat32.c;h=3df474c3b457372081db9ed6c58383d62a313e5d;hb=830905f60a7db37ab87c5043d09b50ae9ad81594;hp=c3284b63fcb93b56de64303817b526aad04a6004;hpb=2cb472dba008f7d877ffe6bae9c5575253365282;p=vlc

diff --git a/modules/audio_mixer/float32.c b/modules/audio_mixer/float32.c
index c3284b63fc..3df474c3b4 100644
--- a/modules/audio_mixer/float32.c
+++ b/modules/audio_mixer/float32.c
@@ -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
@@ -24,51 +24,52 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
 
-#include <vlc/vlc.h>
-#include "audio_output.h"
-#include "aout_internal.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stddef.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_aout.h>
 
 /*****************************************************************************
  * 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_category( CAT_AUDIO );
-    set_subcategory( SUBCAT_AUDIO_MISC );
-    set_description( _("Float32 audio mixer") );
-    set_capability( "audio mixer", 10 );
-    set_callbacks( Create, NULL );
-vlc_module_end();
+vlc_module_begin ()
+    set_category( CAT_AUDIO )
+    set_subcategory( SUBCAT_AUDIO_MISC )
+    set_description( N_("Float32 audio mixer") )
+    set_capability( "audio mixer", 10 )
+    set_callbacks( Create, NULL )
+vlc_module_end ()
 
 /*****************************************************************************
  * Create: allocate 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 != VLC_FOURCC('f','l','3','2') )
-    {
+    if ( p_mixer->fmt.i_format != VLC_CODEC_FL32 )
         return -1;
-    }
 
-    if ( p_aout->i_nb_inputs == 1 && p_aout->mixer.f_multiplier == 1.0 )
+    /* Use the trivial mixer when we can */
+    if ( p_mixer->input_count == 1 && p_mixer->multiplier == 1.0 )
     {
-        /* Tell the trivial mixer to go for it. */
-        return -1;
+        if( p_mixer->input[0]->multiplier == 1.0 )
+            return -1;
     }
 
-    p_aout->mixer.pf_do_work = DoWork;
-
+    p_mixer->mix = DoWork;
     return 0;
 }
 
@@ -108,21 +109,24 @@ static void MeanWords( float * p_out, const float * p_in, size_t i_nb_words,
  * Terminology : in this function a word designates a single float32, eg.
  * a stereo sample is consituted of two words.
  *****************************************************************************/
-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 )
 {
-    int i_nb_inputs = p_aout->i_nb_inputs;
-    float f_multiplier = p_aout->mixer.f_multiplier;
+    const int i_nb_inputs = p_mixer->input_count;
+    const float f_multiplier_global = p_mixer->multiplier;
+    const int i_nb_channels = aout_FormatNbChannels( &p_mixer->fmt );
     int i_input;
-    int i_nb_channels = aout_FormatNbChannels( &p_aout->mixer.mixer );
 
     for ( i_input = 0; i_input < i_nb_inputs; i_input++ )
     {
         int i_nb_words = p_buffer->i_nb_samples * i_nb_channels;
-        aout_input_t * p_input = p_aout->pp_inputs[i_input];
+        aout_mixer_input_t * p_input = p_mixer->input[i_input];
+        float f_multiplier = f_multiplier_global * p_input->multiplier;
+
         float * p_out = (float *)p_buffer->p_buffer;
-        float * p_in = (float *)p_input->p_first_byte_to_mix;
+        float * p_in = (float *)p_input->begin;
 
-        if ( p_input->b_error ) continue;
+        if ( p_input->is_invalid )
+            continue;
 
         for ( ; ; )
         {
@@ -153,11 +157,11 @@ static void DoWork( aout_instance_t * p_aout, aout_buffer_t * p_buffer )
                 p_out += i_available_words;
 
                 /* 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 = (float *)p_input->fifo.p_first->p_buffer;
@@ -177,8 +181,7 @@ static void DoWork( aout_instance_t * p_aout, aout_buffer_t * p_buffer )
                                    f_multiplier );
                     }
                 }
-                p_input->p_first_byte_to_mix = (void *)(p_in
-                                            + i_nb_words);
+                p_input->begin = (void *)(p_in + i_nb_words);
                 break;
             }
         }