* 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 <stdlib.h> /* malloc(), free() */
-#include <string.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stddef.h>
#include <vlc/vlc.h>
#include <vlc_aout.h>
return -1;
}
+ /* Use the trivial mixer when we can */
if ( p_aout->i_nb_inputs == 1 && p_aout->mixer.f_multiplier == 1.0 )
{
- /* Tell the trivial mixer to go for it. */
- return -1;
+ 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;
-
return 0;
}
*****************************************************************************/
static void DoWork( aout_instance_t * p_aout, 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_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;
- 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];
+ float f_multiplier = f_multiplier_global * p_input->f_multiplier;
+
float * p_out = (float *)p_buffer->p_buffer;
float * p_in = (float *)p_input->p_first_byte_to_mix;