X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_mixer%2Ffloat32.c;h=27cc1de0daab28ee01d42f6b2ae7640b5077c8e2;hb=fdcdeaa3da38b09860fa0d8e8398e27468660f19;hp=474dd520a60c7621e04241f424d3d29f7c0822b2;hpb=4b44912ce0888ed40d35aa5d782cd17cbf7e9c6b;p=vlc

diff --git a/modules/audio_mixer/float32.c b/modules/audio_mixer/float32.c
index 474dd520a6..27cc1de0da 100644
--- a/modules/audio_mixer/float32.c
+++ b/modules/audio_mixer/float32.c
@@ -33,13 +33,13 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
+#include <vlc_aout_mixer.h>
 
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-static int  Create    ( vlc_object_t * );
-
-static void DoWork    ( aout_instance_t *, aout_buffer_t * );
+static int Create( vlc_object_t * );
+static void DoWork( aout_mixer_t *, aout_buffer_t *, float );
 
 /*****************************************************************************
  * Module descriptor
@@ -52,148 +52,32 @@ vlc_module_begin ()
     set_callbacks( Create, NULL )
 vlc_module_end ()
 
-/*****************************************************************************
- * Create: allocate mixer
- *****************************************************************************/
+/**
+ * Initializes the 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_CODEC_FL32 )
-    {
+    if ( p_mixer->fmt.i_format != VLC_CODEC_FL32 )
         return -1;
-    }
-
-    /* Use the trivial mixer when we can */
-    if ( p_aout->i_nb_inputs == 1 && p_aout->mixer.f_multiplier == 1.0 )
-    {
-        int i;
-        for( i = 0; i < p_aout->i_nb_inputs; i++ )
-        {
-            if( p_aout->pp_inputs[i]->f_multiplier != 1.0 )
-                break;
-        }
-        if( i >= p_aout->i_nb_inputs )
-            return -1;
-    }
 
-    p_aout->mixer.pf_do_work = DoWork;
+    p_mixer->mix = DoWork;
     return 0;
 }
 
-/*****************************************************************************
- * ScaleWords: prepare input words for averaging
- *****************************************************************************/
-static void ScaleWords( float * p_out, const float * p_in, size_t i_nb_words,
-                        int i_nb_inputs, float f_multiplier )
-{
-    int i;
-    f_multiplier /= i_nb_inputs;
-
-    for ( i = i_nb_words; i--; )
-    {
-        *p_out++ = *p_in++ * f_multiplier;
-    }
-}
-
-/*****************************************************************************
- * MeanWords: average input words
- *****************************************************************************/
-static void MeanWords( float * p_out, const float * p_in, size_t i_nb_words,
-                       int i_nb_inputs, float f_multiplier )
-{
-    int i;
-    f_multiplier /= i_nb_inputs;
-
-    for ( i = i_nb_words; i--; )
-    {
-        *p_out++ += *p_in++ * f_multiplier;
-    }
-}
-
-/*****************************************************************************
- * DoWork: mix a new output buffer
- *****************************************************************************
- * 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 )
+/**
+ * Mixes a new output buffer
+ */
+static void DoWork( aout_mixer_t * p_mixer, aout_buffer_t *p_buffer,
+                    float f_multiplier )
 {
-    const int i_nb_inputs = p_aout->i_nb_inputs;
-    const float f_multiplier_global = p_aout->mixer.f_multiplier;
-    const int i_nb_channels = aout_FormatNbChannels( &p_aout->mixer.mixer );
-    int i_input;
-
-    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];
-        float f_multiplier = f_multiplier_global * p_input->f_multiplier;
+    f_multiplier *= p_mixer->input->multiplier;
 
-        float * p_out = (float *)p_buffer->p_buffer;
-        float * p_in = (float *)p_input->p_first_byte_to_mix;
+    if( f_multiplier == 1.0 )
+        return; /* nothing to do */
 
-        if ( p_input->b_error || p_input->b_paused )
-            continue;
-
-        for ( ; ; )
-        {
-            ptrdiff_t i_available_words = (
-                 (float *)p_input->fifo.p_first->p_buffer - p_in)
-                                   + p_input->fifo.p_first->i_nb_samples
-                                   * i_nb_channels;
-
-            if ( i_available_words < i_nb_words )
-            {
-                aout_buffer_t * p_old_buffer;
-
-                if ( i_available_words > 0 )
-                {
-                    if ( !i_input )
-                    {
-                        ScaleWords( p_out, p_in, i_available_words,
-                                    i_nb_inputs, f_multiplier );
-                    }
-                    else
-                    {
-                        MeanWords( p_out, p_in, i_available_words,
-                                   i_nb_inputs, f_multiplier );
-                    }
-                }
-
-                i_nb_words -= i_available_words;
-                p_out += i_available_words;
-
-                /* Next buffer */
-                p_old_buffer = aout_FifoPop( p_aout, &p_input->fifo );
-                aout_BufferFree( p_old_buffer );
-                if ( p_input->fifo.p_first == NULL )
-                {
-                    msg_Err( p_aout, "internal amix error" );
-                    return;
-                }
-                p_in = (float *)p_input->fifo.p_first->p_buffer;
-            }
-            else
-            {
-                if ( i_nb_words > 0 )
-                {
-                    if ( !i_input )
-                    {
-                        ScaleWords( p_out, p_in, i_nb_words, i_nb_inputs,
-                                    f_multiplier );
-                    }
-                    else
-                    {
-                        MeanWords( p_out, p_in, i_nb_words, i_nb_inputs,
-                                   f_multiplier );
-                    }
-                }
-                p_input->p_first_byte_to_mix = (void *)(p_in
-                                            + i_nb_words);
-                break;
-            }
-        }
-    }
+    float *p = (float *)p_buffer->p_buffer;
+    for( size_t i = p_buffer->i_buffer / sizeof(float); i > 0; i-- )
+        *(p++) *= f_multiplier;
 }
-