2004-07-06 23:41:15 +02:00
|
|
|
/*****************************************************************************
|
|
|
|
* equalizer.c:
|
|
|
|
*****************************************************************************
|
|
|
|
* Copyright (C) 2004 VideoLAN
|
2004-07-07 17:51:23 +02:00
|
|
|
* $Id$
|
2004-07-06 23:41:15 +02:00
|
|
|
*
|
|
|
|
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
|
|
|
|
*
|
|
|
|
* 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
|
|
|
|
* (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.
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*****************************************************************************/
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
* Preamble
|
|
|
|
*****************************************************************************/
|
|
|
|
#include <stdlib.h> /* malloc(), free() */
|
|
|
|
#include <math.h>
|
|
|
|
|
|
|
|
#include <vlc/vlc.h>
|
|
|
|
|
|
|
|
#include <vlc/aout.h>
|
|
|
|
#include "aout_internal.h"
|
|
|
|
|
2004-08-15 01:28:31 +02:00
|
|
|
#include "equalizer_presets.h"
|
2004-07-06 23:41:15 +02:00
|
|
|
/* TODO:
|
|
|
|
* - add tables for other rates ( 22500, 11250, ...)
|
|
|
|
* - optimize a bit (you can hardly do slower ;)
|
|
|
|
* - add tables for more bands (15 and 32 would be cool), maybe with auto coeffs
|
|
|
|
* computation (not too hard once the Q is found).
|
|
|
|
* - support for external preset
|
|
|
|
* - callback to handle preset changes on the fly
|
|
|
|
* - ...
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
* Module descriptor
|
|
|
|
*****************************************************************************/
|
|
|
|
static int Open ( vlc_object_t * );
|
|
|
|
static void Close( vlc_object_t * );
|
|
|
|
|
|
|
|
#define PRESET_TEXT N_( "Equalizer preset" )
|
|
|
|
#define PRESET_LONGTEXT PRESET_TEXT
|
|
|
|
|
|
|
|
#define BANDS_TEXT N_( "Bands gain")
|
|
|
|
#define BANDS_LONGTEXT N_( "Override preset bands gain in dB (-20 ... 20)" )
|
|
|
|
|
|
|
|
#define TWOPASS_TEXT N_( "Two pass" )
|
|
|
|
#define TWOPASS_LONGTEXT N_( "Filter twice the audio" )
|
|
|
|
|
|
|
|
#define PREAMP_TEXT N_("Global gain" )
|
|
|
|
#define PREAMP_LONGTEXT N_("Set the global gain in dB (-20 ... 20)" )
|
|
|
|
|
|
|
|
vlc_module_begin();
|
|
|
|
set_description( _("Equalizer 10 bands") );
|
2004-12-16 17:35:12 +01:00
|
|
|
set_shortname( N_("Equalizer" ) );
|
2004-07-06 23:41:15 +02:00
|
|
|
set_capability( "audio filter", 0 );
|
2004-12-11 15:45:46 +01:00
|
|
|
set_category( CAT_AUDIO );
|
|
|
|
set_subcategory( SUBCAT_AUDIO_AFILTER );
|
|
|
|
|
2004-07-07 17:51:23 +02:00
|
|
|
add_string( "equalizer-preset", "flat", NULL, PRESET_TEXT,
|
2005-03-10 14:05:43 +01:00
|
|
|
PRESET_LONGTEXT, VLC_FALSE );
|
2004-07-06 23:41:15 +02:00
|
|
|
change_string_list( preset_list, preset_list_text, 0 );
|
2004-07-07 17:51:23 +02:00
|
|
|
add_string( "equalizer-bands", NULL, NULL, BANDS_TEXT,
|
|
|
|
BANDS_LONGTEXT, VLC_TRUE );
|
|
|
|
add_bool( "equalizer-2pass", 0, NULL, TWOPASS_TEXT,
|
|
|
|
TWOPASS_LONGTEXT, VLC_TRUE );
|
2004-11-04 14:37:17 +01:00
|
|
|
add_float( "equalizer-preamp", 12.0, NULL, PREAMP_TEXT,
|
2004-07-07 17:51:23 +02:00
|
|
|
PREAMP_LONGTEXT, VLC_TRUE );
|
2004-07-06 23:41:15 +02:00
|
|
|
set_callbacks( Open, Close );
|
|
|
|
add_shortcut( "equalizer" );
|
|
|
|
vlc_module_end();
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
* Local prototypes
|
|
|
|
*****************************************************************************/
|
|
|
|
typedef struct aout_filter_sys_t
|
|
|
|
{
|
|
|
|
/* Filter static config */
|
|
|
|
int i_band;
|
|
|
|
float *f_alpha;
|
|
|
|
float *f_beta;
|
|
|
|
float *f_gamma;
|
|
|
|
|
2004-07-12 08:45:07 +02:00
|
|
|
float f_newpreamp;
|
|
|
|
char *psz_newbands;
|
|
|
|
vlc_bool_t b_first;
|
|
|
|
|
2004-07-06 23:41:15 +02:00
|
|
|
/* Filter dyn config */
|
|
|
|
float *f_amp; /* Per band amp */
|
|
|
|
float f_gamp; /* Global preamp */
|
|
|
|
vlc_bool_t b_2eqz;
|
|
|
|
|
|
|
|
/* Filter state */
|
|
|
|
float x[32][2];
|
|
|
|
float y[32][128][2];
|
|
|
|
|
|
|
|
/* Second filter state */
|
|
|
|
float x2[32][2];
|
|
|
|
float y2[32][128][2];
|
|
|
|
|
|
|
|
} aout_filter_sys_t;
|
|
|
|
|
|
|
|
static void DoWork( aout_instance_t *, aout_filter_t *,
|
|
|
|
aout_buffer_t *, aout_buffer_t * );
|
|
|
|
|
|
|
|
#define EQZ_IN_FACTOR (0.25)
|
2004-07-07 17:51:23 +02:00
|
|
|
static int EqzInit( aout_filter_t *, int );
|
2004-07-12 08:45:07 +02:00
|
|
|
static void EqzFilter( aout_instance_t *,aout_filter_t *, float *, float *,
|
|
|
|
int, int );
|
2004-07-06 23:41:15 +02:00
|
|
|
static void EqzClean( aout_filter_t * );
|
|
|
|
|
2004-07-12 08:45:07 +02:00
|
|
|
static int PresetCallback( vlc_object_t *, char const *,
|
|
|
|
vlc_value_t, vlc_value_t, void * );
|
|
|
|
static int PreampCallback( vlc_object_t *, char const *,
|
|
|
|
vlc_value_t, vlc_value_t, void * );
|
|
|
|
static int BandsCallback ( vlc_object_t *, char const *,
|
|
|
|
vlc_value_t, vlc_value_t, void * );
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-07-06 23:41:15 +02:00
|
|
|
/*****************************************************************************
|
|
|
|
* Open:
|
|
|
|
*****************************************************************************/
|
|
|
|
static int Open( vlc_object_t *p_this )
|
|
|
|
{
|
|
|
|
aout_filter_t *p_filter = (aout_filter_t *)p_this;
|
|
|
|
aout_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') )
|
|
|
|
{
|
|
|
|
msg_Warn( p_filter, "Bad input or output format" );
|
|
|
|
return VLC_EGENERIC;
|
|
|
|
}
|
|
|
|
if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
|
|
|
|
{
|
|
|
|
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;
|
|
|
|
|
|
|
|
/* Allocate structure */
|
|
|
|
p_sys = p_filter->p_sys = malloc( sizeof( aout_filter_sys_t ) );
|
|
|
|
|
|
|
|
if( EqzInit( p_filter, p_filter->input.i_rate ) )
|
|
|
|
return VLC_EGENERIC;
|
|
|
|
|
|
|
|
return VLC_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
* Close: close the plugin
|
|
|
|
*****************************************************************************/
|
|
|
|
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;
|
|
|
|
|
|
|
|
EqzClean( p_filter );
|
|
|
|
free( p_sys );
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
* DoWork: process samples 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 )
|
|
|
|
{
|
|
|
|
p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
|
|
|
|
p_out_buf->i_nb_bytes = p_in_buf->i_nb_bytes;
|
|
|
|
|
2004-07-12 08:45:07 +02:00
|
|
|
EqzFilter( p_aout, p_filter, (float*)p_out_buf->p_buffer,
|
2004-07-07 17:51:23 +02:00
|
|
|
(float*)p_in_buf->p_buffer, p_in_buf->i_nb_samples,
|
|
|
|
aout_FormatNbChannels( &p_filter->input ) );
|
2004-07-06 23:41:15 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
* Equalizer stuff
|
|
|
|
*****************************************************************************/
|
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
int i_band;
|
|
|
|
|
|
|
|
struct
|
|
|
|
{
|
|
|
|
float f_frequency;
|
|
|
|
float f_alpha;
|
|
|
|
float f_beta;
|
|
|
|
float f_gamma;
|
2004-07-24 13:12:39 +02:00
|
|
|
} band[EQZ_BANDS_MAX];
|
2004-07-07 17:51:23 +02:00
|
|
|
|
2004-07-06 23:41:15 +02:00
|
|
|
} eqz_config_t;
|
|
|
|
|
|
|
|
/* Value from equ-xmms */
|
|
|
|
static const eqz_config_t eqz_config_44100_10b =
|
|
|
|
{
|
|
|
|
10,
|
|
|
|
{
|
|
|
|
{ 60, 0.003013, 0.993973, 1.993901 },
|
|
|
|
{ 170, 0.008490, 0.983019, 1.982437 },
|
|
|
|
{ 310, 0.015374, 0.969252, 1.967331 },
|
|
|
|
{ 600, 0.029328, 0.941343, 1.934254 },
|
|
|
|
{ 1000, 0.047918, 0.904163, 1.884869 },
|
|
|
|
{ 3000, 0.130408, 0.739184, 1.582718 },
|
|
|
|
{ 6000, 0.226555, 0.546889, 1.015267 },
|
|
|
|
{ 12000, 0.344937, 0.310127, -0.181410 },
|
|
|
|
{ 14000, 0.366438, 0.267123, -0.521151 },
|
|
|
|
{ 16000, 0.379009, 0.241981, -0.808451 },
|
|
|
|
}
|
|
|
|
};
|
|
|
|
static const eqz_config_t eqz_config_48000_10b =
|
|
|
|
{
|
|
|
|
10,
|
|
|
|
{
|
|
|
|
{ 60, 0.002769, 0.994462, 1.994400 },
|
|
|
|
{ 170, 0.007806, 0.984388, 1.983897 },
|
|
|
|
{ 310, 0.014143, 0.971714, 1.970091 },
|
|
|
|
{ 600, 0.027011, 0.945978, 1.939979 },
|
|
|
|
{ 1000, 0.044203, 0.911595, 1.895241 },
|
|
|
|
{ 3000, 0.121223, 0.757553, 1.623767 },
|
|
|
|
{ 6000, 0.212888, 0.574224, 1.113145 },
|
|
|
|
{ 12000, 0.331347, 0.337307, 0.000000 },
|
|
|
|
{ 14000, 0.355263, 0.289473, -0.333740 },
|
|
|
|
{ 16000, 0.371900, 0.256201, -0.628100 }
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
static inline float EqzConvertdB( float db )
|
|
|
|
{
|
|
|
|
/* Map it to gain,
|
|
|
|
* (we do as if the input of iir is /EQZ_IN_FACTOR, but in fact it's the non iir data that is *EQZ_IN_FACTOR)
|
|
|
|
* db = 20*log( out / in ) with out = in + amp*iir(i/EQZ_IN_FACTOR)
|
|
|
|
* or iir(i) == i for the center freq so
|
|
|
|
* db = 20*log( 1 + amp/EQZ_IN_FACTOR )
|
|
|
|
* -> amp = EQZ_IN_FACTOR*(10^(db/20) - 1)
|
|
|
|
**/
|
|
|
|
|
|
|
|
if( db < -20.0 )
|
|
|
|
db = -20.0;
|
|
|
|
else if( db > 20.0 )
|
|
|
|
db = 20.0;
|
|
|
|
return EQZ_IN_FACTOR * ( pow( 10, db / 20.0 ) - 1.0 );
|
|
|
|
}
|
|
|
|
|
|
|
|
static int EqzInit( aout_filter_t *p_filter, int i_rate )
|
|
|
|
{
|
|
|
|
aout_filter_sys_t *p_sys = p_filter->p_sys;
|
|
|
|
const eqz_config_t *p_cfg;
|
|
|
|
int i, ch;
|
2004-07-12 08:45:07 +02:00
|
|
|
vlc_value_t val1, val2, val3;
|
|
|
|
aout_instance_t *p_aout = (aout_instance_t *)p_filter->p_parent;
|
2004-07-06 23:41:15 +02:00
|
|
|
|
|
|
|
/* Select the config */
|
|
|
|
if( i_rate == 48000 )
|
|
|
|
{
|
|
|
|
p_cfg = &eqz_config_48000_10b;
|
|
|
|
}
|
|
|
|
else if( i_rate == 44100 )
|
|
|
|
{
|
|
|
|
p_cfg = &eqz_config_44100_10b;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* TODO compute the coeffs on the fly */
|
|
|
|
msg_Err( p_filter, "unsupported rate" );
|
|
|
|
return VLC_EGENERIC;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Create the static filter config */
|
|
|
|
p_sys->i_band = p_cfg->i_band;
|
|
|
|
p_sys->f_alpha = malloc( p_sys->i_band * sizeof(float) );
|
|
|
|
p_sys->f_beta = malloc( p_sys->i_band * sizeof(float) );
|
|
|
|
p_sys->f_gamma = malloc( p_sys->i_band * sizeof(float) );
|
|
|
|
for( i = 0; i < p_sys->i_band; i++ )
|
|
|
|
{
|
|
|
|
p_sys->f_alpha[i] = p_cfg->band[i].f_alpha;
|
|
|
|
p_sys->f_beta[i] = p_cfg->band[i].f_beta;
|
|
|
|
p_sys->f_gamma[i] = p_cfg->band[i].f_gamma;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Filter dyn config */
|
|
|
|
p_sys->b_2eqz = VLC_FALSE;
|
|
|
|
p_sys->f_gamp = 1.0;
|
|
|
|
p_sys->f_amp = malloc( p_sys->i_band * sizeof(float) );
|
|
|
|
for( i = 0; i < p_sys->i_band; i++ )
|
|
|
|
{
|
|
|
|
p_sys->f_amp[i] = 0.0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Filter state */
|
|
|
|
for( ch = 0; ch < 32; ch++ )
|
|
|
|
{
|
|
|
|
p_sys->x[ch][0] =
|
|
|
|
p_sys->x[ch][1] =
|
|
|
|
p_sys->x2[ch][0] =
|
|
|
|
p_sys->x2[ch][1] = 0.0;
|
|
|
|
|
|
|
|
for( i = 0; i < p_sys->i_band; i++ )
|
|
|
|
{
|
|
|
|
p_sys->y[ch][i][0] =
|
|
|
|
p_sys->y[ch][i][1] =
|
|
|
|
p_sys->y2[ch][i][0] =
|
|
|
|
p_sys->y2[ch][i][1] = 0.0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-07-12 08:45:07 +02:00
|
|
|
var_CreateGetString( p_aout,"equalizer-bands" );
|
|
|
|
var_CreateGetString( p_aout, "equalizer-preset" );
|
2004-07-06 23:41:15 +02:00
|
|
|
|
2004-07-12 08:45:07 +02:00
|
|
|
p_sys->b_2eqz = var_CreateGetBool( p_aout, "equalizer-2pass" );
|
2004-07-06 23:41:15 +02:00
|
|
|
|
2004-07-12 08:45:07 +02:00
|
|
|
var_CreateGetFloat( p_aout, "equalizer-preamp" );
|
2004-07-06 23:41:15 +02:00
|
|
|
|
2004-07-12 08:45:07 +02:00
|
|
|
/* Get initial values */
|
|
|
|
var_Get( p_aout, "equalizer-preset", &val1 );
|
|
|
|
var_Get( p_aout, "equalizer-bands", &val2 );
|
|
|
|
var_Get( p_aout, "equalizer-preamp", &val3 );
|
2004-07-06 23:41:15 +02:00
|
|
|
|
2004-07-12 08:45:07 +02:00
|
|
|
p_sys->b_first = VLC_TRUE;
|
|
|
|
PresetCallback( VLC_OBJECT( p_aout ), NULL, val1, val1, p_sys );
|
|
|
|
BandsCallback( VLC_OBJECT( p_aout ), NULL, val2, val2, p_sys );
|
|
|
|
PreampCallback( VLC_OBJECT( p_aout ), NULL, val3, val3, p_sys );
|
|
|
|
p_sys->b_first = VLC_FALSE;
|
|
|
|
|
|
|
|
/* Register preset bands (for intf) if : */
|
|
|
|
/* We have no bands info --> the preset info must be given to the intf */
|
|
|
|
/* or The bands info matches the preset */
|
2004-08-07 17:37:53 +02:00
|
|
|
if (p_sys->psz_newbands == NULL)
|
|
|
|
{
|
|
|
|
msg_Err(p_filter, "No preset selected");
|
|
|
|
return (VLC_EGENERIC);
|
|
|
|
}
|
2004-07-12 08:45:07 +02:00
|
|
|
if( ( *(val2.psz_string) &&
|
|
|
|
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 );
|
2004-07-06 23:41:15 +02:00
|
|
|
}
|
2004-07-12 08:45:07 +02:00
|
|
|
|
|
|
|
/* Add our own callbacks */
|
|
|
|
var_AddCallback( p_aout, "equalizer-preset", PresetCallback, p_sys );
|
|
|
|
var_AddCallback( p_aout, "equalizer-bands", BandsCallback, p_sys );
|
|
|
|
var_AddCallback( p_aout, "equalizer-preamp", PreampCallback, p_sys );
|
2004-07-06 23:41:15 +02:00
|
|
|
|
|
|
|
msg_Dbg( p_filter, "equalizer loaded for %d Hz with %d bands %d pass",
|
2004-07-12 08:45:07 +02:00
|
|
|
i_rate, p_sys->i_band, p_sys->b_2eqz ? 2 : 1 );
|
2004-07-06 23:41:15 +02:00
|
|
|
for( i = 0; i < p_sys->i_band; i++ )
|
|
|
|
{
|
|
|
|
msg_Dbg( p_filter, " %d Hz -> factor:%f alpha:%f beta:%f gamma:%f",
|
|
|
|
(int)p_cfg->band[i].f_frequency, p_sys->f_amp[i],
|
|
|
|
p_sys->f_alpha[i], p_sys->f_beta[i], p_sys->f_gamma[i]);
|
|
|
|
}
|
|
|
|
return VLC_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2004-07-12 08:45:07 +02:00
|
|
|
static void EqzFilter( aout_instance_t *p_aout,
|
|
|
|
aout_filter_t *p_filter, float *out, float *in,
|
2004-07-07 17:51:23 +02:00
|
|
|
int i_samples, int i_channels )
|
2004-07-06 23:41:15 +02:00
|
|
|
{
|
|
|
|
aout_filter_sys_t *p_sys = p_filter->p_sys;
|
|
|
|
int i, ch, j;
|
|
|
|
|
|
|
|
for( i = 0; i < i_samples; i++ )
|
|
|
|
{
|
|
|
|
for( ch = 0; ch < i_channels; ch++ )
|
|
|
|
{
|
|
|
|
const float x = in[ch];
|
|
|
|
float o = 0.0;
|
|
|
|
|
|
|
|
for( j = 0; j < p_sys->i_band; j++ )
|
|
|
|
{
|
|
|
|
float y = p_sys->f_alpha[j] * ( x - p_sys->x[ch][1] ) +
|
|
|
|
p_sys->f_gamma[j] * p_sys->y[ch][j][0] -
|
|
|
|
p_sys->f_beta[j] * p_sys->y[ch][j][1];
|
|
|
|
|
|
|
|
p_sys->y[ch][j][1] = p_sys->y[ch][j][0];
|
|
|
|
p_sys->y[ch][j][0] = y;
|
|
|
|
|
|
|
|
o += y * p_sys->f_amp[j];
|
|
|
|
}
|
|
|
|
p_sys->x[ch][1] = p_sys->x[ch][0];
|
|
|
|
p_sys->x[ch][0] = x;
|
|
|
|
|
|
|
|
/* Second filter */
|
|
|
|
if( p_sys->b_2eqz )
|
|
|
|
{
|
|
|
|
const float x2 = EQZ_IN_FACTOR * x + o;
|
|
|
|
o = 0.0;
|
|
|
|
for( j = 0; j < p_sys->i_band; j++ )
|
|
|
|
{
|
|
|
|
float y = p_sys->f_alpha[j] * ( x2 - p_sys->x2[ch][1] ) +
|
|
|
|
p_sys->f_gamma[j] * p_sys->y2[ch][j][0] -
|
|
|
|
p_sys->f_beta[j] * p_sys->y2[ch][j][1];
|
|
|
|
|
|
|
|
p_sys->y2[ch][j][1] = p_sys->y2[ch][j][0];
|
|
|
|
p_sys->y2[ch][j][0] = y;
|
|
|
|
|
|
|
|
o += y * p_sys->f_amp[j];
|
|
|
|
}
|
|
|
|
p_sys->x2[ch][1] = p_sys->x2[ch][0];
|
|
|
|
p_sys->x2[ch][0] = x2;
|
|
|
|
|
|
|
|
/* We add source PCM + filtered PCM */
|
|
|
|
out[ch] = p_sys->f_gamp *( EQZ_IN_FACTOR * x2 + o );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* We add source PCM + filtered PCM */
|
|
|
|
out[ch] = p_sys->f_gamp *( EQZ_IN_FACTOR * x + o );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
in += i_channels;
|
|
|
|
out += i_channels;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void EqzClean( aout_filter_t *p_filter )
|
|
|
|
{
|
|
|
|
aout_filter_sys_t *p_sys = p_filter->p_sys;
|
|
|
|
|
2004-07-12 08:45:07 +02:00
|
|
|
var_DelCallback( (aout_instance_t *)p_filter->p_parent,
|
|
|
|
"equalizer-bands", BandsCallback, p_sys );
|
|
|
|
var_DelCallback( (aout_instance_t *)p_filter->p_parent,
|
|
|
|
"equalizer-preset", PresetCallback, p_sys );
|
|
|
|
var_DelCallback( (aout_instance_t *)p_filter->p_parent,
|
|
|
|
"equalizer-preamp", PreampCallback, p_sys );
|
|
|
|
|
2004-07-06 23:41:15 +02:00
|
|
|
free( p_sys->f_alpha );
|
|
|
|
free( p_sys->f_beta );
|
|
|
|
free( p_sys->f_gamma );
|
|
|
|
|
|
|
|
free( p_sys->f_amp );
|
2004-07-12 08:45:07 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int PresetCallback( vlc_object_t *p_this, char const *psz_cmd,
|
2004-07-15 14:41:38 +02:00
|
|
|
vlc_value_t oldval, vlc_value_t newval, void *p_data )
|
2004-07-12 08:45:07 +02:00
|
|
|
{
|
|
|
|
aout_filter_sys_t *p_sys = (aout_filter_sys_t *)p_data;
|
|
|
|
aout_instance_t *p_aout = (aout_instance_t *)p_this;
|
|
|
|
|
|
|
|
char *psz_preset = newval.psz_string;
|
|
|
|
char psz_newbands[120];
|
|
|
|
|
|
|
|
memset( psz_newbands, 0, 120 );
|
|
|
|
|
|
|
|
if( *psz_preset && p_sys->i_band == 10 )
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
/* */
|
|
|
|
for( i = 0; eqz_preset_10b[i] != NULL; i++ )
|
|
|
|
{
|
|
|
|
if( !strcasecmp( eqz_preset_10b[i]->psz_name, psz_preset ) )
|
|
|
|
{
|
|
|
|
int j;
|
|
|
|
p_sys->f_gamp *= pow( 10, eqz_preset_10b[i]->f_preamp / 20.0 );
|
|
|
|
for( j = 0; j < p_sys->i_band; j++ )
|
|
|
|
{
|
|
|
|
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] );
|
|
|
|
}
|
|
|
|
if( p_sys->b_first == VLC_FALSE )
|
|
|
|
{
|
|
|
|
var_SetString( p_aout, "equalizer-bands", psz_newbands );
|
|
|
|
var_SetFloat( p_aout, "equalizer-preamp",
|
|
|
|
eqz_preset_10b[i]->f_preamp );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
p_sys->psz_newbands = strdup( psz_newbands );
|
|
|
|
p_sys->f_newpreamp = eqz_preset_10b[i]->f_preamp;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if( eqz_preset_10b[i] == NULL )
|
|
|
|
{
|
|
|
|
msg_Err( p_aout, "equalizer preset '%s' not found", psz_preset );
|
|
|
|
msg_Dbg( p_aout, "full list:" );
|
|
|
|
for( i = 0; eqz_preset_10b[i] != NULL; i++ )
|
|
|
|
msg_Dbg( p_aout, " - '%s'", eqz_preset_10b[i]->psz_name );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return VLC_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int PreampCallback( vlc_object_t *p_this, char const *psz_cmd,
|
2004-07-15 14:41:38 +02:00
|
|
|
vlc_value_t oldval, vlc_value_t newval, void *p_data )
|
2004-07-12 08:45:07 +02:00
|
|
|
{
|
|
|
|
aout_filter_sys_t *p_sys = (aout_filter_sys_t *)p_data;
|
|
|
|
|
|
|
|
if( newval.f_float < -20.0 )
|
|
|
|
newval.f_float = -20.0;
|
|
|
|
else if( newval.f_float > 20.0 )
|
|
|
|
newval.f_float = 20.0;
|
|
|
|
p_sys->f_gamp = pow( 10, newval.f_float /20.0);
|
|
|
|
|
|
|
|
return VLC_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int BandsCallback( vlc_object_t *p_this, char const *psz_cmd,
|
2004-07-15 14:41:38 +02:00
|
|
|
vlc_value_t oldval, vlc_value_t newval, void *p_data )
|
2004-07-12 08:45:07 +02:00
|
|
|
{
|
|
|
|
aout_filter_sys_t *p_sys = (aout_filter_sys_t *)p_data;
|
|
|
|
char *psz_bands = newval.psz_string;
|
|
|
|
|
|
|
|
/* Same thing for bands */
|
|
|
|
if( *psz_bands )
|
|
|
|
{
|
2004-07-16 20:35:50 +02:00
|
|
|
char *p = psz_bands, *p_next;
|
2004-07-12 08:45:07 +02:00
|
|
|
int i;
|
2004-07-15 14:41:38 +02:00
|
|
|
|
2004-07-12 08:45:07 +02:00
|
|
|
for( i = 0; i < p_sys->i_band; i++ )
|
|
|
|
{
|
2004-07-15 14:41:38 +02:00
|
|
|
/* Read dB -20/20 */
|
2004-07-17 13:51:46 +02:00
|
|
|
#ifdef HAVE_STRTOF
|
2004-07-15 14:41:38 +02:00
|
|
|
float f = strtof( p, &p_next );
|
2004-07-17 13:51:46 +02:00
|
|
|
#else
|
|
|
|
float f = (float) strtod( p, &p_next );
|
|
|
|
#endif
|
2004-07-15 14:41:38 +02:00
|
|
|
if( !p_next || p_next == p ) break; /* strtof() failed */
|
2004-07-12 08:45:07 +02:00
|
|
|
|
|
|
|
p_sys->f_amp[i] = EqzConvertdB( f );
|
|
|
|
|
2004-07-15 14:41:38 +02:00
|
|
|
if( !*p ) break; /* end of line */
|
2004-08-07 17:37:53 +02:00
|
|
|
p=p_next+1;
|
2004-07-12 08:45:07 +02:00
|
|
|
}
|
|
|
|
}
|
2004-07-15 14:41:38 +02:00
|
|
|
|
2004-07-12 08:45:07 +02:00
|
|
|
return VLC_SUCCESS;
|
2004-07-06 23:41:15 +02:00
|
|
|
}
|