equalizer.c 19.8 KB
Newer Older
1 2 3
/*****************************************************************************
 * equalizer.c:
 *****************************************************************************
4
 * Copyright (C) 2004-2009 the VideoLAN team
5
 * $Id$
6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
 *
 * 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
Antoine Cellerier's avatar
Antoine Cellerier committed
21
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
22 23 24 25 26 27
 *****************************************************************************/

/*****************************************************************************
 * Preamble
 *****************************************************************************/

28 29 30 31
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif

32 33
#include <math.h>

34
#include <vlc_common.h>
35
#include <vlc_plugin.h>
36
#include <vlc_charset.h>
37

38
#include <vlc_aout.h>
39
#include <vlc_filter.h>
40

Jérome Decoodt's avatar
Jérome Decoodt committed
41
#include "equalizer_presets.h"
42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58
/* 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" )
59
#define PRESET_LONGTEXT N_("Preset to use for the equalizer." )
60 61

#define BANDS_TEXT N_( "Bands gain")
62
#define BANDS_LONGTEXT N_( \
63 64
         "Don't use presets, but manually specified bands. You need to " \
         "provide 10 values between -20dB and 20dB, separated by spaces, " \
Christophe Mutricy's avatar
Christophe Mutricy committed
65
         "e.g. \"0 2 4 2 0 -2 -4 -2 0\"." )
66 67

#define TWOPASS_TEXT N_( "Two pass" )
68
#define TWOPASS_LONGTEXT N_( "Filter the audio twice. This provides a more "  \
69
         "intense effect.")
70 71

#define PREAMP_TEXT N_("Global gain" )
72
#define PREAMP_LONGTEXT N_("Set the global gain in dB (-20 ... 20)." )
73

74 75 76
vlc_module_begin ()
    set_description( N_("Equalizer with 10 bands") )
    set_shortname( N_("Equalizer" ) )
77
    set_capability( "audio filter2", 0 )
78 79
    set_category( CAT_AUDIO )
    set_subcategory( SUBCAT_AUDIO_AFILTER )
Clément Stenac's avatar
Clément Stenac committed
80

81
    add_string( "equalizer-preset", "flat", NULL, PRESET_TEXT,
Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
82 83
                PRESET_LONGTEXT, false )
        change_string_list( preset_list, preset_list_text, 0 )
84
    add_string( "equalizer-bands", NULL, NULL, BANDS_TEXT,
Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
85
                BANDS_LONGTEXT, true )
Rémi Duraffort's avatar
Rémi Duraffort committed
86
    add_bool( "equalizer-2pass", false, NULL, TWOPASS_TEXT,
Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
87
              TWOPASS_LONGTEXT, true )
88
    add_float( "equalizer-preamp", 12.0, NULL, PREAMP_TEXT,
Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
89
               PREAMP_LONGTEXT, true )
90 91 92
    set_callbacks( Open, Close )
    add_shortcut( "equalizer" )
vlc_module_end ()
93 94 95 96

/*****************************************************************************
 * Local prototypes
 *****************************************************************************/
97
struct filter_sys_t
98 99 100 101 102 103 104
{
    /* Filter static config */
    int i_band;
    float *f_alpha;
    float *f_beta;
    float *f_gamma;

105 106
    float f_newpreamp;
    char *psz_newbands;
107
    bool b_first;
108

109 110 111
    /* Filter dyn config */
    float *f_amp;   /* Per band amp */
    float f_gamp;   /* Global preamp */
112
    bool b_2eqz;
113 114 115 116 117 118 119 120 121

    /* Filter state */
    float x[32][2];
    float y[32][128][2];

    /* Second filter state */
    float x2[32][2];
    float y2[32][128][2];

122
    vlc_mutex_t lock;
123
};
124

125
static block_t *DoWork( filter_t *, block_t * );
126 127

#define EQZ_IN_FACTOR (0.25)
128 129 130
static int  EqzInit( filter_t *, int );
static void EqzFilter( filter_t *, float *, float *, int, int );
static void EqzClean( filter_t * );
131

132 133 134 135 136 137 138 139
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 * );
140 141 142



143 144 145 146 147
/*****************************************************************************
 * Open:
 *****************************************************************************/
static int Open( vlc_object_t *p_this )
{
148 149
    filter_t     *p_filter = (filter_t *)p_this;
    filter_sys_t *p_sys;
150

151 152
    if( p_filter->fmt_in.audio.i_format != VLC_CODEC_FL32 ||
        p_filter->fmt_out.audio.i_format != VLC_CODEC_FL32 )
153
    {
154 155
        p_filter->fmt_in.audio.i_format = VLC_CODEC_FL32;
        p_filter->fmt_out.audio.i_format = VLC_CODEC_FL32;
156
        msg_Warn( p_filter, "bad input or output format" );
157
        return VLC_EGENERIC;
158
    }
159
    if ( !AOUT_FMTS_SIMILAR( &p_filter->fmt_in.audio, &p_filter->fmt_out.audio ) )
160
    {
161
        memcpy( &p_filter->fmt_out.audio, &p_filter->fmt_in.audio,
162
                sizeof(audio_sample_format_t) );
163 164 165 166
        msg_Warn( p_filter, "input and output formats are not similar" );
        return VLC_EGENERIC;
    }

167
    p_filter->pf_audio_filter = DoWork;
168 169

    /* Allocate structure */
170
    p_sys = p_filter->p_sys = malloc( sizeof( *p_sys ) );
171 172
    if( !p_sys )
        return VLC_ENOMEM;
173

174
    vlc_mutex_init( &p_sys->lock );
175
    if( EqzInit( p_filter, p_filter->fmt_in.audio.i_rate ) != VLC_SUCCESS )
176
    {
177
        vlc_mutex_destroy( &p_sys->lock );
178
        free( p_sys );
179
        return VLC_EGENERIC;
180
    }
181 182 183 184 185 186 187 188 189

    return VLC_SUCCESS;
}

/*****************************************************************************
 * Close: close the plugin
 *****************************************************************************/
static void Close( vlc_object_t *p_this )
{
190 191
    filter_t     *p_filter = (filter_t *)p_this;
    filter_sys_t *p_sys = p_filter->p_sys;
192 193

    EqzClean( p_filter );
194
    vlc_mutex_destroy( &p_sys->lock );
195 196 197 198 199 200 201 202
    free( p_sys );
}

/*****************************************************************************
 * DoWork: process samples buffer
 *****************************************************************************
 *
 *****************************************************************************/
203
static block_t * DoWork( filter_t * p_filter, block_t * p_in_buf )
204
{
205
    EqzFilter( p_filter, (float*)p_in_buf->p_buffer,
206
               (float*)p_in_buf->p_buffer, p_in_buf->i_nb_samples,
207
               aout_FormatNbChannels( &p_filter->fmt_in.audio ) );
208
    return p_in_buf;
209 210 211 212 213 214 215 216 217 218 219 220 221 222 223
}

/*****************************************************************************
 * Equalizer stuff
 *****************************************************************************/
typedef struct
{
    int   i_band;

    struct
    {
        float f_frequency;
        float f_alpha;
        float f_beta;
        float f_gamma;
224
    } band[EQZ_BANDS_MAX];
225

226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278
} 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 );
}

279
static int EqzInit( filter_t *p_filter, int i_rate )
280
{
281
    filter_sys_t *p_sys = p_filter->p_sys;
282 283
    const eqz_config_t *p_cfg;
    int i, ch;
284
    vlc_value_t val1, val2, val3;
285
    vlc_object_t *p_aout = p_filter->p_parent;
286
    int i_ret = VLC_ENOMEM;
287 288 289 290 291 292 293 294 295 296 297 298 299

    /* 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 */
300
        msg_Err( p_filter, "rate not supported" );
301 302 303 304 305 306 307 308
        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) );
Rémi Duraffort's avatar
Rémi Duraffort committed
309
    if( !p_sys->f_alpha || !p_sys->f_beta || !p_sys->f_gamma )
310
        goto error;
Rémi Duraffort's avatar
Rémi Duraffort committed
311

312 313 314 315 316 317 318 319
    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 */
320
    p_sys->b_2eqz = false;
321
    p_sys->f_gamp = 1.0;
Rémi Duraffort's avatar
Rémi Duraffort committed
322 323
    p_sys->f_amp  = malloc( p_sys->i_band * sizeof(float) );
    if( !p_sys->f_amp )
324 325
        goto error;

326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347
    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;
        }
    }

348 349
    var_Create( p_aout, "equalizer-bands", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
    var_Create( p_aout, "equalizer-preset", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
350

351
    p_sys->b_2eqz = var_CreateGetBool( p_aout, "equalizer-2pass" );
352

353
    var_Create( p_aout, "equalizer-preamp", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
354

355 356 357 358
    /* Get initial values */
    var_Get( p_aout, "equalizer-preset", &val1 );
    var_Get( p_aout, "equalizer-bands", &val2 );
    var_Get( p_aout, "equalizer-preamp", &val3 );
359

360
    p_sys->b_first = true;
361 362 363
    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 );
364
    p_sys->b_first = false;
365

366 367
    free( val1.psz_string );

368 369 370
    /* 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 */
371 372 373
    if (p_sys->psz_newbands == NULL)
    {
        msg_Err(p_filter, "No preset selected");
374
        free( val2.psz_string );
Rémi Duraffort's avatar
Rémi Duraffort committed
375
        free( p_sys->f_amp );
376 377
        i_ret = VLC_EGENERIC;
        goto error;
378
    }
379 380 381 382
    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 );
383 384
        if( p_sys->f_newpreamp == p_sys->f_gamp )
            var_SetFloat( p_aout, "equalizer-preamp", p_sys->f_newpreamp );
385
    }
386
    free( val2.psz_string );
387 388 389 390 391

    /* 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 );
392
    var_AddCallback( p_aout, "equalizer-2pass", TwoPassCallback, p_sys );
393 394

    msg_Dbg( p_filter, "equalizer loaded for %d Hz with %d bands %d pass",
395
                        i_rate, p_sys->i_band, p_sys->b_2eqz ? 2 : 1 );
396 397 398 399 400 401 402
    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;
403 404 405 406 407 408

error:
    free( p_sys->f_alpha );
    free( p_sys->f_beta );
    free( p_sys->f_gamma );
    return i_ret;
409 410
}

411
static void EqzFilter( filter_t *p_filter, float *out, float *in,
412
                       int i_samples, int i_channels )
413
{
414
    filter_sys_t *p_sys = p_filter->p_sys;
415 416
    int i, ch, j;

417
    vlc_mutex_lock( &p_sys->lock );
418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470
    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;
    }
471
    vlc_mutex_unlock( &p_sys->lock );
472 473
}

474
static void EqzClean( filter_t *p_filter )
475
{
476 477
    filter_sys_t *p_sys = p_filter->p_sys;
    vlc_object_t *p_aout = p_filter->p_parent;
478

479 480 481 482
    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 );
483

484 485 486 487 488
    free( p_sys->f_alpha );
    free( p_sys->f_beta );
    free( p_sys->f_gamma );

    free( p_sys->f_amp );
489
    free( p_sys->psz_newbands );
490 491 492
}


493
static int PresetCallback( vlc_object_t *p_aout, char const *psz_cmd,
494
                         vlc_value_t oldval, vlc_value_t newval, void *p_data )
495
{
Rafaël Carré's avatar
Rafaël Carré committed
496
    VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
497
    filter_sys_t *p_sys = p_data;
498

499
    const char *psz_preset = newval.psz_string;
500

501
    vlc_mutex_lock( &p_sys->lock );
502
    if( !*psz_preset || p_sys->i_band != 10 )
503 504
    {
        vlc_mutex_unlock( &p_sys->lock );
505
        return VLC_SUCCESS;
506
    }
507

508
    for( unsigned i = 0; eqz_preset_10b[i] != NULL; i++ )
509
    {
510
        if( !strcasecmp( eqz_preset_10b[i]->psz_name, psz_preset ) )
511
        {
512 513 514 515
            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++ )
516
            {
517 518 519 520 521 522 523 524
                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 )
525
                {
526
                    free( psz_newbands );
527
                    vlc_mutex_unlock( &p_sys->lock );
528
                    return VLC_ENOMEM;
529
                }
530
                free( psz_newbands );
531
                psz_newbands = psz;
532
            }
533 534
            if( p_sys->b_first == false )
            {
535
                vlc_mutex_unlock( &p_sys->lock );
536 537 538 539 540 541 542 543 544
                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;
545
                vlc_mutex_unlock( &p_sys->lock );
546 547
            }
            return VLC_SUCCESS;
548 549
        }
    }
Rémi Duraffort's avatar
Rémi Duraffort committed
550
    vlc_mutex_unlock( &p_sys->lock );
551 552 553 554
    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 );
555 556 557 558
    return VLC_SUCCESS;
}

static int PreampCallback( vlc_object_t *p_this, char const *psz_cmd,
559
                         vlc_value_t oldval, vlc_value_t newval, void *p_data )
560
{
Rafaël Carré's avatar
Rafaël Carré committed
561
    VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
562
    filter_sys_t *p_sys = p_data;
563 564 565 566 567

    if( newval.f_float < -20.0 )
        newval.f_float = -20.0;
    else if( newval.f_float > 20.0 )
        newval.f_float = 20.0;
568 569

    vlc_mutex_lock( &p_sys->lock );
570
    p_sys->f_gamp = pow( 10, newval.f_float /20.0);
571
    vlc_mutex_unlock( &p_sys->lock );
572 573 574 575 576

    return VLC_SUCCESS;
}

static int BandsCallback( vlc_object_t *p_this, char const *psz_cmd,
577
                         vlc_value_t oldval, vlc_value_t newval, void *p_data )
578
{
Rafaël Carré's avatar
Rafaël Carré committed
579
    VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
580
    filter_sys_t *p_sys = p_data;
581 582
    const char *psz_bands = newval.psz_string;
    const char *p = psz_bands;
583
    char *psz_next;
584 585

    /* Same thing for bands */
586
    vlc_mutex_lock( &p_sys->lock );
587
    for( int i = 0; i < p_sys->i_band; i++ )
588
    {
589
        float f;
590

591 592 593 594
        if( *psz_bands == '\0' )
            break;

        /* Read dB -20/20 */
595 596
        f = us_strtof( p, &psz_next );

597 598
        if( psz_next == p )
            break; /* no conversion */
599

600
        p_sys->f_amp[i] = EqzConvertdB( f );
601

602 603 604
        if( *psz_next == '\0' )
            break; /* end of line */
        p = &psz_next[1];
605
    }
606
    vlc_mutex_unlock( &p_sys->lock );
607
    return VLC_SUCCESS;
608
}
609 610 611 612
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);
613
    filter_sys_t *p_sys = p_data;
614

615
    vlc_mutex_lock( &p_sys->lock );
616
    p_sys->b_2eqz = newval.b_bool;
617
    vlc_mutex_unlock( &p_sys->lock );
618
    return VLC_SUCCESS;
619
}
620