X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_filter%2Fparam_eq.c;h=0ce26fbcd4ebaae395049610723be27f7123af0a;hb=764c154205ac934bca42267ed3c577ef9c8c1d2a;hp=88163f1f9f6f37efaacb6d70a2ebbbe20507926e;hpb=337c8691c2e5576e679bbf2e3c4f10306a75a2ae;p=vlc diff --git a/modules/audio_filter/param_eq.c b/modules/audio_filter/param_eq.c index 88163f1f9f..0ce26fbcd4 100644 --- a/modules/audio_filter/param_eq.c +++ b/modules/audio_filter/param_eq.c @@ -35,6 +35,7 @@ #include #include #include +#include /***************************************************************************** * Module descriptor @@ -43,38 +44,38 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); static void CalcPeakEQCoeffs( float, float, float, float, float * ); static void CalcShelfEQCoeffs( float, float, float, int, float, float * ); -static void ProcessEQ( float *, float *, float *, unsigned, unsigned, float *, unsigned ); -static void DoWork( aout_instance_t *, aout_filter_t *, - aout_buffer_t *, aout_buffer_t * ); +static void ProcessEQ( const float *, float *, float *, unsigned, unsigned, + const float *, unsigned ); +static block_t *DoWork( filter_t *, block_t * ); vlc_module_begin () set_description( N_("Parametric Equalizer") ) set_shortname( N_("Parametric Equalizer" ) ) - set_capability( "audio filter", 0 ) + set_capability( "audio filter2", 0 ) set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_AFILTER ) add_float( "param-eq-lowf", 100, NULL, N_("Low freq (Hz)"),"", false ) add_float_with_range( "param-eq-lowgain", 0, -20.0, 20.0, NULL, - N_("Low freq gain (dB)"), "",false ); + N_("Low freq gain (dB)"), "",false ) add_float( "param-eq-highf", 10000, NULL, N_("High freq (Hz)"),"", false ) add_float_with_range( "param-eq-highgain", 0, -20.0, 20.0, NULL, - N_("High freq gain (dB)"),"",false ); + N_("High freq gain (dB)"),"",false ) add_float( "param-eq-f1", 300, NULL, N_("Freq 1 (Hz)"),"", false ) add_float_with_range( "param-eq-gain1", 0, -20.0, 20.0, NULL, - N_("Freq 1 gain (dB)"), "",false ); + N_("Freq 1 gain (dB)"), "",false ) add_float_with_range( "param-eq-q1", 3, 0.1, 100.0, NULL, - N_("Freq 1 Q"), "",false ); + N_("Freq 1 Q"), "",false ) add_float( "param-eq-f2", 1000, NULL, N_("Freq 2 (Hz)"),"", false ) add_float_with_range( "param-eq-gain2", 0, -20.0, 20.0, NULL, - N_("Freq 2 gain (dB)"),"",false ); + N_("Freq 2 gain (dB)"),"",false ) add_float_with_range( "param-eq-q2", 3, 0.1, 100.0, NULL, - N_("Freq 2 Q"),"",false ); + N_("Freq 2 Q"),"",false ) add_float( "param-eq-f3", 3000, NULL, N_("Freq 3 (Hz)"),"", false ) add_float_with_range( "param-eq-gain3", 0, -20.0, 20.0, NULL, - N_("Freq 3 gain (dB)"),"",false ); + N_("Freq 3 gain (dB)"),"",false ) add_float_with_range( "param-eq-q3", 3, 0.1, 100.0, NULL, - N_("Freq 3 Q"),"",false ); + N_("Freq 3 Q"),"",false ) set_callbacks( Open, Close ) vlc_module_end () @@ -82,7 +83,7 @@ vlc_module_end () /***************************************************************************** * Local prototypes *****************************************************************************/ -struct aout_filter_sys_t +struct filter_sys_t { /* Filter static config */ float f_lowf, f_lowgain; @@ -94,7 +95,6 @@ struct aout_filter_sys_t float coeffs[5*5]; /* State */ float *p_state; - }; @@ -105,23 +105,23 @@ struct aout_filter_sys_t *****************************************************************************/ static int Open( vlc_object_t *p_this ) { - aout_filter_t *p_filter = (aout_filter_t *)p_this; - aout_filter_sys_t *p_sys; + filter_t *p_filter = (filter_t *)p_this; + filter_sys_t *p_sys; bool b_fit = true; - int i_samplerate; + unsigned i_samplerate; - 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" ); } @@ -131,11 +131,12 @@ static int Open( vlc_object_t *p_this ) return VLC_EGENERIC; } - p_filter->pf_do_work = DoWork; - p_filter->b_in_place = true; - /* 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_EGENERIC; + + p_filter->pf_audio_filter = DoWork; p_sys->f_lowf = config_GetFloat( p_this, "param-eq-lowf"); p_sys->f_lowgain = config_GetFloat( p_this, "param-eq-lowgain"); @@ -155,7 +156,7 @@ static int Open( vlc_object_t *p_this ) p_sys->f_gain3 = config_GetFloat( p_this, "param-eq-gain3"); - i_samplerate = p_filter->input.i_rate; + i_samplerate = p_filter->fmt_in.audio.i_rate; CalcPeakEQCoeffs(p_sys->f_f1, p_sys->f_Q1, p_sys->f_gain1, i_samplerate, p_sys->coeffs+0*5); CalcPeakEQCoeffs(p_sys->f_f2, p_sys->f_Q2, p_sys->f_gain2, @@ -166,7 +167,7 @@ static int Open( vlc_object_t *p_this ) i_samplerate, p_sys->coeffs+3*5); CalcShelfEQCoeffs(p_sys->f_highf, 1, p_sys->f_highgain, 0, i_samplerate, p_sys->coeffs+4*5); - p_sys->p_state = (float*)calloc( p_filter->input.i_channels*5*4, + p_sys->p_state = (float*)calloc( p_filter->fmt_in.audio.i_channels*5*4, sizeof(float) ); return VLC_SUCCESS; @@ -174,7 +175,7 @@ static int Open( vlc_object_t *p_this ) static void Close( vlc_object_t *p_this ) { - aout_filter_t *p_filter = (aout_filter_t *)p_this; + filter_t *p_filter = (filter_t *)p_this; free( p_filter->p_sys->p_state ); free( p_filter->p_sys ); } @@ -184,17 +185,13 @@ static void Close( vlc_object_t *p_this ) ***************************************************************************** * *****************************************************************************/ -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_nb_bytes = p_in_buf->i_nb_bytes; - - ProcessEQ( (float*)p_in_buf->p_buffer, (float*)p_out_buf->p_buffer, + ProcessEQ( (float*)p_in_buf->p_buffer, (float*)p_in_buf->p_buffer, p_filter->p_sys->p_state, - p_filter->input.i_channels, p_in_buf->i_nb_samples, + p_filter->fmt_in.audio.i_channels, p_in_buf->i_nb_samples, p_filter->p_sys->coeffs, 5 ); + return p_in_buf; } /* @@ -305,23 +302,22 @@ static void CalcShelfEQCoeffs( float f0, float slope, float gainDB, int high, samples is not premultiplied by channels size of coeffs is 5*eqCount */ -void ProcessEQ( float *src, float *dest, float *state, - unsigned channels, unsigned samples, float *coeffs, +void ProcessEQ( const float *src, float *dest, float *state, + unsigned channels, unsigned samples, const float *coeffs, unsigned eqCount ) { unsigned i, chn, eq; float b0, b1, b2, a1, a2; float x, y = 0; - float *src1, *dest1; - float *coeffs1, *state1; - src1 = src; - dest1 = dest; + const float *src1 = src; + float *dest1 = dest; + for (i = 0; i < samples; i++) { - state1 = state; + float *state1 = state; for (chn = 0; chn < channels; chn++) { - coeffs1 = coeffs; + const float *coeffs1 = coeffs; x = *src1++; /* Direct form 1 IIRs */ for (eq = 0; eq < eqCount; eq++)