/*****************************************************************************
* mpeg_audio.c: parse MPEG audio sync info and packetize the stream
*****************************************************************************
- * Copyright (C) 2001-2003 the VideoLAN team
+ * Copyright (C) 2001-2003 VLC authors and VideoLAN
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Christophe Massiot <massiot@via.ecp.fr>
* 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
- * the Free Software Foundation; either version 2 of the License, or
+ * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, 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.
*****************************************************************************/
/*****************************************************************************
*****************************************************************************/
struct decoder_sys_t
{
+#ifdef HAVE_MPGA_FILTER
/* Module mode */
bool b_packetizer;
-
+#endif
/*
* Input properties
*/
/****************************************************************************
* Local prototypes
****************************************************************************/
+
+#ifdef HAVE_MPGA_FILTER
static int OpenDecoder ( vlc_object_t * );
-static int OpenPacketizer( vlc_object_t * );
-static void CloseDecoder ( vlc_object_t * );
+static block_t *GetAoutBuffer( decoder_t * );
+#endif
+static int Open( vlc_object_t * );
static block_t *DecodeBlock ( decoder_t *, block_t ** );
-
static uint8_t *GetOutBuffer ( decoder_t *, block_t ** );
-static block_t *GetAoutBuffer( decoder_t * );
static block_t *GetSoutBuffer( decoder_t * );
-
+static void Close( vlc_object_t * );
static int SyncInfo( uint32_t i_header, unsigned int * pi_channels,
unsigned int * pi_channels_conf,
unsigned int * pi_sample_rate, unsigned int * pi_bit_rate,
* Module descriptor
*****************************************************************************/
vlc_module_begin ()
- set_description( N_("MPEG audio layer I/II/III decoder") )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACODEC )
- set_capability( "decoder", 100 )
- set_callbacks( OpenDecoder, CloseDecoder )
-
- add_submodule ()
set_description( N_("MPEG audio layer I/II/III packetizer") )
set_capability( "packetizer", 10 )
- set_callbacks( OpenPacketizer, CloseDecoder )
+ set_callbacks( Open, Close )
+#ifdef HAVE_MPGA_FILTER
+ add_submodule ()
+ set_description( N_("MPEG audio layer I/II/III decoder") )
+ set_capability( "decoder", 100 )
+ set_callbacks( OpenDecoder, Close )
+#endif
vlc_module_end ()
/*****************************************************************************
decoder_t *p_dec = (decoder_t*)p_this;
decoder_sys_t *p_sys;
- if( p_dec->fmt_in.i_codec != VLC_CODEC_MPGA )
+ if(( p_dec->fmt_in.i_codec != VLC_CODEC_MPGA ) &&
+ ( p_dec->fmt_in.i_codec != VLC_CODEC_MP3 ) )
{
return VLC_EGENERIC;
}
return VLC_ENOMEM;
/* Misc init */
- p_sys->b_packetizer = false;
+#ifdef HAVE_MPGA_FILTER
+ p_sys->b_packetizer = true;
+#endif
p_sys->i_state = STATE_NOSYNC;
date_Set( &p_sys->end_date, 0 );
block_BytestreamInit( &p_sys->bytestream );
return VLC_SUCCESS;
}
+#ifdef HAVE_MPGA_FILTER
static int OpenDecoder( vlc_object_t *p_this )
{
+ decoder_t *p_dec = (decoder_t *)p_this;
+
/* HACK: Don't use this codec if we don't have an mpga audio filter */
- if( !module_exists( "mpgatofixed32" ) )
+ if( !module_exists( "mad" ) )
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 = Open( p_this );
+ if( i_ret != VLC_SUCCESS )
+ return i_ret;
- if( i_ret == VLC_SUCCESS ) p_dec->p_sys->b_packetizer = true;
-
- return i_ret;
+ p_dec->p_sys->b_packetizer = false;
+ return VLC_SUCCESS;
}
+#endif
/****************************************************************************
* DecodeBlock: the whole thing
uint8_t *p_buf;
block_t *p_out_buffer;
- if( !pp_block || !*pp_block ) return NULL;
+ block_t *p_block = pp_block ? *pp_block : NULL;
- if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
- {
- if( (*pp_block)->i_flags&BLOCK_FLAG_CORRUPTED )
+ if (p_block) {
+ if( p_block->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
{
- p_sys->i_state = STATE_NOSYNC;
- block_BytestreamEmpty( &p_sys->bytestream );
+ if( p_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( p_block );
+ p_sys->b_discontinuity = true;
+ return NULL;
}
- date_Set( &p_sys->end_date, 0 );
- block_Release( *pp_block );
- p_sys->b_discontinuity = true;
- return NULL;
- }
- if( !date_Get( &p_sys->end_date ) && (*pp_block)->i_pts <= VLC_TS_INVALID )
- {
- /* We've just started the stream, wait for the first PTS. */
- msg_Dbg( p_dec, "waiting for PTS" );
- block_Release( *pp_block );
- return NULL;
- }
+ if( !date_Get( &p_sys->end_date ) && p_block->i_pts <= VLC_TS_INVALID )
+ {
+ /* We've just started the stream, wait for the first PTS. */
+ msg_Dbg( p_dec, "waiting for PTS" );
+ block_Release( p_block );
+ return NULL;
+ }
- block_BytestreamPush( &p_sys->bytestream, *pp_block );
+ block_BytestreamPush( &p_sys->bytestream, p_block );
+ } else
+ p_sys->i_state = STATE_SEND_DATA; /* return all the data we have left */
while( 1 )
{
/* New frame, set the Presentation Time Stamp */
p_sys->i_pts = p_sys->bytestream.p_block->i_pts;
if( p_sys->i_pts > VLC_TS_INVALID &&
- p_sys->i_pts != date_Get( &p_sys->end_date ) )
+ p_sys->i_pts > date_Get( &p_sys->end_date ) )
{
date_Set( &p_sys->end_date, p_sys->i_pts );
}
}
/* Build frame header */
- i_header = (p_header[0]<<24)|(p_header[1]<<16)|(p_header[2]<<8)
- |p_header[3];
+ i_header = GetDWBE(p_header);
/* Check if frame is valid and get frame info */
p_sys->i_frame_size = SyncInfo( i_header,
unsigned int i_next_layer;
/* Build frame header */
- i_header = (p_header[0]<<24)|(p_header[1]<<16)|(p_header[2]<<8)
- |p_header[3];
+ i_header = GetDWBE(p_header);
i_next_frame_size = SyncInfo( i_header,
&i_next_channels,
p_sys->i_free_frame_size = p_sys->i_frame_size;
}
- /* Copy the whole frame into the buffer. When we reach this point
- * we already know we have enough data available. */
- block_GetBytes( &p_sys->bytestream,
- p_buf, __MIN( (unsigned)p_sys->i_frame_size, p_out_buffer->i_buffer ) );
+ /* Copy the whole frame into the buffer. */
+ if (block_GetBytes( &p_sys->bytestream,
+ p_buf, __MIN( (unsigned)p_sys->i_frame_size, p_out_buffer->i_buffer ) )) {
+ block_Release(p_out_buffer);
+ return NULL;
+ }
+#ifdef HAVE_MPGA_FILTER
/* Get beginning of next frame for libmad */
if( !p_sys->b_packetizer )
{
memcpy( p_buf + p_sys->i_frame_size,
p_header, MAD_BUFFER_GUARD );
}
-
+#endif
p_sys->i_state = STATE_NOSYNC;
/* Make sure we don't reuse the same pts twice */
p_sys->i_pts = p_sys->bytestream.p_block->i_pts = VLC_TS_INVALID;
/* So p_block doesn't get re-added several times */
- *pp_block = block_BytestreamPop( &p_sys->bytestream );
+ p_block = block_BytestreamPop( &p_sys->bytestream );
+ if (pp_block)
+ *pp_block = p_block;
+ else if (p_block)
+ block_Release(p_block);
return p_out_buffer;
}
p_dec->fmt_out.i_bitrate = p_sys->i_bit_rate * 1000;
- if( p_sys->b_packetizer )
- {
- block_t *p_sout_buffer = GetSoutBuffer( p_dec );
- p_buf = p_sout_buffer ? p_sout_buffer->p_buffer : NULL;
- *pp_out_buffer = p_sout_buffer;
- }
- else
+#ifdef HAVE_MPGA_FILTER
+ if( !p_sys->b_packetizer )
{
block_t *p_aout_buffer = GetAoutBuffer( p_dec );
p_buf = p_aout_buffer ? p_aout_buffer->p_buffer : NULL;
*pp_out_buffer = p_aout_buffer;
}
-
+ else
+#endif
+ {
+ block_t *p_sout_buffer = GetSoutBuffer( p_dec );
+ p_buf = p_sout_buffer ? p_sout_buffer->p_buffer : NULL;
+ *pp_out_buffer = p_sout_buffer;
+ }
return p_buf;
}
+#ifdef HAVE_MPGA_FILTER
/*****************************************************************************
* GetAoutBuffer:
*****************************************************************************/
return p_buf;
}
+#endif
/*****************************************************************************
* GetSoutBuffer:
decoder_sys_t *p_sys = p_dec->p_sys;
block_t *p_block;
- p_block = block_New( p_dec, p_sys->i_frame_size );
+ p_block = block_Alloc( p_sys->i_frame_size );
if( p_block == NULL ) return NULL;
p_block->i_pts = p_block->i_dts = date_Get( &p_sys->end_date );
}
/*****************************************************************************
- * CloseDecoder: clean up the decoder
+ * Close: clean up the decoder
*****************************************************************************/
-static void CloseDecoder( vlc_object_t *p_this )
+static void Close( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t *)p_this;
decoder_sys_t *p_sys = p_dec->p_sys;
projects / vlc / blobdiff