/*****************************************************************************
* float32.c : precise float32 audio mixer implementation
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: float32.c,v 1.1 2002/08/28 22:25:38 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
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <errno.h>
-#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
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- set_description( _("float32 audio mixer module") );
+ 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 trivial mixer
+ * Create: allocate mixer
*****************************************************************************/
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 )
+ if ( p_aout->mixer.mixer.i_format != VLC_FOURCC('f','l','3','2') )
{
return -1;
}
- if ( p_aout->i_nb_inputs == 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;
}
* 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 )
+ int i_nb_inputs, float f_multiplier )
{
int i;
+ f_multiplier /= i_nb_inputs;
for ( i = i_nb_words; i--; )
{
- *p_out++ = *p_in++ / i_nb_inputs;
+ *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 )
+ int i_nb_inputs, float f_multiplier )
{
int i;
+ f_multiplier /= i_nb_inputs;
for ( i = i_nb_words; i--; )
{
- *p_out++ += *p_in++ / i_nb_inputs;
+ *p_out++ += *p_in++ * f_multiplier;
}
}
*****************************************************************************/
static void DoWork( aout_instance_t * p_aout, aout_buffer_t * p_buffer )
{
- int i_nb_inputs = p_aout->i_nb_inputs;
+ 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
- * p_aout->mixer.mixer.i_channels;
+ 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;
+ if ( p_input->b_error ) 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
- * p_aout->mixer.mixer.i_channels;
+ * i_nb_channels;
if ( i_available_words < i_nb_words )
{
if ( !i_input )
{
ScaleWords( p_out, p_in, i_available_words,
- i_nb_inputs );
+ i_nb_inputs, f_multiplier );
}
else
{
MeanWords( p_out, p_in, i_available_words,
- i_nb_inputs );
+ i_nb_inputs, f_multiplier );
}
}
{
if ( !i_input )
{
- ScaleWords( p_out, p_in, i_nb_words, i_nb_inputs );
+ 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 );
+ MeanWords( p_out, p_in, i_nb_words, i_nb_inputs,
+ f_multiplier );
}
}
p_input->p_first_byte_to_mix = (void *)(p_in