*****************************************************************************/
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
*****************************************************************************/
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;
- }
+ if( p_mixer->multiplier == 1.0 && p_mixer->input->multiplier == 1.0 )
+ 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 )
+ float f_multiplier )
{
- int i;
- f_multiplier /= i_nb_inputs;
-
- for ( i = i_nb_words; i--; )
- {
+ for( size_t 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;
- }
}
/*****************************************************************************
* 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 )
{
- 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;
+ const float f_multiplier_global = p_mixer->multiplier;
+ const int i_nb_channels = aout_FormatNbChannels( &p_mixer->fmt );
- 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;
+ int i_nb_words = p_buffer->i_nb_samples * i_nb_channels;
+ aout_mixer_input_t * p_input = p_mixer->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_out = (float *)p_buffer->p_buffer;
+ float * p_in = (float *)p_input->begin;
- 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;
- for ( ; ; )
+ if( i_available_words < i_nb_words )
{
- 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;
+ aout_buffer_t * p_old_buffer;
- 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_available_words > 0 )
+ ScaleWords( p_out, p_in, i_available_words, f_multiplier );
+
+ i_nb_words -= i_available_words;
+ p_out += i_available_words;
+
+ /* Next buffer */
+ p_old_buffer = aout_FifoPop( NULL, &p_input->fifo );
+ aout_BufferFree( p_old_buffer );
+ if( p_input->fifo.p_first == NULL )
{
- 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;
+ msg_Err( p_mixer, "internal amix error" );
+ return;
}
+ p_in = (float *)p_input->fifo.p_first->p_buffer;
+ }
+ else
+ {
+ if( i_nb_words > 0 )
+ ScaleWords( p_out, p_in, i_nb_words, f_multiplier );
+ p_input->begin = (void *)(p_in + i_nb_words);
+ break;
}
}
}
projects / vlc / blobdiff