X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_filter%2Fconverter%2Fmpgatofixed32.c;h=1e2a773095a2c300ff880f5b5a2d8d7f01f5fb9b;hb=b674dab81ccd2a089896b26a2afc258118e6a990;hp=c6458f20378fe322ffd3a55d97884b086ce893c1;hpb=d3fe7f28797d4dba65ffcdd60bf932e758a48a9e;p=vlc diff --git a/modules/audio_filter/converter/mpgatofixed32.c b/modules/audio_filter/converter/mpgatofixed32.c index c6458f2037..1e2a773095 100644 --- a/modules/audio_filter/converter/mpgatofixed32.c +++ b/modules/audio_filter/converter/mpgatofixed32.c @@ -12,7 +12,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 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 @@ -26,12 +26,15 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include /* strdup() */ #include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include #include "vlc_filter.h" @@ -41,7 +44,7 @@ *****************************************************************************/ static int Create ( vlc_object_t * ); static void Destroy ( vlc_object_t * ); -static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, +static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, aout_buffer_t * ); static int OpenFilter ( vlc_object_t * ); @@ -54,8 +57,10 @@ static block_t *Convert( filter_t *, block_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; }; /***************************************************************************** @@ -64,18 +69,18 @@ struct filter_sys_t vlc_module_begin(); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_ACODEC ); - set_description( _("MPEG audio decoder") ); + set_description( N_("MPEG audio decoder") ); set_capability( "audio filter", 100 ); set_callbacks( Create, Destroy ); add_submodule(); - set_description( _("MPEG audio decoder") ); + set_description( N_("MPEG audio decoder") ); set_capability( "audio filter2", 100 ); set_callbacks( OpenFilter, CloseFilter ); vlc_module_end(); /***************************************************************************** - * Create: + * Create: *****************************************************************************/ static int Create( vlc_object_t *p_this ) { @@ -99,16 +104,14 @@ static int Create( vlc_object_t *p_this ) p_sys = malloc( sizeof(filter_sys_t) ); p_filter->p_sys = (struct aout_filter_sys_t *)p_sys; if( p_sys == NULL ) - { - msg_Err( p_filter, "out of memory" ); 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; @@ -125,7 +128,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, filter_sys_t *p_sys = (filter_sys_t *)p_filter->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) * + p_out_buf->i_nb_bytes = p_in_buf->i_nb_samples * sizeof(vlc_fixed_t) * aout_FormatNbChannels( &p_filter->output ); /* Do the actual decoding now. */ @@ -135,6 +138,15 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, { msg_Dbg( p_aout, "libmad error: %s", mad_stream_errorstr( &p_sys->mad_stream ) ); + p_sys->i_reject_count = 3; + } + else if( p_in_buf->b_discontinuity ) + { + p_sys->i_reject_count = 3; + } + + if( p_sys->i_reject_count > 0 ) + { if( p_filter->output.i_format == VLC_FOURCC('f','l','3','2') ) { int i; @@ -148,9 +160,11 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, { memset( p_out_buf->p_buffer, 0, p_out_buf->i_nb_bytes ); } + p_sys->i_reject_count--; return; } + mad_synth_frame( &p_sys->mad_synth, &p_sys->mad_frame ); if ( p_filter->output.i_format == VLC_FOURCC('f','i','3','2') ) @@ -199,8 +213,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, break; case 1: - p_filter->p_libvlc->pf_memcpy( p_samples, p_left, - i_samples * sizeof(mad_fixed_t) ); + vlc_memcpy( p_samples, p_left, i_samples * sizeof(mad_fixed_t) ); break; default: @@ -284,7 +297,7 @@ static void Destroy( vlc_object_t *p_this ) } /***************************************************************************** - * OpenFilter: + * OpenFilter: *****************************************************************************/ static int OpenFilter( vlc_object_t *p_this ) { @@ -300,10 +313,8 @@ static int OpenFilter( vlc_object_t *p_this ) /* Allocate the memory needed to store the module's structure */ 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; @@ -313,11 +324,13 @@ static int OpenFilter( vlc_object_t *p_this ) mad_synth_init( &p_sys->mad_synth ); mad_stream_options( &p_sys->mad_stream, MAD_OPTION_IGNORECRC ); - if( p_this->p_libvlc_global->i_cpu & CPU_CAPABILITY_FPU ) + if( vlc_CPU() & CPU_CAPABILITY_FPU ) p_filter->fmt_out.i_codec = VLC_FOURCC('f','l','3','2'); else p_filter->fmt_out.i_codec = VLC_FOURCC('f','i','3','2'); p_filter->fmt_out.audio.i_format = p_filter->fmt_out.i_codec; + p_filter->fmt_out.audio.i_bitspersample = + aout_BitsPerSample( p_filter->fmt_out.i_codec ); p_filter->fmt_out.audio.i_rate = p_filter->fmt_in.audio.i_rate; @@ -380,6 +393,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block ) aout_filter.output.i_format = p_filter->fmt_out.i_codec; in_buf.p_buffer = p_block->p_buffer; + in_buf.b_discontinuity = false; in_buf.i_nb_bytes = p_block->i_buffer; in_buf.i_nb_samples = p_block->i_samples; out_buf.p_buffer = p_out->p_buffer;