equalizer.c 20.4 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

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

#define BANDS_TEXT N_( "Bands gain")
61
#define BANDS_LONGTEXT N_( \
62 63
         "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
64
         "e.g. \"0 2 4 2 0 -2 -4 -2 0\"." )
65 66

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

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

73 74 75 76 77 78
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 )
Clément Stenac's avatar
Clément Stenac committed
79

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

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

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

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

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

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

121
    vlc_mutex_t lock;
122
};
123 124 125 126 127

static void DoWork( aout_instance_t *, aout_filter_t *,
                    aout_buffer_t *, aout_buffer_t * );

#define EQZ_IN_FACTOR (0.25)
128
static int  EqzInit( aout_filter_t *, int );
Rafaël Carré's avatar
Rafaël Carré committed
129
static void EqzFilter( aout_filter_t *, float *, float *,
130
                        int, int );
131 132
static void EqzClean( aout_filter_t * );

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



144 145 146 147 148 149 150
/*****************************************************************************
 * Open:
 *****************************************************************************/
static int Open( vlc_object_t *p_this )
{
    aout_filter_t     *p_filter = (aout_filter_t *)p_this;
    aout_filter_sys_t *p_sys;
151
    bool         b_fit = true;
152

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

    if ( ! b_fit )
    {
171 172 173 174
        return VLC_EGENERIC;
    }

    p_filter->pf_do_work = DoWork;
175
    p_filter->b_in_place = true;
176 177 178

    /* Allocate structure */
    p_sys = p_filter->p_sys = malloc( sizeof( aout_filter_sys_t ) );
179 180
    if( !p_sys )
        return VLC_ENOMEM;
181

182
    vlc_mutex_init( &p_sys->lock );
183
    if( EqzInit( p_filter, p_filter->fmt_in.audio.i_rate ) != VLC_SUCCESS )
184
    {
185
        vlc_mutex_destroy( &p_sys->lock );
186
        free( p_sys );
187
        return VLC_EGENERIC;
188
    }
189 190 191 192 193 194 195 196 197 198 199 200 201

    return VLC_SUCCESS;
}

/*****************************************************************************
 * Close: close the plugin
 *****************************************************************************/
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;

    EqzClean( p_filter );
202
    vlc_mutex_destroy( &p_sys->lock );
203 204 205 206 207 208 209 210 211 212 213
    free( p_sys );
}

/*****************************************************************************
 * DoWork: process samples buffer
 *****************************************************************************
 *
 *****************************************************************************/
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 )
{
Rafaël Carré's avatar
Rafaël Carré committed
214
    VLC_UNUSED(p_aout);
215
    p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
216
    p_out_buf->i_buffer = p_in_buf->i_buffer;
217

Rafaël Carré's avatar
Rafaël Carré committed
218
    EqzFilter( p_filter, (float*)p_out_buf->p_buffer,
219
               (float*)p_in_buf->p_buffer, p_in_buf->i_nb_samples,
220
               aout_FormatNbChannels( &p_filter->fmt_in.audio ) );
221 222 223 224 225 226 227 228 229 230 231 232 233 234 235
}

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

    struct
    {
        float f_frequency;
        float f_alpha;
        float f_beta;
        float f_gamma;
236
    } band[EQZ_BANDS_MAX];
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 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295
} 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 );
}

static int EqzInit( aout_filter_t *p_filter, int i_rate )
{
    aout_filter_sys_t *p_sys = p_filter->p_sys;
    const eqz_config_t *p_cfg;
    int i, ch;
296 297
    vlc_value_t val1, val2, val3;
    aout_instance_t *p_aout = (aout_instance_t *)p_filter->p_parent;
298
    int i_ret = VLC_ENOMEM;
299 300 301 302 303 304 305 306 307 308 309 310 311

    /* 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 */
312
        msg_Err( p_filter, "rate not supported" );
313 314 315 316 317 318 319 320
        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
321
    if( !p_sys->f_alpha || !p_sys->f_beta || !p_sys->f_gamma )
322
        goto error;
Rémi Duraffort's avatar
Rémi Duraffort committed
323

324 325 326 327 328 329 330 331
    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 */
332
    p_sys->b_2eqz = false;
333
    p_sys->f_gamp = 1.0;
Rémi Duraffort's avatar
Rémi Duraffort committed
334 335
    p_sys->f_amp  = malloc( p_sys->i_band * sizeof(float) );
    if( !p_sys->f_amp )
336 337
        goto error;

338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359
    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;
        }
    }

360 361
    var_Create( p_aout, "equalizer-bands", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
    var_Create( p_aout, "equalizer-preset", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
362

363
    p_sys->b_2eqz = var_CreateGetBool( p_aout, "equalizer-2pass" );
364

365
    var_Create( p_aout, "equalizer-preamp", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
366

367 368 369 370
    /* Get initial values */
    var_Get( p_aout, "equalizer-preset", &val1 );
    var_Get( p_aout, "equalizer-bands", &val2 );
    var_Get( p_aout, "equalizer-preamp", &val3 );
371

372
    p_sys->b_first = true;
373 374 375
    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 );
376
    p_sys->b_first = false;
377

378 379
    free( val1.psz_string );

380 381 382
    /* 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 */
383 384 385
    if (p_sys->psz_newbands == NULL)
    {
        msg_Err(p_filter, "No preset selected");
386
        free( val2.psz_string );
Rémi Duraffort's avatar
Rémi Duraffort committed
387
        free( p_sys->f_amp );
388 389
        i_ret = VLC_EGENERIC;
        goto error;
390
    }
391 392 393 394
    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 );
395 396
        if( p_sys->f_newpreamp == p_sys->f_gamp )
            var_SetFloat( p_aout, "equalizer-preamp", p_sys->f_newpreamp );
397
    }
398
    free( val2.psz_string );
399 400 401 402 403

    /* 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 );
404
    var_AddCallback( p_aout, "equalizer-2pass", TwoPassCallback, p_sys );
405 406

    msg_Dbg( p_filter, "equalizer loaded for %d Hz with %d bands %d pass",
407
                        i_rate, p_sys->i_band, p_sys->b_2eqz ? 2 : 1 );
408 409 410 411 412 413 414
    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;
415 416 417 418 419 420

error:
    free( p_sys->f_alpha );
    free( p_sys->f_beta );
    free( p_sys->f_gamma );
    return i_ret;
421 422
}

Rafaël Carré's avatar
Rafaël Carré committed
423
static void EqzFilter( aout_filter_t *p_filter, float *out, float *in,
424
                       int i_samples, int i_channels )
425 426 427 428
{
    aout_filter_sys_t *p_sys = p_filter->p_sys;
    int i, ch, j;

429
    vlc_mutex_lock( &p_sys->lock );
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 471 472 473 474 475 476 477 478 479 480 481 482
    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;
    }
483
    vlc_mutex_unlock( &p_sys->lock );
484 485 486 487 488
}

static void EqzClean( aout_filter_t *p_filter )
{
    aout_filter_sys_t *p_sys = p_filter->p_sys;
489
    aout_instance_t *p_aout = (aout_instance_t *)p_filter->p_parent;
490

491 492 493 494
    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 );
495

496 497 498 499 500
    free( p_sys->f_alpha );
    free( p_sys->f_beta );
    free( p_sys->f_gamma );

    free( p_sys->f_amp );
501
    free( p_sys->psz_newbands );
502 503 504 505
}


static int PresetCallback( vlc_object_t *p_this, char const *psz_cmd,
506
                         vlc_value_t oldval, vlc_value_t newval, void *p_data )
507
{
Rafaël Carré's avatar
Rafaël Carré committed
508
    VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
509 510 511
    aout_filter_sys_t *p_sys = (aout_filter_sys_t *)p_data;
    aout_instance_t *p_aout = (aout_instance_t *)p_this;

512
    const char *psz_preset = newval.psz_string;
513

514
    vlc_mutex_lock( &p_sys->lock );
515
    if( !*psz_preset || p_sys->i_band != 10 )
516 517
    {
        vlc_mutex_unlock( &p_sys->lock );
518
        return VLC_SUCCESS;
519
    }
520

521
    for( unsigned i = 0; eqz_preset_10b[i] != NULL; i++ )
522
    {
523
        if( !strcasecmp( eqz_preset_10b[i]->psz_name, psz_preset ) )
524
        {
525 526 527 528
            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++ )
529
            {
530 531 532 533 534 535 536 537
                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 )
538
                {
539
                    free( psz_newbands );
540
                    vlc_mutex_unlock( &p_sys->lock );
541
                    return VLC_ENOMEM;
542
                }
543
                free( psz_newbands );
544
                psz_newbands = psz;
545
            }
546 547
            if( p_sys->b_first == false )
            {
548
                vlc_mutex_unlock( &p_sys->lock );
549 550 551 552 553 554 555 556 557
                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;
558
                vlc_mutex_unlock( &p_sys->lock );
559 560
            }
            return VLC_SUCCESS;
561 562
        }
    }
563 564 565 566
    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 );
567 568 569 570
    return VLC_SUCCESS;
}

static int PreampCallback( vlc_object_t *p_this, char const *psz_cmd,
571
                         vlc_value_t oldval, vlc_value_t newval, void *p_data )
572
{
Rafaël Carré's avatar
Rafaël Carré committed
573
    VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
574 575 576 577 578 579
    aout_filter_sys_t *p_sys = (aout_filter_sys_t *)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;
580 581

    vlc_mutex_lock( &p_sys->lock );
582
    p_sys->f_gamp = pow( 10, newval.f_float /20.0);
583
    vlc_mutex_unlock( &p_sys->lock );
584 585 586 587 588

    return VLC_SUCCESS;
}

static int BandsCallback( vlc_object_t *p_this, char const *psz_cmd,
589
                         vlc_value_t oldval, vlc_value_t newval, void *p_data )
590
{
Rafaël Carré's avatar
Rafaël Carré committed
591
    VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
592
    aout_filter_sys_t *p_sys = (aout_filter_sys_t *)p_data;
593 594
    const char *psz_bands = newval.psz_string;
    const char *p = psz_bands;
595
    char *psz_next;
596 597

    /* Same thing for bands */
598
    vlc_mutex_lock( &p_sys->lock );
599
    for( int i = 0; i < p_sys->i_band; i++ )
600
    {
601
        float f;
602

603 604 605 606
        if( *psz_bands == '\0' )
            break;

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

609 610
        if( psz_next == p )
            break; /* no conversion */
611

612
        p_sys->f_amp[i] = EqzConvertdB( f );
613

614 615 616
        if( *psz_next == '\0' )
            break; /* end of line */
        p = &psz_next[1];
617
    }
618
    vlc_mutex_unlock( &p_sys->lock );
619
    return VLC_SUCCESS;
620
}
621 622 623 624 625 626
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;

627
    vlc_mutex_lock( &p_sys->lock );
628
    p_sys->b_2eqz = newval.b_bool;
629
    vlc_mutex_unlock( &p_sys->lock );
630
    return VLC_SUCCESS;
631
}
632