/*****************************************************************************
* a52.c: parse A/52 audio sync info and packetize the stream
*****************************************************************************
- * Copyright (C) 2001-2002 VideoLAN
- * $Id: a52.c,v 1.30 2003/11/16 22:54:12 gbazin Exp $
+ * Copyright (C) 2001-2002 the VideoLAN team
+ * $Id$
*
- * Authors: Stéphane Borel <stef@via.ecp.fr>
+ * Authors: Stéphane Borel <stef@via.ecp.fr>
* 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 <stdio.h>
-#include <stdlib.h>
-#include <string.h> /* memcpy() */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include <vlc/vlc.h>
-#include <vlc/decoder.h>
-#include <vlc/input.h>
-
-#include "vlc_block_helper.h"
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_codec.h>
+#include <vlc_aout.h>
+#include <vlc_input.h>
+#include <vlc_block_helper.h>
#define A52_HEADER_SIZE 7
struct decoder_sys_t
{
/* Module mode */
- vlc_bool_t b_packetizer;
+ bool b_packetizer;
/*
* Input properties
int i_frame_size, i_bit_rate;
unsigned int i_rate, i_channels, i_channels_conf;
+ int i_input_rate;
};
enum {
static void CloseDecoder ( vlc_object_t * );
static void *DecodeBlock ( decoder_t *, block_t ** );
-static int SyncInfo ( const byte_t *, int *, int *, int *,int * );
+static int SyncInfo ( const uint8_t *, unsigned int *, unsigned int *,
+ unsigned int *, int * );
static uint8_t *GetOutBuffer ( decoder_t *, void ** );
static aout_buffer_t *GetAoutBuffer( decoder_t * );
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- set_description( _("A/52 parser") );
+ set_description( N_("A/52 parser") );
set_capability( "decoder", 100 );
set_callbacks( OpenDecoder, CloseDecoder );
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_ACODEC );
add_submodule();
- set_description( _("A/52 audio packetizer") );
+ set_description( N_("A/52 audio packetizer") );
set_capability( "packetizer", 10 );
set_callbacks( OpenPacketizer, CloseDecoder );
vlc_module_end();
/* 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 );
+ p_sys->bytestream = block_BytestreamInit();
+ p_sys->i_input_rate = INPUT_RATE_DEFAULT;
/* Set output properties */
p_dec->fmt_out.i_cat = AUDIO_ES;
p_dec->fmt_out.i_codec = VLC_FOURCC('a','5','2',' ');
+ 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 **))
int i_ret = OpenDecoder( 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_BytestreamFlush( &p_sys->bytestream );
+ }
+// aout_DateSet( &p_sys->end_date, 0 );
block_Release( *pp_block );
return NULL;
}
- if( (*pp_block)->b_discontinuity )
+ if( !aout_DateGet( &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. */
+ block_Release( *pp_block );
+ return NULL;
}
+ if( (*pp_block)->i_rate > 0 )
+ p_sys->i_input_rate = (*pp_block)->i_rate;
+
block_BytestreamPush( &p_sys->bytestream, *pp_block );
while( 1 )
}
if( p_sys->i_state != STATE_SYNC )
{
- block_BytestreamFlush( &p_sys->bytestream );
+ block_BytestreamFlush( &p_sys->bytestream );
/* Need more data */
return NULL;
return NULL;
}
+ if( p_sys->b_packetizer &&
+ p_header[0] == 0 && p_header[1] == 0 )
+ {
+ /* A52 wav files and audio CD's use stuffing */
+ p_sys->i_state = STATE_GET_DATA;
+ break;
+ }
+
if( p_header[0] != 0x0b || p_header[1] != 0x77 )
{
msg_Dbg( p_dec, "emulated sync word "
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_buf == NULL ) return NULL;
p_buf->start_date = aout_DateGet( &p_sys->end_date );
- p_buf->end_date = aout_DateIncrement( &p_sys->end_date, A52_FRAME_NB );
+ p_buf->end_date = aout_DateIncrement( &p_sys->end_date,
+ A52_FRAME_NB * p_sys->i_input_rate / INPUT_RATE_DEFAULT );
return p_buf;
}
p_block->i_pts = p_block->i_dts = aout_DateGet( &p_sys->end_date );
- p_block->i_length = aout_DateIncrement( &p_sys->end_date, A52_FRAME_NB ) -
- p_block->i_pts;
+ p_block->i_length =
+ aout_DateIncrement( &p_sys->end_date,
+ A52_FRAME_NB * p_sys->i_input_rate / INPUT_RATE_DEFAULT ) -
+ p_block->i_pts;
return p_block;
}
* since we don't want to oblige S/PDIF people to use liba52 just to get
* their SyncInfo...
*****************************************************************************/
-static int SyncInfo( const byte_t * p_buf,
- int * pi_channels, int * pi_channels_conf,
- int * pi_sample_rate, int * pi_bit_rate )
+static int SyncInfo( const uint8_t * p_buf,
+ unsigned int * pi_channels,
+ unsigned int * pi_channels_conf,
+ unsigned int * pi_sample_rate, int * pi_bit_rate )
{
static const uint8_t halfrate[12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3 };
static const int rate[] = { 32, 40, 48, 56, 64, 80, 96, 112,