X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_filter%2Fnormvol.c;h=6a9dc2700bb1c0023a563a834b6c0380d7b3ffa6;hb=1ce4f166a9653d8ee369862ee3111cce91af815d;hp=e447c0625d772c3f1e26b1cd73b2b57290f63a55;hpb=85b29bdc288a1573d43bd524908be5748a9b3640;p=vlc diff --git a/modules/audio_filter/normvol.c b/modules/audio_filter/normvol.c index e447c0625d..6a9dc2700b 100644 --- a/modules/audio_filter/normvol.c +++ b/modules/audio_filter/normvol.c @@ -1,10 +1,10 @@ /***************************************************************************** - * normvol.c : volume normalizer + * normvol.c: volume normalizer ***************************************************************************** - * Copyright (C) 2001 VideoLAN (Centrale Réseaux) and its contributors + * Copyright (C) 2001, 2006 the VideoLAN team * $Id$ * - * Authors: Clément Stenac + * Authors: Clément Stenac * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ * * 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. *****************************************************************************/ /* @@ -31,21 +31,18 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include -#include /* ENOMEM */ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include +#include +#include -#include -#include - -#include +#include +#include /***************************************************************************** * Local prototypes @@ -53,15 +50,14 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -static void DoWork ( aout_instance_t * , aout_filter_t *, - aout_buffer_t * , aout_buffer_t *); +static block_t *DoWork( filter_t *, block_t * ); -typedef struct aout_filter_sys_t +struct filter_sys_t { int i_nb; float *p_last; float f_max; -} aout_filter_sys_t; +}; /***************************************************************************** * Module descriptor @@ -69,75 +65,82 @@ typedef struct aout_filter_sys_t #define BUFF_TEXT N_("Number of audio buffers" ) #define BUFF_LONGTEXT N_("This is the number of audio buffers on which the " \ "power measurement is made. A higher number of buffers will " \ - "increase the response time of the filter to a high " \ - "power but will make it less sensitive to short variations." ) + "increase the response time of the filter to a spike " \ + "but will make it less sensitive to short variations." ) -#define LEVEL_TEXT N_("Max level" ) +#define LEVEL_TEXT N_("Maximal volume level" ) #define LEVEL_LONGTEXT N_("If the average power over the last N buffers " \ "is higher than this value, the volume will be normalized. " \ "This value is a positive floating point number. A value " \ "between 0.5 and 10 seems sensible." ) -vlc_module_begin(); - set_description( _("Volume normalizer") ); - set_shortname( N_("Volume normalizer") ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AFILTER ); - add_shortcut( "volnorm" ); +vlc_module_begin () + set_description( N_("Volume normalizer") ) + set_shortname( N_("Volume normalizer") ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AFILTER ) + add_shortcut( "volnorm" ) add_integer( "norm-buff-size", 20 ,NULL ,BUFF_TEXT, BUFF_LONGTEXT, - VLC_TRUE); + true ) add_float( "norm-max-level", 2.0, NULL, LEVEL_TEXT, - LEVEL_LONGTEXT, VLC_TRUE ); - set_capability( "audio filter", 0 ); - set_callbacks( Open, Close ); -vlc_module_end(); + LEVEL_LONGTEXT, true ) + set_capability( "audio filter", 0 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Open: initialize and create stuff *****************************************************************************/ static int Open( vlc_object_t *p_this ) { - aout_filter_t *p_filter = (aout_filter_t*)p_this; - int i_channels; - aout_filter_sys_t *p_sys = p_filter->p_sys = - malloc( sizeof( aout_filter_sys_t ) ); + filter_t *p_filter = (filter_t*)p_this; + unsigned i_channels; + filter_sys_t *p_sys; - if( p_filter->input.i_format != VLC_FOURCC('f','l','3','2' ) || - p_filter->output.i_format != VLC_FOURCC('f','l','3','2') ) + if( p_filter->fmt_in.audio.i_format != VLC_CODEC_FL32 || + p_filter->fmt_out.audio.i_format != VLC_CODEC_FL32 ) { - msg_Warn( p_filter, "Bad input or output format" ); - return VLC_EGENERIC; + p_filter->fmt_in.audio.i_format = VLC_CODEC_FL32; + p_filter->fmt_out.audio.i_format = VLC_CODEC_FL32; + msg_Warn( p_filter, "bad input or output format" ); + return VLC_EGENERIC; } - if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) ) + if ( !AOUT_FMTS_SIMILAR( &p_filter->fmt_in.audio, &p_filter->fmt_out.audio ) ) { + memcpy( &p_filter->fmt_out.audio, &p_filter->fmt_in.audio, + sizeof(audio_sample_format_t) ); msg_Warn( p_filter, "input and output formats are not similar" ); return VLC_EGENERIC; } - p_filter->pf_do_work = DoWork; - p_filter->b_in_place = VLC_TRUE; + p_filter->pf_audio_filter = DoWork; - i_channels = aout_FormatNbChannels( &p_filter->input ); + i_channels = aout_FormatNbChannels( &p_filter->fmt_in.audio ); + p_sys = p_filter->p_sys = malloc( sizeof( *p_sys ) ); + if( !p_sys ) + return VLC_ENOMEM; p_sys->i_nb = var_CreateGetInteger( p_filter->p_parent, "norm-buff-size" ); p_sys->f_max = var_CreateGetFloat( p_filter->p_parent, "norm-max-level" ); if( p_sys->f_max <= 0 ) p_sys->f_max = 0.01; /* We need to store (nb_buffers+1)*nb_channels floats */ - p_sys->p_last = malloc( sizeof( float ) * (i_channels) * - (p_filter->p_sys->i_nb + 2) ); - memset( p_sys->p_last, 0 ,sizeof( float ) * (i_channels) * - (p_filter->p_sys->i_nb + 2) ); + p_sys->p_last = calloc( i_channels * (p_filter->p_sys->i_nb + 2), sizeof(float) ); + if( !p_sys->p_last ) + { + free( p_sys ); + return VLC_ENOMEM; + } + return VLC_SUCCESS; } /***************************************************************************** * DoWork : normalizes and sends a buffer *****************************************************************************/ - static void DoWork( aout_instance_t *p_aout, aout_filter_t *p_filter, - aout_buffer_t *p_in_buf, aout_buffer_t *p_out_buf ) +static block_t *DoWork( filter_t *p_filter, block_t *p_in_buf ) { float *pf_sum; float *pf_gain; @@ -145,19 +148,22 @@ static int Open( vlc_object_t *p_this ) int i, i_chan; int i_samples = p_in_buf->i_nb_samples; - int i_channels = aout_FormatNbChannels( &p_filter->input ); - float *p_out = (float*)p_out_buf->p_buffer; + int i_channels = aout_FormatNbChannels( &p_filter->fmt_in.audio ); + float *p_out = (float*)p_in_buf->p_buffer; float *p_in = (float*)p_in_buf->p_buffer; - struct aout_filter_sys_t *p_sys = p_filter->p_sys; + struct filter_sys_t *p_sys = p_filter->p_sys; - pf_sum = (float *)malloc( sizeof(float) * i_channels ); - memset( pf_sum, 0, sizeof(float) * i_channels ); + pf_sum = calloc( i_channels, sizeof(float) ); + if( !pf_sum ) + goto out; - pf_gain = (float *)malloc( sizeof(float) * i_channels ); - - p_out_buf->i_nb_samples = p_in_buf->i_nb_samples; - p_out_buf->i_nb_bytes = p_in_buf->i_nb_bytes; + pf_gain = malloc( sizeof(float) * i_channels ); + if( !pf_gain ) + { + free( pf_sum ); + goto out; + } /* Calculate the average power level on this buffer */ for( i = 0 ; i < i_samples; i++ ) @@ -171,7 +177,7 @@ static int Open( vlc_object_t *p_this ) p_in += i_channels; } - /* sum now contains for each channel the sigma(value²) */ + /* sum now contains for each channel the sigma(value²) */ for( i_chan = 0; i_chan < i_channels; i_chan++ ) { /* Shift our lastbuff */ @@ -179,7 +185,7 @@ static int Open( vlc_object_t *p_this ) &p_sys->p_last[i_chan * p_sys->i_nb + 1], (p_sys->i_nb-1) * sizeof( float ) ); - /* Insert the new average : sqrt(sigma(value²)) */ + /* Insert the new average : sqrt(sigma(value²)) */ p_sys->p_last[ i_chan * p_sys->i_nb + p_sys->i_nb - 1] = sqrt( pf_sum[i_chan] ); @@ -194,7 +200,7 @@ static int Open( vlc_object_t *p_this ) f_average = f_average / p_sys->i_nb; /* Seuil arbitraire */ - p_sys->f_max = var_GetFloat( p_aout, "norm-max-level" ); + p_sys->f_max = var_GetFloat( p_filter->p_parent, "norm-max-level" ); //fprintf(stderr,"Average %f, max %f\n", f_average, p_sys->f_max ); if( f_average > p_sys->f_max ) @@ -220,7 +226,10 @@ static int Open( vlc_object_t *p_this ) free( pf_sum ); free( pf_gain ); - return; + return p_in_buf; +out: + block_Release( p_in_buf ); + return NULL; } /********************************************************************** @@ -228,12 +237,9 @@ static int Open( vlc_object_t *p_this ) **********************************************************************/ static void Close( vlc_object_t *p_this ) { - aout_filter_t *p_filter = (aout_filter_t*)p_this; - aout_filter_sys_t *p_sys = p_filter->p_sys; + filter_t *p_filter = (filter_t*)p_this; + filter_sys_t *p_sys = p_filter->p_sys; - if( p_sys ) - { - if( p_sys->p_last) free( p_sys->p_last ); - free( p_sys ); - } + free( p_sys->p_last ); + free( p_sys ); }