/*****************************************************************************
* equalizer.c:
*****************************************************************************
- * Copyright (C) 2004, 2006 the VideoLAN team
+ * Copyright (C) 2004-2009 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
#include <vlc_common.h>
#include <vlc_plugin.h>
+#include <vlc_charset.h>
-#include "vlc_aout.h"
+#include <vlc_aout.h>
#include "equalizer_presets.h"
/* TODO:
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,
+ add_bool( "equalizer-2pass", false, NULL, TWOPASS_TEXT,
TWOPASS_LONGTEXT, true )
add_float( "equalizer-preamp", 12.0, NULL, PREAMP_TEXT,
PREAMP_LONGTEXT, true )
float x2[32][2];
float y2[32][128][2];
+ vlc_mutex_t lock;
};
static void DoWork( aout_instance_t *, aout_filter_t *,
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 * );
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->fmt_in.audio.i_format != VLC_CODEC_FL32 ||
+ p_filter->fmt_out.audio.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->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" );
}
- if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
+ if ( !AOUT_FMTS_SIMILAR( &p_filter->fmt_in.audio, &p_filter->fmt_out.audio ) )
{
b_fit = false;
- memcpy( &p_filter->output, &p_filter->input,
+ 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" );
}
if( !p_sys )
return VLC_ENOMEM;
- if( EqzInit( p_filter, p_filter->input.i_rate ) != VLC_SUCCESS )
+ 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;
}
aout_filter_sys_t *p_sys = p_filter->p_sys;
EqzClean( p_filter );
+ vlc_mutex_destroy( &p_sys->lock );
free( p_sys );
}
{
VLC_UNUSED(p_aout);
p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
- p_out_buf->i_nb_bytes = p_in_buf->i_nb_bytes;
+ p_out_buf->i_buffer = p_in_buf->i_buffer;
EqzFilter( p_filter, (float*)p_out_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 ) );
}
/*****************************************************************************
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 )
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++ )
{
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;
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 )
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 );
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,
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++ )
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 );
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;
+ const char *psz_preset = newval.psz_string;
+ vlc_mutex_lock( &p_sys->lock );
if( !*psz_preset || p_sys->i_band != 10 )
+ {
+ vlc_mutex_unlock( &p_sys->lock );
return VLC_SUCCESS;
+ }
for( unsigned i = 0; eqz_preset_10b[i] != NULL; i++ )
{
d.quot, d.rem ) == -1 )
{
free( psz_newbands );
+ vlc_mutex_unlock( &p_sys->lock );
return VLC_ENOMEM;
}
+ free( psz_newbands );
psz_newbands = psz;
}
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 );
{
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;
}
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;
}
{
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;
break;
/* Read dB -20/20 */
- f = strtof( p, &psz_next );
+ f = us_strtof( p, &psz_next );
+
if( psz_next == p )
break; /* no conversion */
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;
}
projects / vlc / blobdiff