X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_filter%2Fconverter%2Fmpgatofixed32.c;h=6e6becefe8ff7fcd2acabaf3f014623aa3897af7;hb=69aa24b519f682bd43d628e1ab7ca9c960a6c7d9;hp=7d22146f0503fd551e77229fc79ac1d6670960ed;hpb=af802781651cfd7d740a6384547cc489e8725bc1;p=vlc diff --git a/modules/audio_filter/converter/mpgatofixed32.c b/modules/audio_filter/converter/mpgatofixed32.c index 7d22146f05..6e6becefe8 100644 --- a/modules/audio_filter/converter/mpgatofixed32.c +++ b/modules/audio_filter/converter/mpgatofixed32.c @@ -2,95 +2,175 @@ * mpgatofixed32.c: MPEG-1 & 2 audio layer I, II, III + MPEG 2.5 decoder, * using MAD (MPEG Audio Decoder) ***************************************************************************** - * Copyright (C) 2001 by Jean-Paul Saman - * $Id: mpgatofixed32.c,v 1.5 2003/02/21 14:17:46 hartman Exp $ + * Copyright (C) 2001-2005 VLC authors and VideoLAN + * $Id$ * * Authors: Christophe Massiot - * Jean-Paul Saman - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * Jean-Paul Saman + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + *****************************************************************************/ + +/***************************************************************************** + * NOTA BENE: this module requires the linking against a library which is + * known to require licensing under the GNU General Public License version 2 + * (or later). Therefore, the result of compiling this module will normally + * be subject to the terms of that later license. *****************************************************************************/ + /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include /* strdup() */ #include -#include -#include "audio_output.h" -#include "aout_internal.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif +#include + +#include +#include +#include +#include +#include /***************************************************************************** * 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 * ); /***************************************************************************** * Local structures *****************************************************************************/ -struct aout_filter_sys_t +struct filter_sys_t { struct mad_stream mad_stream; - struct mad_frame mad_frame; - struct mad_synth mad_synth; + struct mad_frame mad_frame; + struct mad_synth mad_synth; + + int i_reject_count; }; /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - add_category_hint( N_("Miscellaneous"), NULL, VLC_TRUE ); - set_description( _("MPEG audio decoder module") ); - set_capability( "audio filter", 100 ); - set_callbacks( Create, Destroy ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACODEC ) + set_description( N_("MPEG audio decoder") ) + set_capability( "audio converter", 100 ) + set_callbacks( OpenFilter, CloseFilter ) +vlc_module_end () /***************************************************************************** - * Create: + * DoWork: decode an MPEG audio frame. *****************************************************************************/ -static int Create( vlc_object_t * _p_filter ) +static void DoWork( filter_t * p_filter, + block_t * p_in_buf, block_t * p_out_buf ) { - aout_filter_t * p_filter = (aout_filter_t *)_p_filter; - struct aout_filter_sys_t * 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(float) * + aout_FormatNbChannels( &p_filter->fmt_out.audio ); - if ( (p_filter->input.i_format != VLC_FOURCC('m','p','g','a') - && p_filter->input.i_format != VLC_FOURCC('m','p','g','3')) - || (p_filter->output.i_format != VLC_FOURCC('f','l','3','2') - && p_filter->output.i_format != VLC_FOURCC('f','i','3','2')) ) + /* Do the actual decoding now. */ + mad_stream_buffer( &p_sys->mad_stream, p_in_buf->p_buffer, + p_in_buf->i_buffer ); + if ( mad_frame_decode( &p_sys->mad_frame, &p_sys->mad_stream ) == -1 ) { - return -1; + msg_Dbg( p_filter, "libmad error: %s", + mad_stream_errorstr( &p_sys->mad_stream ) ); + p_sys->i_reject_count = 3; + } + else if( p_in_buf->i_flags & BLOCK_FLAG_DISCONTINUITY ) + { + p_sys->i_reject_count = 3; } - if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) ) + if( p_sys->i_reject_count > 0 ) { - return -1; + memset( p_out_buf->p_buffer, 0, p_out_buf->i_buffer ); + p_sys->i_reject_count--; + return; + } + + + mad_synth_frame( &p_sys->mad_synth, &p_sys->mad_frame ); + + struct mad_pcm * p_pcm = &p_sys->mad_synth.pcm; + unsigned int i_samples = p_pcm->length; + mad_fixed_t const * p_left = p_pcm->samples[0]; + mad_fixed_t const * p_right = p_pcm->samples[1]; + float *p_samples = (float *)p_out_buf->p_buffer; + + assert( i_samples == p_out_buf->i_nb_samples ); + /* Interleave and keep buffers in mad_fixed_t format */ + if ( p_pcm->channels == 2 ) + { + while ( i_samples-- ) + { + //assert( *p_left < MAD_F_ONE ); + //assert( *p_left >= -MAD_F_ONE ); + //assert( *p_right < MAD_F_ONE ); + //assert( *p_right >= -MAD_F_ONE ); + *p_samples++ = (float)*p_left++ / (float)MAD_F_ONE; + *p_samples++ = (float)*p_right++ / (float)MAD_F_ONE; + } + } + else + { + assert( p_pcm->channels == 1 ); + while ( i_samples-- ) + { + //assert( *p_left < MAD_F_ONE ); + //assert( *p_left >= -MAD_F_ONE ); + *p_samples++ = (float)*p_left++ / (float)MAD_F_ONE; + } } +} + +/***************************************************************************** + * OpenFilter: + *****************************************************************************/ +static int OpenFilter( vlc_object_t *p_this ) +{ + filter_t *p_filter = (filter_t *)p_this; + 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') ) + return VLC_EGENERIC; + + if( p_filter->fmt_out.audio.i_format != VLC_CODEC_FL32 ) + return VLC_EGENERIC; + + if( !AOUT_FMTS_SIMILAR( &p_filter->fmt_in.audio, &p_filter->fmt_out.audio ) ) + return VLC_EGENERIC; /* Allocate the memory needed to store the module's structure */ - p_sys = p_filter->p_sys = malloc( sizeof(struct aout_filter_sys_t) ); + p_sys = p_filter->p_sys = malloc( sizeof(filter_sys_t) ); if( p_sys == NULL ) - { - msg_Err( p_filter, "out of memory" ); return -1; - } + p_sys->i_reject_count = 0; + + p_filter->pf_audio_filter = Convert; /* Initialize libmad */ mad_stream_init( &p_sys->mad_stream ); @@ -98,119 +178,57 @@ static int Create( vlc_object_t * _p_filter ) mad_synth_init( &p_sys->mad_synth ); mad_stream_options( &p_sys->mad_stream, MAD_OPTION_IGNORECRC ); - p_filter->pf_do_work = DoWork; - p_filter->b_in_place = 0; + msg_Dbg( p_this, "%4.4s->%4.4s, bits per sample: %i", + (char *)&p_filter->fmt_in.audio.i_format, + (char *)&p_filter->fmt_out.audio.i_format, + p_filter->fmt_out.audio.i_bitspersample ); return 0; } /***************************************************************************** - * DoWork: decode an MPEG audio frame. + * CloseFilter : deallocate data structures *****************************************************************************/ -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 void CloseFilter( vlc_object_t *p_this ) { - struct 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; + mad_synth_finish( &p_sys->mad_synth ); + mad_frame_finish( &p_sys->mad_frame ); + mad_stream_finish( &p_sys->mad_stream ); + free( p_sys ); +} - p_out_buf->i_nb_samples = p_in_buf->i_nb_samples; - p_out_buf->i_nb_bytes = p_in_buf->i_nb_samples * sizeof(vlc_fixed_t); - - /* Do the actual decoding now. */ - mad_stream_buffer( &p_sys->mad_stream, p_in_buf->p_buffer, - p_in_buf->i_nb_bytes ); - if ( mad_frame_decode( &p_sys->mad_frame, &p_sys->mad_stream ) == -1 ) +static block_t *Convert( filter_t *p_filter, block_t *p_block ) +{ + if( !p_block || !p_block->i_nb_samples ) { - msg_Warn( p_aout, "libmad error: %s", - mad_stream_errorstr( &p_sys->mad_stream ) ); - if( p_filter->output.i_format == VLC_FOURCC('f','l','3','2') ) - { - int i; - float * a = (float *)p_out_buf->p_buffer; - for ( i = 0 ; i < p_out_buf->i_nb_samples ; i++ ) - *a++ = 0.0; - return; - } - else - { - memset( p_out_buf->p_buffer, 0, p_out_buf->i_nb_bytes ); - } + if( p_block ) + block_Release( p_block ); + return NULL; } - mad_synth_frame( &p_sys->mad_synth, &p_sys->mad_frame ); - if ( p_filter->output.i_format == VLC_FOURCC('f','i','3','2') ) - { - /* Interleave and keep buffers in mad_fixed_t format */ - mad_fixed_t * p_samples = (mad_fixed_t *)p_out_buf->p_buffer; - struct mad_pcm * p_pcm = &p_sys->mad_synth.pcm; - unsigned int i_samples = p_pcm->length; - mad_fixed_t const * p_left = p_pcm->samples[0]; - mad_fixed_t const * p_right = p_pcm->samples[1]; - - switch ( p_pcm->channels ) - { - case 2: - while ( i_samples-- ) - { - *p_samples++ = *p_left++; - *p_samples++ = *p_right++; - } - break; - - case 1: - p_filter->p_vlc->pf_memcpy( p_samples, p_left, - i_samples * sizeof(mad_fixed_t) ); - break; - - default: - msg_Err( p_filter, "cannot interleave %i channels", - p_pcm->channels ); - } - } - else + 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; + + block_t *p_out = block_Alloc( i_out_size ); + if( !p_out ) { - /* float32 */ - float * p_samples = (float *)p_out_buf->p_buffer; - struct mad_pcm * p_pcm = &p_sys->mad_synth.pcm; - unsigned int i_samples = p_pcm->length; - mad_fixed_t const * p_left = p_pcm->samples[0]; - mad_fixed_t const * p_right = p_pcm->samples[1]; - - switch ( p_pcm->channels ) - { - case 2: - while ( i_samples-- ) - { - *p_samples++ = (float)*p_left++ / (float)FIXED32_ONE; - *p_samples++ = (float)*p_right++ / (float)FIXED32_ONE; - } - break; - - case 1: - while ( i_samples-- ) - { - *p_samples++ = (float)*p_left++ / (float)FIXED32_ONE; - } - break; - - default: - msg_Err( p_filter, "cannot interleave %i channels", - p_pcm->channels ); - } + msg_Warn( p_filter, "can't get output buffer" ); + block_Release( p_block ); + return NULL; } -} -/***************************************************************************** - * Destroy : deallocate data structures - *****************************************************************************/ -static void Destroy( vlc_object_t * _p_filter ) -{ - aout_filter_t * p_filter = (aout_filter_t *)_p_filter; - struct aout_filter_sys_t * p_sys = p_filter->p_sys; + p_out->i_nb_samples = p_block->i_nb_samples; + p_out->i_dts = p_block->i_dts; + p_out->i_pts = p_block->i_pts; + p_out->i_length = p_block->i_length; - mad_synth_finish( &p_sys->mad_synth ); - mad_frame_finish( &p_sys->mad_frame ); - mad_stream_finish( &p_sys->mad_stream ); - free( p_sys ); -} + DoWork( p_filter, p_block, p_out ); + block_Release( p_block ); + + return p_out; +}