[vlc-devel] commit: MAD: remove audio filter support (untested) ( Rémi Denis-Courmont )
git version control
git at videolan.org
Wed Sep 30 17:55:38 CEST 2009
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Sep 30 18:55:24 2009 +0300| [aafb764b9c77baafe380c552c2fae21c5cc07f8a] | committer: Rémi Denis-Courmont
MAD: remove audio filter support (untested)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=aafb764b9c77baafe380c552c2fae21c5cc07f8a
---
modules/audio_filter/converter/mpgatofixed32.c | 102 ++----------------------
1 files changed, 8 insertions(+), 94 deletions(-)
diff --git a/modules/audio_filter/converter/mpgatofixed32.c b/modules/audio_filter/converter/mpgatofixed32.c
index 0a046ed..74c64a1 100644
--- a/modules/audio_filter/converter/mpgatofixed32.c
+++ b/modules/audio_filter/converter/mpgatofixed32.c
@@ -43,11 +43,6 @@
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static int Create ( vlc_object_t * );
-static void Destroy ( vlc_object_t * );
-static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
- aout_buffer_t * );
-
static int OpenFilter ( vlc_object_t * );
static void CloseFilter( vlc_object_t * );
static block_t *Convert( filter_t *, block_t * );
@@ -71,62 +66,17 @@ vlc_module_begin ()
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACODEC )
set_description( N_("MPEG audio decoder") )
- set_capability( "audio filter", 100 )
- set_callbacks( Create, Destroy )
-
- add_submodule ()
- set_description( N_("MPEG audio decoder") )
set_capability( "audio filter2", 100 )
set_callbacks( OpenFilter, CloseFilter )
vlc_module_end ()
/*****************************************************************************
- * Create:
- *****************************************************************************/
-static int Create( vlc_object_t *p_this )
-{
- aout_filter_t *p_filter = (aout_filter_t *)p_this;
- struct filter_sys_t *p_sys;
-
- if ( (p_filter->fmt_in.audio.i_format != VLC_CODEC_MPGA
- && p_filter->fmt_in.audio.i_format != VLC_FOURCC('m','p','g','3'))
- || (p_filter->fmt_out.audio.i_format != VLC_CODEC_FL32
- && p_filter->fmt_out.audio.i_format != VLC_CODEC_FI32) )
- {
- return -1;
- }
-
- if ( !AOUT_FMTS_SIMILAR( &p_filter->fmt_in.audio, &p_filter->fmt_out.audio ) )
- {
- return -1;
- }
-
- /* Allocate the memory needed to store the module's structure */
- p_sys = malloc( sizeof(filter_sys_t) );
- p_filter->p_sys = (struct aout_filter_sys_t *)p_sys;
- if( p_sys == NULL )
- return -1;
-
- /* Initialize libmad */
- mad_stream_init( &p_sys->mad_stream );
- mad_frame_init( &p_sys->mad_frame );
- mad_synth_init( &p_sys->mad_synth );
- mad_stream_options( &p_sys->mad_stream, MAD_OPTION_IGNORECRC );
- p_sys->i_reject_count = 0;
-
- p_filter->pf_do_work = DoWork;
- p_filter->b_in_place = 0;
-
- return 0;
-}
-
-/*****************************************************************************
* DoWork: decode an MPEG audio frame.
*****************************************************************************/
-static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
+static void DoWork( filter_t * p_filter,
aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
{
- filter_sys_t *p_sys = (filter_sys_t *)p_filter->p_sys;
+ filter_sys_t *p_sys = p_filter->p_sys;
p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
p_out_buf->i_buffer = p_in_buf->i_nb_samples * sizeof(vlc_fixed_t) *
@@ -137,7 +87,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
p_in_buf->i_buffer );
if ( mad_frame_decode( &p_sys->mad_frame, &p_sys->mad_stream ) == -1 )
{
- msg_Dbg( p_aout, "libmad error: %s",
+ msg_Dbg( p_filter, "libmad error: %s",
mad_stream_errorstr( &p_sys->mad_stream ) );
p_sys->i_reject_count = 3;
}
@@ -218,7 +168,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
break;
default:
- msg_Err( p_aout, "cannot interleave %i channels",
+ msg_Err( p_filter, "cannot interleave %i channels",
p_pcm->channels );
}
}
@@ -277,27 +227,13 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
break;
default:
- msg_Err( p_aout, "cannot interleave %i channels",
+ msg_Err( p_filter, "cannot interleave %i channels",
p_pcm->channels );
}
}
}
/*****************************************************************************
- * Destroy : deallocate data structures
- *****************************************************************************/
-static void Destroy( vlc_object_t *p_this )
-{
- aout_filter_t *p_filter = (aout_filter_t *)p_this;
- filter_sys_t *p_sys = (filter_sys_t *)p_filter->p_sys;
-
- mad_synth_finish( &p_sys->mad_synth );
- mad_frame_finish( &p_sys->mad_frame );
- mad_stream_finish( &p_sys->mad_stream );
- free( p_sys );
-}
-
-/*****************************************************************************
* OpenFilter:
*****************************************************************************/
static int OpenFilter( vlc_object_t *p_this )
@@ -359,11 +295,6 @@ static void CloseFilter( vlc_object_t *p_this )
static block_t *Convert( filter_t *p_filter, block_t *p_block )
{
- aout_filter_t aout_filter;
- aout_buffer_t in_buf, out_buf;
- block_t *p_out;
- int i_out_size;
-
if( !p_block || !p_block->i_nb_samples )
{
if( p_block )
@@ -371,11 +302,11 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
return NULL;
}
- i_out_size = p_block->i_nb_samples *
+ size_t i_out_size = p_block->i_nb_samples *
p_filter->fmt_out.audio.i_bitspersample *
p_filter->fmt_out.audio.i_channels / 8;
- p_out = p_filter->pf_audio_buffer_new( p_filter, i_out_size );
+ block_t *p_out = p_filter->pf_audio_buffer_new( p_filter, i_out_size );
if( !p_out )
{
msg_Warn( p_filter, "can't get output buffer" );
@@ -388,26 +319,9 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
p_out->i_pts = p_block->i_pts;
p_out->i_length = p_block->i_length;
- aout_filter.p_sys = (struct aout_filter_sys_t *)p_filter->p_sys;
- aout_filter.fmt_in.audio = p_filter->fmt_in.audio;
- aout_filter.fmt_in.audio.i_format = p_filter->fmt_in.i_codec;
- aout_filter.fmt_out.audio = p_filter->fmt_out.audio;
- aout_filter.fmt_out.audio.i_format = p_filter->fmt_out.i_codec;
-
- in_buf.p_buffer = p_block->p_buffer;
- in_buf.i_flags = 0;
- in_buf.i_buffer = p_block->i_buffer;
- in_buf.i_nb_samples = p_block->i_nb_samples;
- out_buf.p_buffer = p_out->p_buffer;
- out_buf.i_buffer = p_out->i_buffer;
- out_buf.i_nb_samples = p_out->i_nb_samples;
-
- DoWork( (aout_instance_t *)p_filter, &aout_filter, &in_buf, &out_buf );
+ DoWork( p_filter, p_block, p_out );
block_Release( p_block );
- p_out->i_buffer = out_buf.i_buffer;
- p_out->i_nb_samples = out_buf.i_nb_samples;
-
return p_out;
}
More information about the vlc-devel
mailing list