X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_filter%2Fequalizer.c;h=aa1c845953de36343288fa632a571ab5c3732440;hb=b890a56baa23614689fc37c312e8242f58e8079f;hp=87e222d70123f838e933d1bdea9051c5cd72e5ec;hpb=b0536abaa69367da6abdfd1b9e872c3ee8c4dec5;p=vlc diff --git a/modules/audio_filter/equalizer.c b/modules/audio_filter/equalizer.c index 87e222d701..aa1c845953 100644 --- a/modules/audio_filter/equalizer.c +++ b/modules/audio_filter/equalizer.c @@ -1,7 +1,7 @@ /***************************************************************************** * equalizer.c: ***************************************************************************** - * Copyright (C) 2004 VideoLAN + * Copyright (C) 2004-2009 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -18,20 +18,27 @@ * * 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 /* malloc(), free() */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include -#include +#include +#include +#include -#include -#include "aout_internal.h" +#include +#include +#include "equalizer_presets.h" /* TODO: * - add tables for other rates ( 22500, 11250, ...) * - optimize a bit (you can hardly do slower ;) @@ -49,50 +56,45 @@ static int Open ( vlc_object_t * ); 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 2\"." ) #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)." ) -static char *preset_list[] = { - "flat", "classical", "club", "dance", "fullbass", "fullbasstreeble", - "fulltreeble", "headphones","largehall", "live", "party", "pop", "reggae", - "rock", "ska", "soft", "softrock", "techno" -}; -static char *preset_list_text[] = { - N_("Flat"), N_("Classical"), N_("Club"), N_("Dance"), N_("Full bass"), - N_("Full bass and treeble"), N_("Full treeble"), N_("Headphones"), - N_("Large Hall"), N_("Live"), N_("Party"), N_("Pop"), N_("Reggae"), - N_("Rock"), N_("Ska"), N_("Soft"), N_("Soft rock"), N_("Techno"), -}; +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 ) -vlc_module_begin(); - set_description( _("Equalizer 10 bands") ); - set_capability( "audio filter", 0 ); add_string( "equalizer-preset", "flat", NULL, PRESET_TEXT, - PRESET_LONGTEXT, VLC_TRUE ); - change_string_list( preset_list, preset_list_text, 0 ); + PRESET_LONGTEXT, false ) + change_string_list( preset_list, preset_list_text, 0 ) add_string( "equalizer-bands", NULL, NULL, BANDS_TEXT, - BANDS_LONGTEXT, VLC_TRUE ); - add_bool( "equalizer-2pass", 0, NULL, TWOPASS_TEXT, - TWOPASS_LONGTEXT, VLC_TRUE ); - add_float( "equalizer-preamp", 0.0, NULL, PREAMP_TEXT, - PREAMP_LONGTEXT, VLC_TRUE ); - set_callbacks( Open, Close ); - add_shortcut( "equalizer" ); -vlc_module_end(); + BANDS_LONGTEXT, true ) + add_bool( "equalizer-2pass", false, 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 () /***************************************************************************** * Local prototypes *****************************************************************************/ - -typedef struct aout_filter_sys_t +struct filter_sys_t { /* Filter static config */ int i_band; @@ -102,12 +104,12 @@ typedef struct aout_filter_sys_t float f_newpreamp; char *psz_newbands; - vlc_bool_t b_first; + bool b_first; /* Filter dyn config */ float *f_amp; /* Per band amp */ float f_gamp; /* Global preamp */ - vlc_bool_t b_2eqz; + bool b_2eqz; /* Filter state */ float x[32][2]; @@ -117,23 +119,24 @@ typedef struct aout_filter_sys_t 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_instance_t *,aout_filter_t *, float *, float *, - int, int ); -static void EqzClean( aout_filter_t * ); +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 * ); @@ -142,29 +145,39 @@ static int BandsCallback ( vlc_object_t *, char const *, *****************************************************************************/ static int Open( vlc_object_t *p_this ) { - aout_filter_t *p_filter = (aout_filter_t *)p_this; - aout_filter_sys_t *p_sys; + filter_t *p_filter = (filter_t *)p_this; + 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" ); + 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; /* Allocate structure */ - 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; - if( EqzInit( p_filter, p_filter->input.i_rate ) ) + 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; + } return VLC_SUCCESS; } @@ -174,10 +187,11 @@ 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; EqzClean( p_filter ); + vlc_mutex_destroy( &p_sys->lock ); free( p_sys ); } @@ -186,15 +200,12 @@ static void Close( vlc_object_t *p_this ) ***************************************************************************** * *****************************************************************************/ -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 ) { - 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_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; } /***************************************************************************** @@ -210,7 +221,7 @@ typedef struct float f_alpha; float f_beta; float f_gamma; - } band[]; + } band[EQZ_BANDS_MAX]; } eqz_config_t; @@ -248,130 +259,6 @@ static const eqz_config_t eqz_config_48000_10b = } }; -typedef struct -{ - char *psz_name; - int i_band; - float f_preamp; - float f_amp[]; -} eqz_preset_t; - -static const eqz_preset_t eqz_preset_flat_10b= -{ - "flat", 10, 12.0, - { 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 }, -}; -static const eqz_preset_t eqz_preset_classical_10b= -{ - "classical", 10, 12.0, - { -1.11022e-15, -1.11022e-15, -1.11022e-15, -1.11022e-15, -1.11022e-15, -1.11022e-15, -7.2, -7.2, -7.2, -9.6 } -}; -static const eqz_preset_t eqz_preset_club_10b= -{ - "club", 10, 6.0, - { -1.11022e-15, -1.11022e-15, 8, 5.6, 5.6, 5.6, 3.2, -1.11022e-15, -1.11022e-15, -1.11022e-15 } -}; -static const eqz_preset_t eqz_preset_dance_10b= -{ - "dance", 10, 5.0, - { 9.6, 7.2, 2.4, -1.11022e-15, -1.11022e-15, -5.6, -7.2, -7.2, -1.11022e-15, -1.11022e-15 } -}; -static const eqz_preset_t eqz_preset_fullbass_10b= -{ - "fullbass", 10, 5.0, - { -8, 9.6, 9.6, 5.6, 1.6, -4, -8, -10.4, -11.2, -11.2 } -}; -static const eqz_preset_t eqz_preset_fullbasstreeble_10b= -{ - "fullbasstreeble", 10, 4.0, - { 7.2, 5.6, -1.11022e-15, -7.2, -4.8, 1.6, 8, 11.2, 12, 12 } -}; - -static const eqz_preset_t eqz_preset_fulltreeble_10b= -{ - "fulltreeble", 10, 3.0, - { -9.6, -9.6, -9.6, -4, 2.4, 11.2, 16, 16, 16, 16.8 } -}; -static const eqz_preset_t eqz_preset_headphones_10b= -{ - "headphones", 10, 4.0, - { 4.8, 11.2, 5.6, -3.2, -2.4, 1.6, 4.8, 9.6, 12.8, 14.4 } -}; -static const eqz_preset_t eqz_preset_largehall_10b= -{ - "largehall", 10, 5.0, - { 10.4, 10.4, 5.6, 5.6, -1.11022e-15, -4.8, -4.8, -4.8, -1.11022e-15, -1.11022e-15 } -}; -static const eqz_preset_t eqz_preset_live_10b= -{ - "live", 10, 7.0, - { -4.8, -1.11022e-15, 4, 5.6, 5.6, 5.6, 4, 2.4, 2.4, 2.4 } -}; -static const eqz_preset_t eqz_preset_party_10b= -{ - "party", 10, 6.0, - { 7.2, 7.2, -1.11022e-15, -1.11022e-15, -1.11022e-15, -1.11022e-15, -1.11022e-15, -1.11022e-15, 7.2, 7.2 } -}; -static const eqz_preset_t eqz_preset_pop_10b= -{ - "pop", 10, 6.0, - { -1.6, 4.8, 7.2, 8, 5.6, -1.11022e-15, -2.4, -2.4, -1.6, -1.6 } -}; -static const eqz_preset_t eqz_preset_reggae_10b= -{ - "reggae", 10, 8.0, - { -1.11022e-15, -1.11022e-15, -1.11022e-15, -5.6, -1.11022e-15, 6.4, 6.4, -1.11022e-15, -1.11022e-15, -1.11022e-15 } -}; -static const eqz_preset_t eqz_preset_rock_10b= -{ - "rock", 10, 5.0, - { 8, 4.8, -5.6, -8, -3.2, 4, 8.8, 11.2, 11.2, 11.2 } -}; -static const eqz_preset_t eqz_preset_ska_10b= -{ - "ska", 10, 6.0, - { -2.4, -4.8, -4, -1.11022e-15, 4, 5.6, 8.8, 9.6, 11.2, 9.6 } -}; -static const eqz_preset_t eqz_preset_soft_10b= -{ - "soft", 10, 5.0, - { 4.8, 1.6, -1.11022e-15, -2.4, -1.11022e-15, 4, 8, 9.6, 11.2, 12 } -}; -static const eqz_preset_t eqz_preset_softrock_10b= -{ - "softrock", 10, 7.0, - { 4, 4, 2.4, -1.11022e-15, -4, -5.6, -3.2, -1.11022e-15, 2.4, 8.8 } -}; -static const eqz_preset_t eqz_preset_techno_10b= -{ - "techno", 10, 5.0, - { 8, 5.6, -1.11022e-15, -5.6, -4.8, -1.11022e-15, 8, 9.6, 9.6, 8.8 } -}; - -static const eqz_preset_t *eqz_preset_10b[] = -{ - &eqz_preset_flat_10b, - &eqz_preset_classical_10b, - &eqz_preset_club_10b, - &eqz_preset_dance_10b, - &eqz_preset_fullbass_10b, - &eqz_preset_fullbasstreeble_10b, - &eqz_preset_fulltreeble_10b, - &eqz_preset_headphones_10b, - &eqz_preset_largehall_10b, - &eqz_preset_live_10b, - &eqz_preset_party_10b, - &eqz_preset_pop_10b, - &eqz_preset_reggae_10b, - &eqz_preset_rock_10b, - &eqz_preset_ska_10b, - &eqz_preset_soft_10b, - &eqz_preset_softrock_10b, - &eqz_preset_techno_10b, - NULL -}; - - static inline float EqzConvertdB( float db ) { /* Map it to gain, @@ -389,13 +276,14 @@ static inline float EqzConvertdB( float db ) return EQZ_IN_FACTOR * ( pow( 10, db / 20.0 ) - 1.0 ); } -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; + filter_sys_t *p_sys = p_filter->p_sys; const eqz_config_t *p_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 ) @@ -409,7 +297,7 @@ static int EqzInit( aout_filter_t *p_filter, int i_rate ) else { /* TODO compute the coeffs on the fly */ - msg_Err( p_filter, "unsupported rate" ); + msg_Err( p_filter, "rate not supported" ); return VLC_EGENERIC; } @@ -418,6 +306,9 @@ static int EqzInit( aout_filter_t *p_filter, int i_rate ) 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; @@ -426,9 +317,12 @@ static int EqzInit( aout_filter_t *p_filter, int i_rate ) } /* Filter dyn config */ - p_sys->b_2eqz = VLC_FALSE; + 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_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; @@ -451,38 +345,51 @@ static int EqzInit( aout_filter_t *p_filter, int i_rate ) } } - var_CreateGetString( p_aout,"equalizer-bands" ); - var_CreateGetString( p_aout, "equalizer-preset" ); + 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 ); var_Get( p_aout, "equalizer-bands", &val2 ); var_Get( p_aout, "equalizer-preamp", &val3 ); - p_sys->b_first = VLC_TRUE; + p_sys->b_first = 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; + p_sys->b_first = false; + + free( val1.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 == NULL) + { + msg_Err(p_filter, "No preset selected"); + 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 ) { 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 ); } + 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 ); @@ -493,15 +400,21 @@ static int EqzInit( aout_filter_t *p_filter, int i_rate ) 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_instance_t *p_aout, - 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++ ) @@ -555,90 +468,107 @@ static void EqzFilter( aout_instance_t *p_aout, 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 ) { - aout_filter_sys_t *p_sys = (aout_filter_sys_t *)p_data; - aout_instance_t *p_aout = (aout_instance_t *)p_this; + VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); + 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; eqz_preset_10b[i] != NULL; 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 *= pow( 10, eqz_preset_10b[i]->f_preamp / 20.0 ); + 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++ ) - { - 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 ) + 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 ) { - var_SetString( p_aout, "equalizer-bands", psz_newbands ); - var_SetFloat( p_aout, "equalizer-preamp", - eqz_preset_10b[i]->f_preamp ); + free( psz_newbands ); + vlc_mutex_unlock( &p_sys->lock ); + return VLC_ENOMEM; } - else - { - p_sys->psz_newbands = strdup( psz_newbands ); - p_sys->f_newpreamp = eqz_preset_10b[i]->f_preamp; - } - 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 == false ) + { + 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; eqz_preset_10b[i] != NULL; i++ ) + msg_Info( p_aout, " - '%s'", eqz_preset_10b[i]->psz_name ); return VLC_SUCCESS; } static int PreampCallback( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { - aout_filter_sys_t *p_sys = (aout_filter_sys_t *)p_data; + VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); + filter_sys_t *p_sys = 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; + + vlc_mutex_lock( &p_sys->lock ); p_sys->f_gamp = pow( 10, newval.f_float /20.0); + vlc_mutex_unlock( &p_sys->lock ); return VLC_SUCCESS; } @@ -646,27 +576,45 @@ static int PreampCallback( vlc_object_t *p_this, char const *psz_cmd, static int BandsCallback( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { - aout_filter_sys_t *p_sys = (aout_filter_sys_t *)p_data; - char *psz_bands = newval.psz_string; + VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); + 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 */ - float f = strtof( p, &p_next ); - 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++; - } + 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; } +