X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_mixer%2Ffloat32.c;h=f148b33bb45f23f1583d250f5eed4236e4890682;hb=047f654a1762593923f48527d5a8e96daab95929;hp=d649795da9d16572cfa4f3ea3013994362250f8d;hpb=cf891bad55157104f8d9d50b1d95b25ebc7f7a5e;p=vlc diff --git a/modules/audio_mixer/float32.c b/modules/audio_mixer/float32.c index d649795da9..f148b33bb4 100644 --- a/modules/audio_mixer/float32.c +++ b/modules/audio_mixer/float32.c @@ -1,8 +1,8 @@ /***************************************************************************** * float32.c : precise float32 audio mixer implementation ***************************************************************************** - * Copyright (C) 2002 VideoLAN - * $Id: float32.c,v 1.2 2002/09/16 20:46:37 massiot Exp $ + * Copyright (C) 2002 the VideoLAN team + * $Id$ * * Authors: Christophe Massiot * @@ -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 @@ -18,166 +18,66 @@ * * 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 -#include /* malloc(), free() */ -#include -#include -#include "audio_output.h" -#include "aout_internal.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include /***************************************************************************** * 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( audio_mixer_t *, aout_buffer_t *, float ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( _("float32 audio mixer module") ); - set_capability( "audio mixer", 10 ); - set_callbacks( Create, NULL ); -vlc_module_end(); - -/***************************************************************************** - * Create: allocate trivial mixer - *****************************************************************************/ +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 () + +/** + * Initializes the 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 ) - { - return -1; - } + audio_mixer_t *p_mixer = (audio_mixer_t *)p_this; - if ( p_aout->i_nb_inputs == 1 && p_aout->mixer.f_multiplier == 1.0 ) - { - /* Tell the trivial mixer to go for it. */ + if (p_mixer->format != VLC_CODEC_FL32) 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 ) +/** + * Mixes a new output buffer + */ +static void DoWork( audio_mixer_t * p_mixer, aout_buffer_t *p_buffer, + float f_multiplier ) { - int i; - f_multiplier /= i_nb_inputs; + if( f_multiplier == 1.0 ) + return; /* nothing to do */ - for ( i = i_nb_words; i--; ) - { - *p_out++ = *p_in++ * f_multiplier; - } -} + float *p = (float *)p_buffer->p_buffer; + for( size_t i = p_buffer->i_buffer / sizeof(float); i > 0; i-- ) + *(p++) *= 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 ) -{ - int i_nb_inputs = p_aout->i_nb_inputs; - 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; - aout_input_t * p_input = p_aout->pp_inputs[i_input]; - float * p_out = (float *)p_buffer->p_buffer; - float * p_in = (float *)p_input->p_first_byte_to_mix; - - 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; - - 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, p_aout->mixer.f_multiplier ); - } - else - { - MeanWords( p_out, p_in, i_available_words, - i_nb_inputs, p_aout->mixer.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, - p_aout->mixer.f_multiplier ); - } - else - { - MeanWords( p_out, p_in, i_nb_words, i_nb_inputs, - p_aout->mixer.f_multiplier ); - } - } - p_input->p_first_byte_to_mix = (void *)(p_in - + i_nb_words); - break; - } - } - } + (void) p_mixer; } -