#include <vlc_charset.h>
#include <vlc_aout.h>
+#include <vlc_filter.h>
#include "equalizer_presets.h"
/* TODO:
#define BANDS_LONGTEXT N_( \
"Don't use presets, but manually specified bands. You need to " \
"provide 10 values between -20dB and 20dB, separated by spaces, " \
- "e.g. \"0 2 4 2 0 -2 -4 -2 0\"." )
+ "e.g. \"0 2 4 2 0 -2 -4 -2 0 2\"." )
#define TWOPASS_TEXT N_( "Two pass" )
#define TWOPASS_LONGTEXT N_( "Filter the audio twice. This provides a more " \
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_AFILTER )
- add_string( "equalizer-preset", "flat", NULL, PRESET_TEXT,
+ add_string( "equalizer-preset", "flat", PRESET_TEXT,
PRESET_LONGTEXT, false )
change_string_list( preset_list, preset_list_text, 0 )
- add_string( "equalizer-bands", NULL, NULL, BANDS_TEXT,
+ add_string( "equalizer-bands", NULL, BANDS_TEXT,
BANDS_LONGTEXT, true )
- add_bool( "equalizer-2pass", false, NULL, TWOPASS_TEXT,
+ add_bool( "equalizer-2pass", false, TWOPASS_TEXT,
TWOPASS_LONGTEXT, true )
- add_float( "equalizer-preamp", 12.0, NULL, PREAMP_TEXT,
+ add_float( "equalizer-preamp", 12.0, PREAMP_TEXT,
PREAMP_LONGTEXT, true )
set_callbacks( Open, Close )
add_shortcut( "equalizer" )
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-struct aout_filter_sys_t
+struct filter_sys_t
{
/* Filter static config */
int i_band;
vlc_mutex_t lock;
};
-static void DoWork( aout_instance_t *, aout_filter_t *,
- aout_buffer_t *, aout_buffer_t * );
+static block_t *DoWork( filter_t *, block_t * );
#define EQZ_IN_FACTOR (0.25)
-static int EqzInit( aout_filter_t *, int );
-static void EqzFilter( aout_filter_t *, float *, float *,
- int, int );
-static void EqzClean( aout_filter_t * );
+static int EqzInit( filter_t *, int );
+static void EqzFilter( filter_t *, float *, float *, int, int );
+static void EqzClean( filter_t * );
static int PresetCallback ( vlc_object_t *, char const *, vlc_value_t,
vlc_value_t, void * );
*****************************************************************************/
static int Open( vlc_object_t *p_this )
{
- aout_filter_t *p_filter = (aout_filter_t *)p_this;
- aout_filter_sys_t *p_sys;
- bool b_fit = true;
+ filter_t *p_filter = (filter_t *)p_this;
+ filter_sys_t *p_sys;
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->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" );
+ return VLC_EGENERIC;
}
if ( !AOUT_FMTS_SIMILAR( &p_filter->fmt_in.audio, &p_filter->fmt_out.audio ) )
{
- b_fit = false;
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 ( ! b_fit )
- {
return VLC_EGENERIC;
}
- p_filter->pf_do_work = DoWork;
- p_filter->b_in_place = true;
+ p_filter->pf_audio_filter = DoWork;
/* Allocate structure */
- p_sys = p_filter->p_sys = malloc( sizeof( aout_filter_sys_t ) );
+ p_sys = p_filter->p_sys = malloc( sizeof( *p_sys ) );
if( !p_sys )
return VLC_ENOMEM;
*****************************************************************************/
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;
+ filter_t *p_filter = (filter_t *)p_this;
+ filter_sys_t *p_sys = p_filter->p_sys;
EqzClean( p_filter );
vlc_mutex_destroy( &p_sys->lock );
*****************************************************************************
*
*****************************************************************************/
-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 )
+static block_t * DoWork( filter_t * p_filter, block_t * p_in_buf )
{
- VLC_UNUSED(p_aout);
- p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
- p_out_buf->i_buffer = p_in_buf->i_buffer;
-
- EqzFilter( p_filter, (float*)p_out_buf->p_buffer,
+ EqzFilter( p_filter, (float*)p_in_buf->p_buffer,
(float*)p_in_buf->p_buffer, p_in_buf->i_nb_samples,
aout_FormatNbChannels( &p_filter->fmt_in.audio ) );
+ return p_in_buf;
}
/*****************************************************************************
return EQZ_IN_FACTOR * ( pow( 10, db / 20.0 ) - 1.0 );
}
-static int EqzInit( aout_filter_t *p_filter, int i_rate )
+static int EqzInit( filter_t *p_filter, int i_rate )
{
- aout_filter_sys_t *p_sys = p_filter->p_sys;
+ filter_sys_t *p_sys = p_filter->p_sys;
const eqz_config_t *p_cfg;
int i, ch;
vlc_value_t val1, val2, val3;
- aout_instance_t *p_aout = (aout_instance_t *)p_filter->p_parent;
+ vlc_object_t *p_aout = p_filter->p_parent;
int i_ret = VLC_ENOMEM;
/* Select the config */
return i_ret;
}
-static void EqzFilter( aout_filter_t *p_filter, float *out, float *in,
+static void EqzFilter( filter_t *p_filter, float *out, float *in,
int i_samples, int i_channels )
{
- aout_filter_sys_t *p_sys = p_filter->p_sys;
+ filter_sys_t *p_sys = p_filter->p_sys;
int i, ch, j;
vlc_mutex_lock( &p_sys->lock );
vlc_mutex_unlock( &p_sys->lock );
}
-static void EqzClean( aout_filter_t *p_filter )
+static void EqzClean( 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;
+ filter_sys_t *p_sys = p_filter->p_sys;
+ vlc_object_t *p_aout = p_filter->p_parent;
var_DelCallback( p_aout, "equalizer-bands", BandsCallback, p_sys );
var_DelCallback( p_aout, "equalizer-preset", PresetCallback, p_sys );
}
-static int PresetCallback( vlc_object_t *p_this, char const *psz_cmd,
+static int PresetCallback( vlc_object_t *p_aout, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
- aout_filter_sys_t *p_sys = (aout_filter_sys_t *)p_data;
- aout_instance_t *p_aout = (aout_instance_t *)p_this;
+ filter_sys_t *p_sys = p_data;
const char *psz_preset = newval.psz_string;
return VLC_SUCCESS;
}
- for( unsigned i = 0; eqz_preset_10b[i] != NULL; i++ )
+ for( unsigned i = 0; i < NB_PRESETS; 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 );
+ p_sys->f_gamp *= pow( 10, eqz_preset_10b[i].f_preamp / 20.0 );
for( int j = 0; j < p_sys->i_band; j++ )
{
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 );
+ 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 )
free( psz_newbands );
psz_newbands = psz;
}
- if( p_sys->b_first == false )
+ if( !p_sys->b_first )
{
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 );
+ 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;
+ p_sys->f_newpreamp = eqz_preset_10b[i].f_preamp;
vlc_mutex_unlock( &p_sys->lock );
}
return VLC_SUCCESS;
}
}
+ vlc_mutex_unlock( &p_sys->lock );
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 );
+ for( unsigned i = 0; i < NB_PRESETS; i++ )
+ msg_Info( p_aout, " - '%s'", eqz_preset_10b[i].psz_name );
return VLC_SUCCESS;
}
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;
+ filter_sys_t *p_sys = p_data;
if( newval.f_float < -20.0 )
newval.f_float = -20.0;
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;
+ filter_sys_t *p_sys = p_data;
const char *psz_bands = newval.psz_string;
const char *p = psz_bands;
char *psz_next;
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;
+ filter_sys_t *p_sys = p_data;
vlc_mutex_lock( &p_sys->lock );
p_sys->b_2eqz = newval.b_bool;
projects / vlc / blobdiff