/*****************************************************************************
* equalizer.c:
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004, 2006 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* 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 <stdlib.h> /* malloc(), free() */
#include <math.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
-#include <vlc/aout.h>
-#include "aout_internal.h"
+#include "vlc_aout.h"
#include "equalizer_presets.h"
/* TODO:
static void Close( vlc_object_t * );
#define PRESET_TEXT N_( "Equalizer preset" )
-#define PRESET_LONGTEXT PRESET_TEXT
+#define PRESET_LONGTEXT N_("Preset to use for the equalizer." )
#define BANDS_TEXT N_( "Bands gain")
-#define BANDS_LONGTEXT N_( "Override preset bands gain in dB (-20 ... 20)" )
+#define BANDS_LONGTEXT N_( \
+ "Don't use presets, but manually specified bands. You need to " \
+ "provide 10 values between -20dB and 20dB, separated by spaces, " \
+ "e.g. \"0 2 4 2 0 -2 -4 -2 0\"." )
#define TWOPASS_TEXT N_( "Two pass" )
-#define TWOPASS_LONGTEXT N_( "Filter twice the audio" )
+#define TWOPASS_LONGTEXT N_( "Filter the audio twice. This provides a more " \
+ "intense effect.")
#define PREAMP_TEXT N_("Global gain" )
-#define PREAMP_LONGTEXT N_("Set the global gain in dB (-20 ... 20)" )
+#define PREAMP_LONGTEXT N_("Set the global gain in dB (-20 ... 20)." )
vlc_module_begin();
- set_description( _("Equalizer 10 bands") );
- set_shortname( N_("Equalizer" ) );
+ set_description( _("Equalizer with 10 bands") );
+ set_shortname( _("Equalizer" ) );
set_capability( "audio filter", 0 );
set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_AFILTER );
add_string( "equalizer-preset", "flat", NULL, PRESET_TEXT,
- PRESET_LONGTEXT, VLC_TRUE );
+ PRESET_LONGTEXT, VLC_FALSE );
change_string_list( preset_list, preset_list_text, 0 );
add_string( "equalizer-bands", NULL, NULL, BANDS_TEXT,
BANDS_LONGTEXT, VLC_TRUE );
#define EQZ_IN_FACTOR (0.25)
static int EqzInit( aout_filter_t *, int );
-static void EqzFilter( aout_instance_t *,aout_filter_t *, float *, float *,
+static void EqzFilter( aout_filter_t *, float *, float *,
int, int );
static void EqzClean( aout_filter_t * );
{
aout_filter_t *p_filter = (aout_filter_t *)p_this;
aout_filter_sys_t *p_sys;
+ vlc_bool_t b_fit = VLC_TRUE;
if( p_filter->input.i_format != VLC_FOURCC('f','l','3','2' ) ||
p_filter->output.i_format != VLC_FOURCC('f','l','3','2') )
{
- msg_Warn( p_filter, "Bad input or output format" );
- return VLC_EGENERIC;
+ b_fit = VLC_FALSE;
+ p_filter->input.i_format = VLC_FOURCC('f','l','3','2');
+ p_filter->output.i_format = VLC_FOURCC('f','l','3','2');
+ msg_Warn( p_filter, "bad input or output format" );
}
if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
{
+ b_fit = VLC_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;
}
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 )
{
+ VLC_UNUSED(p_aout);
p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
p_out_buf->i_nb_bytes = p_in_buf->i_nb_bytes;
- EqzFilter( p_aout, p_filter, (float*)p_out_buf->p_buffer,
+ EqzFilter( p_filter, (float*)p_out_buf->p_buffer,
(float*)p_in_buf->p_buffer, p_in_buf->i_nb_samples,
aout_FormatNbChannels( &p_filter->input ) );
}
else
{
/* TODO compute the coeffs on the fly */
- msg_Err( p_filter, "unsupported rate" );
+ msg_Err( p_filter, "rate not supported" );
return VLC_EGENERIC;
}
strstr( p_sys->psz_newbands, val2.psz_string ) ) || !*val2.psz_string )
{
var_SetString( p_aout, "equalizer-bands", p_sys->psz_newbands );
- var_SetFloat( p_aout, "equalizer-preamp", p_sys->f_newpreamp );
+ if( p_sys->f_newpreamp == p_sys->f_gamp )
+ var_SetFloat( p_aout, "equalizer-preamp", p_sys->f_newpreamp );
}
/* Add our own callbacks */
return VLC_SUCCESS;
}
-static void EqzFilter( aout_instance_t *p_aout,
- aout_filter_t *p_filter, float *out, float *in,
+static void EqzFilter( aout_filter_t *p_filter, float *out, float *in,
int i_samples, int i_channels )
{
aout_filter_sys_t *p_sys = p_filter->p_sys;
static int PresetCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
aout_filter_sys_t *p_sys = (aout_filter_sys_t *)p_data;
aout_instance_t *p_aout = (aout_instance_t *)p_this;
p_sys->f_gamp *= pow( 10, eqz_preset_10b[i]->f_preamp / 20.0 );
for( j = 0; j < p_sys->i_band; j++ )
{
+ lldiv_t div;
p_sys->f_amp[j] = EqzConvertdB(
eqz_preset_10b[i]->f_amp[j] );
- sprintf( psz_newbands, "%s %f", psz_newbands,
- eqz_preset_10b[i]->f_amp[j] );
+ div = lldiv( eqz_preset_10b[i]->f_amp[j] * 10000000,
+ 10000000 );
+ sprintf( psz_newbands, "%s "I64Fd".%07u", psz_newbands,
+ (int64_t)div.quot, (unsigned int) div.rem );
}
if( p_sys->b_first == VLC_FALSE )
{
static int PreampCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
aout_filter_sys_t *p_sys = (aout_filter_sys_t *)p_data;
if( newval.f_float < -20.0 )
static int BandsCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
aout_filter_sys_t *p_sys = (aout_filter_sys_t *)p_data;
char *psz_bands = newval.psz_string;
projects / vlc / blobdiff