X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_mixer%2Ftrivial.c;h=7fb0ea8ae5a4a8ec053503841983afe91ab47546;hb=29d7063d5bb689e87161c3fb634e5af857768044;hp=441f1f6c51f25dff9b1bc350dd9325dd218de0b7;hpb=123b3214ec0802b2c8d1ce6c693dd3b79e1ada31;p=vlc diff --git a/modules/audio_mixer/trivial.c b/modules/audio_mixer/trivial.c index 441f1f6c51..7fb0ea8ae5 100644 --- a/modules/audio_mixer/trivial.c +++ b/modules/audio_mixer/trivial.c @@ -1,8 +1,8 @@ /***************************************************************************** * trivial.c : trivial mixer plug-in (1 input, no downmixing) ***************************************************************************** - * Copyright (C) 2002 VideoLAN - * $Id: trivial.c,v 1.1 2002/08/07 21:36:55 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,189 +18,54 @@ * * 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 /***************************************************************************** * 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 DoNothing( aout_mixer_t *, aout_buffer_t *p_buffer, float ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( _("trivial aout mixer module") ); - set_capability( "audio mixer", 1 ); - add_shortcut( "trivial" ); - set_callbacks( Create, NULL ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_MISC ) + set_description( N_("Dummy audio mixer") ) + set_capability( "audio mixer", 1 ) + set_callbacks( Create, NULL ) +vlc_module_end () /***************************************************************************** * Create: allocate trivial mixer - ***************************************************************************** - * This function allocates and initializes a Crop vout method. *****************************************************************************/ static int Create( vlc_object_t *p_this ) { - aout_instance_t * p_aout = (aout_instance_t *)p_this; - - if ( p_aout->mixer.output.i_format != AOUT_FMT_FLOAT32 - && p_aout->mixer.output.i_format != AOUT_FMT_FIXED32 ) - { - return -1; - } - - p_aout->mixer.pf_do_work = DoWork; + aout_mixer_t *p_mixer = (aout_mixer_t *)p_this; + p_mixer->mix = DoNothing; return 0; } -/***************************************************************************** - * SparseCopy: trivially downmix or upmix a buffer - *****************************************************************************/ -static void SparseCopy( u32 * p_dest, const u32 * p_src, size_t i_len, - int i_output_stride, int i_input_stride ) +static void DoNothing( aout_mixer_t *p_mixer, aout_buffer_t *p_buffer, + float multiplier ) { - int i; - for ( i = 0; i < i_len; i++ ) - { - int j; - for ( j = 0; j < i_output_stride; j++ ) - { - p_dest[j] = p_src[j]; - } - p_src += i_input_stride; - p_dest += i_output_stride; - } + (void) p_mixer; + (void) p_buffer; + (void) multiplier; } - -/***************************************************************************** - * DoWork: mix a new output buffer - *****************************************************************************/ -static void DoWork( aout_instance_t * p_aout, aout_buffer_t * p_buffer ) -{ - aout_input_t * p_input = p_aout->pp_inputs[0]; - - if ( p_input->input.i_channels == p_aout->mixer.output.i_channels ) - { - int i_nb_bytes = p_buffer->i_nb_samples * sizeof(u32) - * p_input->input.i_channels; - char * p_in = (p_input->p_first_byte_to_mix == NULL) ? - p_input->fifo.p_first->p_buffer : - p_input->p_first_byte_to_mix; - char * p_out = p_buffer->p_buffer; - - for ( ; ; ) - { - ptrdiff_t i_available_bytes = (p_input->fifo.p_first->p_buffer - - p_in) - + p_input->fifo.p_first->i_nb_samples - * sizeof(u32) - * p_input->input.i_channels; - - if ( i_available_bytes < i_nb_bytes ) - { - aout_buffer_t * p_old_buffer; - - if ( i_available_bytes > 0 ) - p_aout->p_vlc->pf_memcpy( p_out, p_in, i_available_bytes ); - i_nb_bytes -= i_available_bytes; - p_out += i_available_bytes; - - /* 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 = p_input->fifo.p_first->p_buffer; - } - else - { - p_aout->p_vlc->pf_memcpy( p_out, p_in, i_nb_bytes ); - p_input->p_first_byte_to_mix = p_in + i_nb_bytes; - break; - } - } - } - else - { - /* Downmixing or upmixing. */ - int i_nb_samples = p_buffer->i_nb_samples; - u32 * p_in = (p_input->p_first_byte_to_mix == NULL) ? - (u32 *)p_input->fifo.p_first->p_buffer : - (u32 *)p_input->p_first_byte_to_mix; - u32 * p_out = (u32 *)p_buffer->p_buffer; - - - if ( p_input->input.i_channels < p_aout->mixer.output.i_channels ) - { - /* Zero out the destination buffer, to avoid static on unavailable - * channels. */ - memset( p_buffer->p_buffer, 0, - p_buffer->i_nb_samples * sizeof(u32) - * p_aout->mixer.output.i_channels ); - } - - for ( ; ; ) - { - ptrdiff_t i_available_bytes = (p_input->fifo.p_first->p_buffer - - (char *)p_in) - + p_input->fifo.p_first->i_nb_samples - * sizeof(u32) - * p_input->input.i_channels; - int i_available_samples = i_available_bytes - / p_input->input.i_channels - / sizeof(u32); - - if ( i_available_samples < i_nb_samples ) - { - aout_buffer_t * p_old_buffer; - - if ( i_available_samples > 0 ) - SparseCopy( p_out, p_in, i_available_samples, - p_aout->mixer.output.i_channels, - p_input->input.i_channels ); - i_nb_samples -= i_available_samples; - p_out += i_available_samples * p_aout->mixer.output.i_channels; - - /* 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 = (u32 *)p_input->fifo.p_first->p_buffer; - } - else - { - SparseCopy( p_out, p_in, i_nb_samples, - p_aout->mixer.output.i_channels, - p_input->input.i_channels ); - p_input->p_first_byte_to_mix = (char *)p_in - + i_nb_samples * p_input->input.i_channels - * sizeof(u32); - break; - } - } - } -} -