/*****************************************************************************
* mpeg_audio.c: parse MPEG audio sync info and packetize the stream
*****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
+ * 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 <vlc/vlc.h>
-#include <vlc/decoder.h>
-#include <vlc/aout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_codec.h>
+#include <vlc_aout.h>
-#include "vlc_block_helper.h"
+#include <vlc_block_helper.h>
/*****************************************************************************
* decoder_sys_t : decoder descriptor
struct decoder_sys_t
{
/* Module mode */
- vlc_bool_t b_packetizer;
+ bool b_packetizer;
/*
* Input properties
/*
* Common properties
*/
- audio_date_t end_date;
- unsigned int i_current_layer;
+ date_t end_date;
+ unsigned int i_current_layer;
mtime_t i_pts;
unsigned int i_channels_conf, i_channels;
unsigned int i_rate, i_max_frame_size, i_frame_length;
unsigned int i_layer, i_bit_rate;
+
+ bool b_discontinuity;
};
enum {
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-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)
- set_capability( "decoder", 5 );
+vlc_module_begin ()
+ set_description( N_("MPEG audio layer I/II/III decoder") )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_ACODEC )
+#if defined(UNDER_CE)
+ set_capability( "decoder", 5 )
#else
- set_capability( "decoder", 100 );
+ set_capability( "decoder", 100 )
#endif
- set_callbacks( OpenDecoder, CloseDecoder );
+ set_callbacks( OpenDecoder, CloseDecoder )
- add_submodule();
- set_description( _("MPEG audio layer I/II/III packetizer") );
- set_capability( "packetizer", 10 );
- set_callbacks( OpenPacketizer, CloseDecoder );
-vlc_module_end();
+ add_submodule ()
+ set_description( N_("MPEG audio layer I/II/III packetizer") )
+ set_capability( "packetizer", 10 )
+ set_callbacks( OpenPacketizer, CloseDecoder )
+vlc_module_end ()
/*****************************************************************************
- * OpenDecoder: probe the decoder and return score
+ * Open: probe the decoder and return score
*****************************************************************************/
-static int OpenDecoder( vlc_object_t *p_this )
+static int Open( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t*)p_this;
decoder_sys_t *p_sys;
- if( p_dec->fmt_in.i_codec != VLC_FOURCC('m','p','g','a') )
+ if( p_dec->fmt_in.i_codec != VLC_CODEC_MPGA )
{
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 )
- {
- msg_Err( p_dec, "out of memory" );
- return VLC_EGENERIC;
- }
+ return VLC_ENOMEM;
/* Misc init */
- p_sys->b_packetizer = VLC_FALSE;
+ p_sys->b_packetizer = false;
p_sys->i_state = STATE_NOSYNC;
- aout_DateSet( &p_sys->end_date, 0 );
- p_sys->bytestream = block_BytestreamInit( p_dec );
+ date_Set( &p_sys->end_date, 0 );
+ p_sys->bytestream = block_BytestreamInit();
+ p_sys->b_discontinuity = false;
/* 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.i_codec = VLC_CODEC_MPGA;
p_dec->fmt_out.audio.i_rate = 0; /* So end_date gets initialized */
/* Set callback */
return VLC_SUCCESS;
}
+static int OpenDecoder( vlc_object_t *p_this )
+{
+ /* HACK: Don't use this codec if we don't have an mpga audio filter */
+ if( !module_exists( "mpgatofixed32" ) )
+ return VLC_EGENERIC;
+
+ return Open( p_this );
+}
+
static int OpenPacketizer( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t*)p_this;
- int i_ret = OpenDecoder( p_this );
+ int i_ret = Open( p_this );
- if( i_ret == VLC_SUCCESS ) p_dec->p_sys->b_packetizer = VLC_TRUE;
+ if( i_ret == VLC_SUCCESS ) p_dec->p_sys->b_packetizer = true;
return i_ret;
}
if( !pp_block || !*pp_block ) return NULL;
- if( !aout_DateGet( &p_sys->end_date ) && !(*pp_block)->i_pts )
+ if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
{
- /* We've just started the stream, wait for the first PTS. */
+ if( (*pp_block)->i_flags&BLOCK_FLAG_CORRUPTED )
+ {
+ p_sys->i_state = STATE_NOSYNC;
+ block_BytestreamEmpty( &p_sys->bytestream );
+ }
+ date_Set( &p_sys->end_date, 0 );
block_Release( *pp_block );
+ p_sys->b_discontinuity = true;
return NULL;
}
- if( (*pp_block)->i_flags&BLOCK_FLAG_DISCONTINUITY )
+ if( !date_Get( &p_sys->end_date ) && !(*pp_block)->i_pts )
{
- p_sys->i_state = STATE_NOSYNC;
+ /* We've just started the stream, wait for the first PTS. */
+ msg_Dbg( p_dec, "waiting for PTS" );
+ block_Release( *pp_block );
+ return NULL;
}
block_BytestreamPush( &p_sys->bytestream, *pp_block );
/* New frame, set the Presentation Time Stamp */
p_sys->i_pts = p_sys->bytestream.p_block->i_pts;
if( p_sys->i_pts != 0 &&
- p_sys->i_pts != aout_DateGet( &p_sys->end_date ) )
+ p_sys->i_pts != date_Get( &p_sys->end_date ) )
{
- aout_DateSet( &p_sys->end_date, p_sys->i_pts );
+ date_Set( &p_sys->end_date, p_sys->i_pts );
}
p_sys->i_state = STATE_HEADER;
msg_Dbg( p_dec, "emulated startcode" );
block_SkipByte( &p_sys->bytestream );
p_sys->i_state = STATE_NOSYNC;
+ p_sys->b_discontinuity = true;
break;
}
if( p_sys->i_bit_rate == 0 )
{
- /* Free birate, but 99% emulated startcode :( */
+ /* Free bitrate, but 99% emulated startcode :( */
if( p_dec->p_sys->i_free_frame_size == MPGA_HEADER_SIZE )
{
msg_Dbg( p_dec, "free bitrate mode");
}
- p_sys->i_frame_size = p_sys->i_free_frame_size;
+ /* The -1 below is to account for the frame padding */
+ p_sys->i_frame_size = p_sys->i_free_frame_size - 1;
}
p_sys->i_state = STATE_NEXT_SYNC;
msg_Dbg( p_dec, "emulated startcode on next frame" );
block_SkipByte( &p_sys->bytestream );
p_sys->i_state = STATE_NOSYNC;
+ p_sys->b_discontinuity = true;
break;
}
case STATE_SEND_DATA:
if( !(p_buf = GetOutBuffer( p_dec, &p_out_buffer )) )
{
- //p_dec->b_error = VLC_TRUE;
+ //p_dec->b_error = true;
return NULL;
}
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 );
- aout_DateSet( &p_sys->end_date, p_sys->i_pts );
+ date_Init( &p_sys->end_date, p_sys->i_rate, 1 );
+ date_Set( &p_sys->end_date, p_sys->i_pts );
}
p_dec->fmt_out.audio.i_rate = p_sys->i_rate;
decoder_sys_t *p_sys = p_dec->p_sys;
aout_buffer_t *p_buf;
- p_buf = p_dec->pf_aout_buffer_new( p_dec, p_sys->i_frame_length );
+ p_buf = decoder_NewAudioBuffer( p_dec, p_sys->i_frame_length );
if( p_buf == NULL ) return NULL;
- p_buf->start_date = aout_DateGet( &p_sys->end_date );
+ p_buf->start_date = date_Get( &p_sys->end_date );
p_buf->end_date =
- aout_DateIncrement( &p_sys->end_date, p_sys->i_frame_length );
+ date_Increment( &p_sys->end_date, p_sys->i_frame_length );
+ p_buf->b_discontinuity = p_sys->b_discontinuity;
+ p_sys->b_discontinuity = false;
/* Hack for libmad filter */
p_buf->i_nb_bytes = p_sys->i_frame_size + MAD_BUFFER_GUARD;
p_block = block_New( p_dec, p_sys->i_frame_size );
if( p_block == NULL ) return NULL;
- p_block->i_pts = p_block->i_dts = aout_DateGet( &p_sys->end_date );
+ p_block->i_pts = p_block->i_dts = date_Get( &p_sys->end_date );
p_block->i_length =
- aout_DateIncrement( &p_sys->end_date, p_sys->i_frame_length ) -
- p_block->i_pts;
+ date_Increment( &p_sys->end_date, p_sys->i_frame_length ) - p_block->i_pts;
return p_block;
}
};
int i_version, i_mode, i_emphasis;
- vlc_bool_t b_padding, b_mpeg_2_5, b_crc;
+ bool b_padding, b_mpeg_2_5, b_crc;
int i_frame_size = 0;
int i_bitrate_index, i_samplerate_index;
int i_max_bit_rate;
default:
break;
}
+
+ /* Free bitrate mode can support higher bitrates */
+ if( !*pi_bit_rate ) *pi_max_frame_size *= 2;
}
else
{
projects / vlc / blobdiff