/*****************************************************************************
* mpeg_audio.c: parse MPEG audio sync info and packetize the stream
*****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
- * $Id: mpeg_audio.c,v 1.23 2003/11/16 22:54:12 gbazin Exp $
+ * Copyright (C) 2001-2003 the VideoLAN team
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
* Christophe Massiot <massiot@via.ecp.fr>
- * Gildas Bazin <gbazin@netcourrier.com>
+ * Gildas Bazin <gbazin@videolan.org>
*
* 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
*
* 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h> /* strdup() */
-
#include <vlc/vlc.h>
#include <vlc/decoder.h>
-#include <vlc/input.h>
#include <vlc/aout.h>
-#include <vlc/sout.h>
#include "vlc_block_helper.h"
*****************************************************************************/
vlc_module_begin();
set_description( _("MPEG audio layer I/II/III parser") );
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_ACODEC );
+#if defined(SYS_DARWIN) || defined(UNDER_CE)
+ set_capability( "decoder", 5 );
+#else
set_capability( "decoder", 100 );
+#endif
set_callbacks( OpenDecoder, CloseDecoder );
add_submodule();
return VLC_EGENERIC;
}
+ /* HACK: Don't use this codec if we don't have an mpga audio filter */
+ if( p_dec->i_object_type == VLC_OBJECT_DECODER &&
+ !config_FindModule( p_this, "mpgatofixed32" ) )
+ {
+ return VLC_EGENERIC;
+ }
+
/* Allocate the memory needed to store the decoder's structure */
if( ( p_dec->p_sys = p_sys =
(decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL )
/* Set output properties */
p_dec->fmt_out.i_cat = AUDIO_ES;
p_dec->fmt_out.i_codec = VLC_FOURCC('m','p','g','a');
+ p_dec->fmt_out.audio.i_rate = 0; /* So end_date gets initialized */
/* Set callback */
p_dec->pf_decode_audio = (aout_buffer_t *(*)(decoder_t *, block_t **))
return NULL;
}
- if( (*pp_block)->b_discontinuity )
+ if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
{
p_sys->i_state = STATE_NOSYNC;
}
if( p_sys->i_frame_size == -1 )
{
- msg_Dbg( p_dec, "emulated start code" );
+ msg_Dbg( p_dec, "emulated startcode" );
block_SkipByte( &p_sys->bytestream );
p_sys->i_state = STATE_NOSYNC;
break;
if( i_next_frame_size == -1 )
{
- msg_Dbg( p_dec, "emulated start code on next frame" );
+ msg_Dbg( p_dec, "emulated startcode on next frame" );
block_SkipByte( &p_sys->bytestream );
p_sys->i_state = STATE_NOSYNC;
break;
if( p_dec->fmt_out.audio.i_rate != p_sys->i_rate )
{
- msg_Info( p_dec, "MPGA channels:%d samplerate:%d bitrate:%d",
+ msg_Dbg( p_dec, "MPGA channels:%d samplerate:%d bitrate:%d",
p_sys->i_channels, p_sys->i_rate, p_sys->i_bit_rate );
aout_DateInit( &p_sys->end_date, p_sys->i_rate );
p_dec->fmt_out.audio.i_physical_channels =
p_sys->i_channels_conf & AOUT_CHAN_PHYSMASK;
- p_dec->fmt_out.i_bitrate = p_sys->i_bit_rate;
+ p_dec->fmt_out.i_bitrate = p_sys->i_bit_rate * 1000;
if( p_sys->b_packetizer )
{