X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_filter%2Fequalizer.c;h=28fe15c6a0d757f90d1c94dc495aae6afbd1c164;hb=fb4c212ba2d021dc8ea9b6ef80b69bcec32ba8c4;hp=c04d88668cec25df22877f739f719b397dcff2ae;hpb=337c8691c2e5576e679bbf2e3c4f10306a75a2ae;p=vlc diff --git a/modules/audio_filter/equalizer.c b/modules/audio_filter/equalizer.c index c04d88668c..28fe15c6a0 100644 --- a/modules/audio_filter/equalizer.c +++ b/modules/audio_filter/equalizer.c @@ -1,7 +1,7 @@ /***************************************************************************** * equalizer.c: ***************************************************************************** - * Copyright (C) 2004, 2006 the VideoLAN team + * Copyright (C) 2004-2009 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -33,8 +33,9 @@ #include #include +#include -#include "vlc_aout.h" +#include #include "equalizer_presets.h" /* TODO: @@ -77,14 +78,14 @@ vlc_module_begin () 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 ); + 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 ); + 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 ); + PREAMP_LONGTEXT, true ) set_callbacks( Open, Close ) add_shortcut( "equalizer" ) vlc_module_end () @@ -117,6 +118,7 @@ struct aout_filter_sys_t float x2[32][2]; float y2[32][128][2]; + vlc_mutex_t lock; }; static void DoWork( aout_instance_t *, aout_filter_t *, @@ -128,12 +130,14 @@ static void EqzFilter( aout_filter_t *, float *, float *, int, int ); static void EqzClean( aout_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 * ); @@ -146,12 +150,12 @@ static int Open( vlc_object_t *p_this ) aout_filter_sys_t *p_sys; bool b_fit = true; - 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->input.i_format != VLC_CODEC_FL32 || + p_filter->output.i_format != VLC_CODEC_FL32 ) { 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'); + 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" ); } if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) ) @@ -175,8 +179,10 @@ static int Open( vlc_object_t *p_this ) if( !p_sys ) return VLC_ENOMEM; + vlc_mutex_init( &p_sys->lock ); if( EqzInit( p_filter, p_filter->input.i_rate ) != VLC_SUCCESS ) { + vlc_mutex_destroy( &p_sys->lock ); free( p_sys ); return VLC_EGENERIC; } @@ -193,6 +199,7 @@ static void Close( vlc_object_t *p_this ) aout_filter_sys_t *p_sys = p_filter->p_sys; EqzClean( p_filter ); + vlc_mutex_destroy( &p_sys->lock ); free( p_sys ); } @@ -288,6 +295,7 @@ static int EqzInit( aout_filter_t *p_filter, int i_rate ) int i, ch; vlc_value_t val1, val2, val3; aout_instance_t *p_aout = (aout_instance_t *)p_filter->p_parent; + int i_ret = VLC_ENOMEM; /* Select the config */ if( i_rate == 48000 ) @@ -311,12 +319,7 @@ static int EqzInit( aout_filter_t *p_filter, int i_rate ) 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 ) - { - free( p_sys->f_alpha ); - free( p_sys->f_beta ); - free( p_sys->f_gamma ); - return VLC_ENOMEM; - } + goto error; for( i = 0; i < p_sys->i_band; i++ ) { @@ -330,12 +333,8 @@ static int EqzInit( aout_filter_t *p_filter, int i_rate ) p_sys->f_gamp = 1.0; p_sys->f_amp = malloc( p_sys->i_band * sizeof(float) ); if( !p_sys->f_amp ) - { - free( p_sys->f_alpha ); - free( p_sys->f_beta ); - free( p_sys->f_gamma ); - return VLC_ENOMEM; - } + goto error; + for( i = 0; i < p_sys->i_band; i++ ) { p_sys->f_amp[i] = 0.0; @@ -386,10 +385,8 @@ static int EqzInit( aout_filter_t *p_filter, int i_rate ) msg_Err(p_filter, "No preset selected"); free( val2.psz_string ); free( p_sys->f_amp ); - free( p_sys->f_alpha ); - free( p_sys->f_beta ); - free( p_sys->f_gamma ); - return VLC_EGENERIC; + i_ret = VLC_EGENERIC; + goto error; } if( ( *(val2.psz_string) && strstr( p_sys->psz_newbands, val2.psz_string ) ) || !*val2.psz_string ) @@ -404,6 +401,7 @@ static int EqzInit( aout_filter_t *p_filter, int i_rate ) 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 ); @@ -414,6 +412,12 @@ 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_filter_t *p_filter, float *out, float *in, @@ -422,6 +426,7 @@ static void EqzFilter( aout_filter_t *p_filter, float *out, float *in, aout_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++ ) @@ -475,18 +480,18 @@ static void EqzFilter( aout_filter_t *p_filter, float *out, float *in, in += i_channels; out += i_channels; } + vlc_mutex_unlock( &p_sys->lock ); } static void EqzClean( aout_filter_t *p_filter ) { aout_filter_sys_t *p_sys = p_filter->p_sys; + aout_instance_t *p_aout = (aout_instance_t *)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 ); @@ -504,53 +509,61 @@ static int PresetCallback( vlc_object_t *p_this, char const *psz_cmd, 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]; + 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++ ) - { - 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 %"PRId64".%07u", psz_newbands, - (int64_t)div.quot, (unsigned int) div.rem ); - } - if( p_sys->b_first == 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; } } + 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; } @@ -564,7 +577,10 @@ static int PreampCallback( vlc_object_t *p_this, char const *psz_cmd, 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; } @@ -574,13 +590,13 @@ static int BandsCallback( vlc_object_t *p_this, char const *psz_cmd, { 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; + const char *psz_bands = newval.psz_string; + const char *p = psz_bands; char *psz_next; - char *p = psz_bands; - int i; /* Same thing for bands */ - for( i = 0; i < p_sys->i_band; i++ ) + vlc_mutex_lock( &p_sys->lock ); + for( int i = 0; i < p_sys->i_band; i++ ) { float f; @@ -588,11 +604,8 @@ static int BandsCallback( vlc_object_t *p_this, char const *psz_cmd, break; /* Read dB -20/20 */ -#ifdef HAVE_STRTOF - f = strtof( p, &psz_next ); -#else - f = (float)strtod( p, &psz_next ); -#endif + f = us_strtof( p, &psz_next ); + if( psz_next == p ) break; /* no conversion */ @@ -602,6 +615,18 @@ static int BandsCallback( vlc_object_t *p_this, char const *psz_cmd, 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); + aout_filter_sys_t *p_sys = (aout_filter_sys_t *)p_data; + + vlc_mutex_lock( &p_sys->lock ); + p_sys->b_2eqz = newval.b_bool; + vlc_mutex_unlock( &p_sys->lock ); return VLC_SUCCESS; }