From ff981aa096c52e5c44dd33de43feec9a0058e2a9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 27 Sep 2009 21:01:03 +0300 Subject: [PATCH] ugly resampler: switch to audio filter2 --- modules/audio_filter/resampler/ugly.c | 45 ++++++++++++--------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/modules/audio_filter/resampler/ugly.c b/modules/audio_filter/resampler/ugly.c index 66d0e7868a..71298a0be9 100644 --- a/modules/audio_filter/resampler/ugly.c +++ b/modules/audio_filter/resampler/ugly.c @@ -32,21 +32,21 @@ #include #include #include +#include /***************************************************************************** * Local prototypes *****************************************************************************/ static int Create ( vlc_object_t * ); -static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, - aout_buffer_t * ); +static block_t *DoWork( filter_t *, block_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ vlc_module_begin () set_description( N_("Audio filter for ugly resampling") ) - set_capability( "audio filter", 2 ) + set_capability( "audio filter2", 2 ) set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_MISC ) set_callbacks( Create, NULL ) @@ -57,7 +57,7 @@ vlc_module_end () *****************************************************************************/ static int Create( vlc_object_t *p_this ) { - aout_filter_t * p_filter = (aout_filter_t *)p_this; + filter_t * p_filter = (filter_t *)p_this; if ( p_filter->fmt_in.audio.i_rate == p_filter->fmt_out.audio.i_rate || p_filter->fmt_in.audio.i_format != p_filter->fmt_out.audio.i_format @@ -71,44 +71,36 @@ static int Create( vlc_object_t *p_this ) return VLC_EGENERIC; } - p_filter->pf_do_work = DoWork; - - /* We don't want a new buffer to be created because we're not sure we'll - * actually need to resample anything. */ - p_filter->b_in_place = true; - + p_filter->pf_audio_filter = DoWork; return VLC_SUCCESS; } /***************************************************************************** * DoWork: convert a 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 ) +static block_t *DoWork( filter_t * p_filter, block_t * p_in_buf ) { - int32_t *p_out = (int32_t*)p_out_buf->p_buffer; + /* Check if we really need to run the resampler */ + if( p_filter->fmt_out.audio.i_rate == p_filter->fmt_in.audio.i_rate ) + return p_in_buf; unsigned int i_nb_channels = aout_FormatNbChannels( &p_filter->fmt_in.audio ); unsigned int i_in_nb = p_in_buf->i_nb_samples; unsigned int i_out_nb = i_in_nb * p_filter->fmt_out.audio.i_rate / p_filter->fmt_in.audio.i_rate; unsigned int i_sample_bytes = i_nb_channels * sizeof(int32_t); - unsigned int i_out, i_chan, i_remainder = 0; - /* Check if we really need to run the resampler */ - if( p_aout->mixer_format.i_rate == p_filter->fmt_in.audio.i_rate ) - { - return; - } + block_t *p_out_buf = block_Alloc( i_out_nb * i_sample_bytes ); + if( !p_out_buf ) + goto out; - int32_t p_in_orig[p_in_buf->i_buffer / sizeof(int32_t)], - *p_in = p_in_orig; - - vlc_memcpy( p_in, p_in_buf->p_buffer, p_in_buf->i_buffer ); + int32_t *p_out = (int32_t*)p_out_buf->p_buffer; + const int32_t *p_in = (int32_t*)p_in_buf->p_buffer; + unsigned int i_remainder = 0; - for( i_out = i_out_nb ; i_out-- ; ) + for( unsigned i_out = i_out_nb ; i_out-- ; ) { - for( i_chan = i_nb_channels ; i_chan ; ) + for( unsigned i_chan = i_nb_channels ; i_chan ; ) { i_chan--; p_out[i_chan] = p_in[i_chan]; @@ -128,4 +120,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, p_out_buf->i_pts = p_in_buf->i_pts; p_out_buf->i_length = p_out_buf->i_nb_samples * 1000000 / p_filter->fmt_out.audio.i_rate; +out: + block_Release( p_in_buf ); + return p_out_buf; } -- 2.39.2