X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_filter%2Fequalizer.c;h=28fe15c6a0d757f90d1c94dc495aae6afbd1c164;hb=fb4c212ba2d021dc8ea9b6ef80b69bcec32ba8c4;hp=dd8aa67966a5574b3ad87e6d3a0b5ff38e50e3f8;hpb=97897eeeb22b1238e56632b16cda1a0375ae7708;p=vlc diff --git a/modules/audio_filter/equalizer.c b/modules/audio_filter/equalizer.c index dd8aa67966..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 @@ -24,15 +24,18 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include +#include + +#include +#include +#include -#include "vlc_aout.h" +#include #include "equalizer_presets.h" /* TODO: @@ -67,30 +70,30 @@ static void Close( vlc_object_t * ); #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 ); +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", 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 ); - set_callbacks( Open, Close ); - add_shortcut( "equalizer" ); -vlc_module_end(); + PREAMP_LONGTEXT, true ) + set_callbacks( Open, Close ) + add_shortcut( "equalizer" ) +vlc_module_end () /***************************************************************************** * Local prototypes *****************************************************************************/ -typedef struct aout_filter_sys_t +struct aout_filter_sys_t { /* Filter static config */ int i_band; @@ -115,7 +118,8 @@ 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 * ); @@ -126,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 * ); @@ -144,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 ) ) @@ -170,9 +176,16 @@ static int Open( vlc_object_t *p_this ) /* Allocate structure */ p_sys = p_filter->p_sys = malloc( sizeof( aout_filter_sys_t ) ); + 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->input.i_rate ) != VLC_SUCCESS ) + { + vlc_mutex_destroy( &p_sys->lock ); + free( p_sys ); return VLC_EGENERIC; + } return VLC_SUCCESS; } @@ -186,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 ); } @@ -281,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 ) @@ -303,6 +318,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; @@ -313,7 +331,10 @@ static int EqzInit( aout_filter_t *p_filter, int i_rate ) /* 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_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; @@ -336,12 +357,12 @@ 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 ); @@ -354,13 +375,18 @@ static int EqzInit( aout_filter_t *p_filter, int i_rate ) PreampCallback( VLC_OBJECT( p_aout ), NULL, val3, val3, p_sys ); 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"); - 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 ) @@ -369,11 +395,13 @@ static int EqzInit( aout_filter_t *p_filter, int i_rate ) 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 ); @@ -384,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, @@ -392,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++ ) @@ -445,24 +480,25 @@ 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 ); free( p_sys->f_gamma ); free( p_sys->f_amp ); + free( p_sys->psz_newbands ); } @@ -473,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 ) - { - 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 == 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; } @@ -533,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; } @@ -543,30 +590,43 @@ 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; /* 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); + 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; } +