/*****************************************************************************
* normvol.c: volume normalizer
*****************************************************************************
- * Copyright (C) 2001, 2006 the VideoLAN team
+ * Copyright (C) 2001, 2006 VLC authors and VideoLAN
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
*
- * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*
# include "config.h"
#endif
-#include <errno.h> /* ENOMEM */
-#include <ctype.h>
-#include <signal.h>
-
#include <math.h>
-
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_aout.h>
+#include <vlc_filter.h>
/*****************************************************************************
* Local prototypes
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 * );
-struct aout_filter_sys_t
+struct filter_sys_t
{
int i_nb;
float *p_last;
"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 " \
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_AFILTER )
add_shortcut( "volnorm" )
- add_integer( "norm-buff-size", 20 ,NULL ,BUFF_TEXT, BUFF_LONGTEXT,
+ add_integer( "norm-buff-size", 20 ,BUFF_TEXT, BUFF_LONGTEXT,
true )
- add_float( "norm-max-level", 2.0, NULL, LEVEL_TEXT,
+ add_float( "norm-max-level", 2.0, LEVEL_TEXT,
LEVEL_LONGTEXT, true )
set_capability( "audio filter", 0 )
set_callbacks( Open, Close )
*****************************************************************************/
static int Open( vlc_object_t *p_this )
{
- aout_filter_t *p_filter = (aout_filter_t*)p_this;
- bool b_fit = true;
- int i_channels;
- aout_filter_sys_t *p_sys;
+ filter_t *p_filter = (filter_t*)p_this;
+ unsigned i_channels;
+ filter_sys_t *p_sys;
- if( p_filter->input.i_format != VLC_CODEC_FL32 ||
- p_filter->output.i_format != VLC_CODEC_FL32 )
- {
- b_fit = false;
- p_filter->input.i_format = VLC_CODEC_FL32;
- p_filter->output.i_format = VLC_CODEC_FL32;
- msg_Warn( p_filter, "bad input or output format" );
- }
+ i_channels = aout_FormatNbChannels( &p_filter->fmt_in.audio );
- if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
- {
- b_fit = false;
- memcpy( &p_filter->output, &p_filter->input,
- sizeof(audio_sample_format_t) );
- msg_Warn( p_filter, "input and output formats are not similar" );
- }
-
- if ( ! b_fit )
- {
- return VLC_EGENERIC;
- }
-
- p_filter->pf_do_work = DoWork;
- p_filter->b_in_place = true;
-
- i_channels = aout_FormatNbChannels( &p_filter->input );
-
- p_sys = p_filter->p_sys = malloc( sizeof( aout_filter_sys_t ) );
+ 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" );
return VLC_ENOMEM;
}
+ p_filter->fmt_in.audio.i_format = VLC_CODEC_FL32;
+ p_filter->fmt_out.audio = p_filter->fmt_in.audio;
+ p_filter->pf_audio_filter = DoWork;
+
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;
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 = calloc( i_channels, sizeof(float) );
if( !pf_sum )
- return;
+ goto out;
pf_gain = malloc( sizeof(float) * i_channels );
if( !pf_gain )
{
free( pf_sum );
- return;
+ goto out;
}
- p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
- p_out_buf->i_nb_bytes = p_in_buf->i_nb_bytes;
-
/* Calculate the average power level on this buffer */
for( i = 0 ; i < i_samples; i++ )
{
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 )
free( pf_sum );
free( pf_gain );
- return;
+ return p_in_buf;
+out:
+ block_Release( p_in_buf );
+ return NULL;
}
/**********************************************************************
**********************************************************************/
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 )
- {
- free( p_sys->p_last );
- free( p_sys );
- }
+ free( p_sys->p_last );
+ free( p_sys );
}