* 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
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h> /* strdup() */
#include <mad.h>
*****************************************************************************/
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 * );
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;
};
/*****************************************************************************
vlc_module_end();
/*****************************************************************************
- * Create:
+ * Create:
*****************************************************************************/
static int Create( vlc_object_t *p_this )
{
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;
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. */
{
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;
{
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') )
}
/*****************************************************************************
- * OpenFilter:
+ * OpenFilter:
*****************************************************************************/
static int OpenFilter( vlc_object_t *p_this )
{
msg_Err( p_filter, "out of memory" );
return -1;
}
+ p_sys->i_reject_count = 0;
p_filter->pf_audio_filter = Convert;
aout_filter.output.i_format = p_filter->fmt_out.i_codec;
in_buf.p_buffer = p_block->p_buffer;
+ in_buf.b_discontinuity = VLC_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;