/*****************************************************************************
* equalizer.c:
*****************************************************************************
- * Copyright (C) 2004, 2006 the VideoLAN team
+ * Copyright (C) 2004-2012 VLC authors and VideoLAN
* $Id$
*
* 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
+ * 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.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <math.h>
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <math.h>
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_charset.h>
-#include "vlc_aout.h"
+#include <vlc_aout.h>
+#include <vlc_filter.h>
#include "equalizer_presets.h"
+
/* 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).
+ * computation (not too hard once the Q is found).
* - support for external preset
* - callback to handle preset changes on the fly
* - ...
#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\"." )
+ "e.g. \"0 2 4 2 0 -2 -4 -2 0 2\"." )
+
+#define VLC_BANDS_TEXT N_( "Use VLC frequency bands" )
+#define VLC_BANDS_LONGTEXT N_( \
+ "Use the VLC frequency bands. Otherwise, use the ISO Standard " \
+ "frequency bands." )
#define TWOPASS_TEXT N_( "Two pass" )
#define TWOPASS_LONGTEXT N_( "Filter the audio twice. This provides a more " \
#define PREAMP_TEXT N_("Global gain" )
#define PREAMP_LONGTEXT N_("Set the global gain in dB (-20 ... 20)." )
-vlc_module_begin();
- 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, false );
- change_string_list( preset_list, preset_list_text, 0 );
- add_string( "equalizer-bands", NULL, NULL, BANDS_TEXT,
- BANDS_LONGTEXT, true );
- add_bool( "equalizer-2pass", 0, NULL, TWOPASS_TEXT,
- TWOPASS_LONGTEXT, true );
- add_float( "equalizer-preamp", 12.0, NULL, PREAMP_TEXT,
- PREAMP_LONGTEXT, true );
- set_callbacks( Open, Close );
- add_shortcut( "equalizer" );
-vlc_module_end();
+vlc_module_begin ()
+ set_description( N_("Equalizer with 10 bands") )
+ set_shortname( N_("Equalizer" ) )
+ set_capability( "audio filter", 0 )
+ set_category( CAT_AUDIO )
+ set_subcategory( SUBCAT_AUDIO_AFILTER )
+
+ add_string( "equalizer-preset", "flat", PRESET_TEXT,
+ PRESET_LONGTEXT, false )
+ change_string_list( preset_list, preset_list_text )
+ add_string( "equalizer-bands", NULL, BANDS_TEXT,
+ BANDS_LONGTEXT, true )
+ add_bool( "equalizer-2pass", false, TWOPASS_TEXT,
+ TWOPASS_LONGTEXT, true )
+ add_bool( "equalizer-vlcfreqs", true, VLC_BANDS_TEXT,
+ VLC_BANDS_LONGTEXT, true )
+ add_float( "equalizer-preamp", 12.0f, PREAMP_TEXT,
+ PREAMP_LONGTEXT, true )
+ set_callbacks( Open, Close )
+ add_shortcut( "equalizer" )
+vlc_module_end ()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-typedef struct aout_filter_sys_t
+struct filter_sys_t
{
/* Filter static config */
int i_band;
float x2[32][2];
float y2[32][128][2];
-} aout_filter_sys_t;
+ vlc_mutex_t lock;
+};
-static void DoWork( aout_instance_t *, aout_filter_t *,
- aout_buffer_t *, aout_buffer_t * );
+static block_t *DoWork( filter_t *, block_t * );
-#define EQZ_IN_FACTOR (0.25)
-static int EqzInit( aout_filter_t *, int );
-static void EqzFilter( aout_filter_t *, float *, float *,
- int, int );
-static void EqzClean( aout_filter_t * );
+#define EQZ_IN_FACTOR (0.25f)
+static int EqzInit( filter_t *, int );
+static void EqzFilter( filter_t *, float *, float *, int, int );
+static void EqzClean( filter_t * );
-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 * );
+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 * );
+static int TwoPassCallback( vlc_object_t *, char const *, vlc_value_t,
+ vlc_value_t, void * );
*****************************************************************************/
static int Open( vlc_object_t *p_this )
{
- aout_filter_t *p_filter = (aout_filter_t *)p_this;
- aout_filter_sys_t *p_sys;
- bool b_fit = true;
+ filter_t *p_filter = (filter_t *)p_this;
- if( p_filter->input.i_format != VLC_FOURCC('f','l','3','2' ) ||
- p_filter->output.i_format != VLC_FOURCC('f','l','3','2') )
- {
- b_fit = 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 = false;
- memcpy( &p_filter->output, &p_filter->input,
- sizeof(audio_sample_format_t) );
- msg_Warn( p_filter, "input and output formats are not similar" );
- }
+ /* Allocate structure */
+ filter_sys_t *p_sys = p_filter->p_sys = malloc( sizeof( *p_sys ) );
+ if( !p_sys )
+ return VLC_ENOMEM;
- if ( ! b_fit )
+ vlc_mutex_init( &p_sys->lock );
+ if( EqzInit( p_filter, p_filter->fmt_in.audio.i_rate ) != VLC_SUCCESS )
{
+ vlc_mutex_destroy( &p_sys->lock );
+ free( p_sys );
return VLC_EGENERIC;
}
- p_filter->pf_do_work = DoWork;
- p_filter->b_in_place = 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;
+ 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;
}
*****************************************************************************/
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;
EqzClean( p_filter );
+ vlc_mutex_destroy( &p_sys->lock );
free( p_sys );
}
*****************************************************************************
*
*****************************************************************************/
-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 )
{
- 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_filter, (float*)p_out_buf->p_buffer,
+ EqzFilter( p_filter, (float*)p_in_buf->p_buffer,
(float*)p_in_buf->p_buffer, p_in_buf->i_nb_samples,
- aout_FormatNbChannels( &p_filter->input ) );
+ aout_FormatNbChannels( &p_filter->fmt_in.audio ) );
+ return p_in_buf;
}
/*****************************************************************************
} eqz_config_t;
-/* Value from equ-xmms */
-static const eqz_config_t eqz_config_44100_10b =
+/* The frequency tables */
+static const float f_vlc_frequency_table_10b[EQZ_BANDS_MAX] =
{
- 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 },
- }
+ 60.0f, 170.0f, 310.0f, 600.0f, 1000.0f, 3000.0f, 6000.0f, 12000.0f,
+ 14000.0f, 16000.0f,
};
-static const eqz_config_t eqz_config_48000_10b =
+
+static const float f_iso_frequency_table_10b[EQZ_BANDS_MAX] =
{
- 10,
+ 31.25f, 62.5f, 125.0f, 250.0f, 500.0f, 1000.0f, 2000.0f, 4000.0f,
+ 8000.0f, 16000.0f,
+};
+
+/* Equalizer coefficient calculation function based on equ-xmms */
+static void EqzCoeffs( int i_rate, float f_octave_percent,
+ bool b_use_vlc_freqs,
+ eqz_config_t *p_eqz_config )
+{
+ const float *f_freq_table_10b = b_use_vlc_freqs
+ ? f_vlc_frequency_table_10b
+ : f_iso_frequency_table_10b;
+ float f_rate = (float) i_rate;
+ float f_nyquist_freq = 0.5f * f_rate;
+ float f_octave_factor = powf( 2.0f, 0.5f * f_octave_percent );
+ float f_octave_factor_1 = 0.5f * ( f_octave_factor + 1.0f );
+ float f_octave_factor_2 = 0.5f * ( f_octave_factor - 1.0f );
+
+ p_eqz_config->i_band = EQZ_BANDS_MAX;
+
+ for( int i = 0; i < EQZ_BANDS_MAX; i++ )
{
- { 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 }
+ float f_freq = f_freq_table_10b[i];
+
+ p_eqz_config->band[i].f_frequency = f_freq;
+
+ if( f_freq <= f_nyquist_freq )
+ {
+ float f_theta_1 = ( 2.0f * (float) M_PI * f_freq ) / f_rate;
+ float f_theta_2 = f_theta_1 / f_octave_factor;
+ float f_sin = sinf( f_theta_2 );
+ float f_sin_prd = sinf( f_theta_2 * f_octave_factor_1 )
+ * sinf( f_theta_2 * f_octave_factor_2 );
+ float f_sin_hlf = f_sin * 0.5f;
+ float f_den = f_sin_hlf + f_sin_prd;
+
+ p_eqz_config->band[i].f_alpha = f_sin_prd / f_den;
+ p_eqz_config->band[i].f_beta = ( f_sin_hlf - f_sin_prd ) / f_den;
+ p_eqz_config->band[i].f_gamma = f_sin * cosf( f_theta_1 ) / f_den;
+ }
+ else
+ {
+ /* Any frequency beyond the Nyquist frequency is no good... */
+ p_eqz_config->band[i].f_alpha =
+ p_eqz_config->band[i].f_beta =
+ p_eqz_config->band[i].f_gamma = 0.0f;
+ }
}
-};
+}
static inline float EqzConvertdB( float db )
{
* -> 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 );
+ if( db < -20.0f )
+ db = -20.0f;
+ else if( db > 20.0f )
+ db = 20.0f;
+ return EQZ_IN_FACTOR * ( powf( 10.0f, db / 20.0f ) - 1.0f );
}
-static int EqzInit( aout_filter_t *p_filter, int i_rate )
+static int EqzInit( filter_t *p_filter, int i_rate )
{
- aout_filter_sys_t *p_sys = p_filter->p_sys;
- const eqz_config_t *p_cfg;
+ filter_sys_t *p_sys = p_filter->p_sys;
+ eqz_config_t cfg;
int i, ch;
vlc_value_t val1, val2, val3;
- aout_instance_t *p_aout = (aout_instance_t *)p_filter->p_parent;
+ vlc_object_t *p_aout = p_filter->p_parent;
+ int i_ret = VLC_ENOMEM;
- /* 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, "rate not supported" );
- return VLC_EGENERIC;
- }
+ bool b_vlcFreqs = var_InheritBool( p_aout, "equalizer-vlcfreqs" );
+ EqzCoeffs( i_rate, 1.0f, b_vlcFreqs, &cfg );
/* Create the static filter config */
- p_sys->i_band = p_cfg->i_band;
+ p_sys->i_band = 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) );
+ if( !p_sys->f_alpha || !p_sys->f_beta || !p_sys->f_gamma )
+ goto error;
+
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;
+ p_sys->f_alpha[i] = cfg.band[i].f_alpha;
+ p_sys->f_beta[i] = cfg.band[i].f_beta;
+ p_sys->f_gamma[i] = cfg.band[i].f_gamma;
}
/* Filter dyn config */
p_sys->b_2eqz = false;
- p_sys->f_gamp = 1.0;
- p_sys->f_amp = malloc( p_sys->i_band * sizeof(float) );
+ p_sys->f_gamp = 1.0f;
+ p_sys->f_amp = malloc( p_sys->i_band * sizeof(float) );
+ if( !p_sys->f_amp )
+ goto error;
+
for( i = 0; i < p_sys->i_band; i++ )
{
- p_sys->f_amp[i] = 0.0;
+ p_sys->f_amp[i] = 0.0f;
}
/* Filter state */
p_sys->x[ch][0] =
p_sys->x[ch][1] =
p_sys->x2[ch][0] =
- p_sys->x2[ch][1] = 0.0;
+ p_sys->x2[ch][1] = 0.0f;
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;
+ p_sys->y2[ch][i][1] = 0.0f;
}
}
- var_CreateGetString( p_aout,"equalizer-bands" );
- var_CreateGetString( p_aout, "equalizer-preset" );
+ p_sys->psz_newbands = NULL;
+
+ var_Create( p_aout, "equalizer-bands", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+ var_Create( p_aout, "equalizer-preset", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
p_sys->b_2eqz = var_CreateGetBool( p_aout, "equalizer-2pass" );
- var_CreateGetFloat( p_aout, "equalizer-preamp" );
+ var_Create( p_aout, "equalizer-preamp", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
/* Get initial values */
var_Get( p_aout, "equalizer-preset", &val1 );
PreampCallback( VLC_OBJECT( p_aout ), NULL, val3, val3, p_sys );
p_sys->b_first = 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 */
- if (p_sys->psz_newbands == NULL)
+ free( val1.psz_string );
+
+ /* Exit if we have no preset and no bands value */
+ if (p_sys->psz_newbands == NULL && (!val2.psz_string || !*val2.psz_string))
{
msg_Err(p_filter, "No preset selected");
- return (VLC_EGENERIC);
+ free( val2.psz_string );
+ free( p_sys->f_amp );
+ i_ret = VLC_EGENERIC;
+ goto error;
}
- if( ( *(val2.psz_string) &&
- strstr( p_sys->psz_newbands, val2.psz_string ) ) || !*val2.psz_string )
+ /* 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 */
+ if( ( p_sys->psz_newbands && *(val2.psz_string) &&
+ strstr( p_sys->psz_newbands, val2.psz_string ) ) || !*val2.psz_string )
{
var_SetString( p_aout, "equalizer-bands", p_sys->psz_newbands );
if( p_sys->f_newpreamp == p_sys->f_gamp )
var_SetFloat( p_aout, "equalizer-preamp", p_sys->f_newpreamp );
}
+ free( val2.psz_string );
/* 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 );
+ var_AddCallback( p_aout, "equalizer-2pass", TwoPassCallback, p_sys );
msg_Dbg( p_filter, "equalizer loaded for %d Hz with %d bands %d pass",
i_rate, p_sys->i_band, p_sys->b_2eqz ? 2 : 1 );
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],
+ msg_Dbg( p_filter, " %.2f Hz -> factor:%f alpha:%f beta:%f gamma:%f",
+ 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;
+
+error:
+ free( p_sys->f_alpha );
+ free( p_sys->f_beta );
+ free( p_sys->f_gamma );
+ return i_ret;
}
-static void EqzFilter( aout_filter_t *p_filter, float *out, float *in,
+static void EqzFilter( filter_t *p_filter, float *out, float *in,
int i_samples, int i_channels )
{
- aout_filter_sys_t *p_sys = p_filter->p_sys;
+ filter_sys_t *p_sys = p_filter->p_sys;
int i, ch, j;
+ vlc_mutex_lock( &p_sys->lock );
for( i = 0; i < i_samples; i++ )
{
for( ch = 0; ch < i_channels; ch++ )
{
const float x = in[ch];
- float o = 0.0;
+ float o = 0.0f;
for( j = 0; j < p_sys->i_band; j++ )
{
if( p_sys->b_2eqz )
{
const float x2 = EQZ_IN_FACTOR * x + o;
- o = 0.0;
+ o = 0.0f;
for( j = 0; j < p_sys->i_band; j++ )
{
float y = p_sys->f_alpha[j] * ( x2 - p_sys->x2[ch][1] ) +
in += i_channels;
out += i_channels;
}
+ vlc_mutex_unlock( &p_sys->lock );
}
-static void EqzClean( aout_filter_t *p_filter )
+static void EqzClean( filter_t *p_filter )
{
- aout_filter_sys_t *p_sys = p_filter->p_sys;
+ filter_sys_t *p_sys = p_filter->p_sys;
+ vlc_object_t *p_aout = p_filter->p_parent;
- 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 );
+ var_DelCallback( p_aout, "equalizer-bands", BandsCallback, p_sys );
+ var_DelCallback( p_aout, "equalizer-preset", PresetCallback, p_sys );
+ var_DelCallback( p_aout, "equalizer-preamp", PreampCallback, p_sys );
+ var_DelCallback( p_aout, "equalizer-2pass", TwoPassCallback, p_sys );
free( p_sys->f_alpha );
free( p_sys->f_beta );
free( p_sys->f_gamma );
free( p_sys->f_amp );
+ free( p_sys->psz_newbands );
}
-static int PresetCallback( vlc_object_t *p_this, char const *psz_cmd,
+static int PresetCallback( vlc_object_t *p_aout, 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;
+ filter_sys_t *p_sys = p_data;
- char *psz_preset = newval.psz_string;
- char psz_newbands[120];
+ const char *psz_preset = newval.psz_string;
- memset( psz_newbands, 0, 120 );
+ vlc_mutex_lock( &p_sys->lock );
+ if( !*psz_preset || p_sys->i_band != 10 )
+ {
+ vlc_mutex_unlock( &p_sys->lock );
+ return VLC_SUCCESS;
+ }
- if( *psz_preset && p_sys->i_band == 10 )
+ for( unsigned i = 0; i < NB_PRESETS; i++ )
{
- int i;
- /* */
- for( i = 0; eqz_preset_10b[i] != NULL; i++ )
+ if( !strcasecmp( eqz_preset_10b[i].psz_name, psz_preset ) )
{
- if( !strcasecmp( eqz_preset_10b[i]->psz_name, psz_preset ) )
+ char *psz_newbands = NULL;
+
+ p_sys->f_gamp *= powf( 10.0f, eqz_preset_10b[i].f_preamp / 20.0f );
+ for( int j = 0; j < p_sys->i_band; j++ )
{
- 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++ )
- {
- lldiv_t div;
- p_sys->f_amp[j] = EqzConvertdB(
- 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 == false )
- {
- var_SetString( p_aout, "equalizer-bands", psz_newbands );
- var_SetFloat( p_aout, "equalizer-preamp",
- eqz_preset_10b[i]->f_preamp );
- }
- else
+ lldiv_t d;
+ char *psz;
+
+ p_sys->f_amp[j] = EqzConvertdB( eqz_preset_10b[i].f_amp[j] );
+ d = lldiv( eqz_preset_10b[i].f_amp[j] * 10000000, 10000000 );
+ if( asprintf( &psz, "%s %lld.%07llu",
+ psz_newbands ? psz_newbands : "",
+ d.quot, d.rem ) == -1 )
{
- p_sys->psz_newbands = strdup( psz_newbands );
- p_sys->f_newpreamp = eqz_preset_10b[i]->f_preamp;
+ free( psz_newbands );
+ vlc_mutex_unlock( &p_sys->lock );
+ return VLC_ENOMEM;
}
- break;
+ free( psz_newbands );
+ psz_newbands = psz;
}
- }
- 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 );
+ if( !p_sys->b_first )
+ {
+ vlc_mutex_unlock( &p_sys->lock );
+ var_SetString( p_aout, "equalizer-bands", psz_newbands );
+ var_SetFloat( p_aout, "equalizer-preamp",
+ eqz_preset_10b[i].f_preamp );
+ free( psz_newbands );
+ }
+ else
+ {
+ p_sys->psz_newbands = psz_newbands;
+ p_sys->f_newpreamp = eqz_preset_10b[i].f_preamp;
+ vlc_mutex_unlock( &p_sys->lock );
+ }
+ return VLC_SUCCESS;
}
}
+ vlc_mutex_unlock( &p_sys->lock );
+ msg_Err( p_aout, "equalizer preset '%s' not found", psz_preset );
+ msg_Info( p_aout, "full list:" );
+ for( unsigned i = 0; i < NB_PRESETS; i++ )
+ msg_Info( p_aout, " - '%s'", eqz_preset_10b[i].psz_name );
return VLC_SUCCESS;
}
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;
+ filter_sys_t *p_sys = p_data;
+
+ if( newval.f_float < -20.0f )
+ newval.f_float = -20.0f;
+ else if( newval.f_float > 20.0f )
+ newval.f_float = 20.0f;
- 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);
+ vlc_mutex_lock( &p_sys->lock );
+ p_sys->f_gamp = powf( 10.0f, newval.f_float / 20.0f );
+ vlc_mutex_unlock( &p_sys->lock );
return VLC_SUCCESS;
}
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;
+ filter_sys_t *p_sys = p_data;
+ const char *psz_bands = newval.psz_string;
+ const char *p = psz_bands;
+ char *psz_next;
/* Same thing for bands */
- if( *psz_bands )
+ vlc_mutex_lock( &p_sys->lock );
+ for( int i = 0; i < p_sys->i_band; i++ )
{
- char *p = psz_bands, *p_next;
- int i;
+ float f;
- for( i = 0; i < p_sys->i_band; i++ )
- {
- /* Read dB -20/20 */
-#ifdef HAVE_STRTOF
- float f = strtof( p, &p_next );
-#else
- float f = (float) strtod( p, &p_next );
-#endif
- if( !p_next || p_next == p ) break; /* strtof() failed */
+ if( *psz_bands == '\0' )
+ break;
- p_sys->f_amp[i] = EqzConvertdB( f );
+ /* Read dB -20/20 */
+ f = us_strtof( p, &psz_next );
- if( !*p ) break; /* end of line */
- p=p_next+1;
- }
+ if( psz_next == p )
+ break; /* no conversion */
+
+ p_sys->f_amp[i] = EqzConvertdB( f );
+
+ if( *psz_next == '\0' )
+ break; /* end of line */
+ p = &psz_next[1];
}
+ vlc_mutex_unlock( &p_sys->lock );
+ return VLC_SUCCESS;
+}
+static int TwoPassCallback( 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);
+ filter_sys_t *p_sys = p_data;
+ vlc_mutex_lock( &p_sys->lock );
+ p_sys->b_2eqz = newval.b_bool;
+ vlc_mutex_unlock( &p_sys->lock );
return VLC_SUCCESS;
}
+
projects / vlc / blobdiff