/*****************************************************************************
- * a52.c: A/52 basic parser
+ * a52.c: parse A/52 audio sync info and packetize the stream
*****************************************************************************
- * Copyright (C) 2001-2002 VideoLAN
- * $Id: a52.c,v 1.25 2003/09/30 20:36:46 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() */
-#include <fcntl.h>
-
-#include <vlc/vlc.h>
-#include <vlc/decoder.h>
-#include <vlc/input.h>
-#include <vlc/aout.h>
-#include <vlc/sout.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
#endif
-#include "vlc_block_helper.h"
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_codec.h>
+#include <vlc_aout.h>
+#include <vlc_block_helper.h>
+#include <vlc_modules.h>
-#define A52_HEADER_SIZE 7
+#include "a52.h"
+
+/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
+static int OpenDecoder ( vlc_object_t * );
+static int OpenPacketizer( vlc_object_t * );
+static void CloseCommon ( vlc_object_t * );
+
+vlc_module_begin ()
+ set_description( N_("A/52 parser") )
+ set_capability( "decoder", 100 )
+ set_callbacks( OpenDecoder, CloseCommon )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_ACODEC )
+
+ add_submodule ()
+ set_description( N_("A/52 audio packetizer") )
+ set_capability( "packetizer", 10 )
+ set_callbacks( OpenPacketizer, CloseCommon )
+vlc_module_end ()
/*****************************************************************************
* decoder_sys_t : decoder descriptor
*****************************************************************************/
+
struct decoder_sys_t
{
/* Module mode */
- vlc_bool_t b_packetizer;
+ bool b_packetizer;
/*
* Input properties
*/
- int i_state;
- vlc_bool_t b_synchro;
+ int i_state;
- block_t *p_chain;
block_bytestream_t bytestream;
- /*
- * Decoder output properties
- */
- aout_instance_t * p_aout; /* opaque */
- aout_input_t * p_aout_input; /* opaque */
- audio_sample_format_t aout_format;
- aout_buffer_t * p_aout_buffer; /* current aout buffer being filled */
-
- /*
- * Packetizer output properties
- */
- sout_packetizer_input_t *p_sout_input;
- sout_format_t sout_format;
- sout_buffer_t * p_sout_buffer; /* current sout buffer */
-
/*
* Common properties
*/
- uint8_t *p_out_buffer; /* output buffer */
- int i_out_buffer; /* position in output buffer */
- audio_date_t end_date;
+ date_t end_date;
- mtime_t pts;
- int i_frame_size, i_bit_rate;
- unsigned int i_rate, i_channels, i_channels_conf;
+ mtime_t i_pts;
+ vlc_a52_header_t frame;
};
enum {
STATE_NOSYNC,
STATE_SYNC,
STATE_HEADER,
- STATE_DATA
+ STATE_NEXT_SYNC,
+ STATE_GET_DATA,
+ STATE_SEND_DATA
};
/****************************************************************************
* Local prototypes
****************************************************************************/
-static int OpenDecoder ( vlc_object_t * );
-static int OpenPacketizer( vlc_object_t * );
+static void *DecodeBlock ( decoder_t *, block_t ** );
-static int InitDecoder ( decoder_t * );
-static int RunDecoder ( decoder_t *, block_t * );
-static int EndDecoder ( decoder_t * );
-
-static int SyncInfo ( const byte_t *, int *, int *, int *,int * );
-
-static int GetOutBuffer ( decoder_t *, uint8_t ** );
-static int GetAoutBuffer( decoder_t *, aout_buffer_t ** );
-static int GetSoutBuffer( decoder_t *, sout_buffer_t ** );
-static int SendOutBuffer( decoder_t * );
+static uint8_t *GetOutBuffer ( decoder_t *, block_t ** );
+static aout_buffer_t *GetAoutBuffer( decoder_t * );
+static block_t *GetSoutBuffer( decoder_t * );
/*****************************************************************************
- * Module descriptor
+ * OpenCommon: probe the decoder/packetizer and return score
*****************************************************************************/
-vlc_module_begin();
- set_description( _("A/52 parser") );
- set_capability( "decoder", 100 );
- set_callbacks( OpenDecoder, NULL );
-
- add_submodule();
- set_description( _("A/52 audio packetizer") );
- set_capability( "packetizer", 10 );
- set_callbacks( OpenPacketizer, NULL );
-vlc_module_end();
-
-/*****************************************************************************
- * OpenDecoder: probe the decoder and return score
- *****************************************************************************/
-static int OpenDecoder( vlc_object_t *p_this )
+static int OpenCommon( vlc_object_t *p_this, bool b_packetizer )
{
decoder_t *p_dec = (decoder_t*)p_this;
+ decoder_sys_t *p_sys;
+ vlc_fourcc_t i_codec;
- if( p_dec->p_fifo->i_fourcc != VLC_FOURCC('a','5','2',' ')
- && p_dec->p_fifo->i_fourcc != VLC_FOURCC('a','5','2','b') )
+ switch( p_dec->fmt_in.i_codec )
{
+ case VLC_CODEC_A52:
+ i_codec = VLC_CODEC_A52;
+ break;
+ case VLC_CODEC_EAC3:
+ /* XXX ugly hack, a52 does not support eac3 so no eac3 pass-through
+ * support */
+ if( !b_packetizer )
+ return VLC_EGENERIC;
+ i_codec = VLC_CODEC_EAC3;
+ break;
+ default:
return VLC_EGENERIC;
}
- p_dec->pf_init = InitDecoder;
- p_dec->pf_decode = RunDecoder;
- p_dec->pf_end = EndDecoder;
-
/* Allocate the memory needed to store the decoder's structure */
- if( ( p_dec->p_sys =
+ 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;
- }
- p_dec->p_sys->b_packetizer = VLC_FALSE;
-
+ return VLC_ENOMEM;
+
+ /* Misc init */
+ p_sys->b_packetizer = b_packetizer;
+ p_sys->i_state = STATE_NOSYNC;
+ date_Set( &p_sys->end_date, 0 );
+ p_sys->i_pts = VLC_TS_INVALID;
+
+ p_sys->bytestream = block_BytestreamInit();
+
+ /* Set output properties */
+ p_dec->fmt_out.i_cat = AUDIO_ES;
+ p_dec->fmt_out.i_codec = i_codec;
+ p_dec->fmt_out.audio.i_rate = 0; /* So end_date gets initialized */
+ p_dec->fmt_out.audio.i_bytes_per_frame = 0;
+
+ /* Set callback */
+ if( b_packetizer )
+ p_dec->pf_packetize = (block_t *(*)(decoder_t *, block_t **))
+ DecodeBlock;
+ else
+ p_dec->pf_decode_audio = (aout_buffer_t *(*)(decoder_t *, block_t **))
+ DecodeBlock;
return VLC_SUCCESS;
}
-static int OpenPacketizer( vlc_object_t *p_this )
+static int OpenDecoder( vlc_object_t *p_this )
{
- decoder_t *p_dec = (decoder_t*)p_this;
-
- int i_ret = OpenDecoder( p_this );
-
- if( i_ret == VLC_SUCCESS ) p_dec->p_sys->b_packetizer = VLC_TRUE;
-
- return i_ret;
+ /* HACK: Don't use this codec if we don't have an a52 audio filter */
+ if( !module_exists( "a52tofloat32" ) )
+ return VLC_EGENERIC;
+ return OpenCommon( p_this, false );
}
-/*****************************************************************************
- * InitDecoder: Initalize the decoder
- *****************************************************************************/
-static int InitDecoder( decoder_t *p_dec )
+static int OpenPacketizer( vlc_object_t *p_this )
{
- p_dec->p_sys->i_state = STATE_NOSYNC;
- p_dec->p_sys->b_synchro = VLC_FALSE;
-
- p_dec->p_sys->p_out_buffer = NULL;
- p_dec->p_sys->i_out_buffer = 0;
- aout_DateSet( &p_dec->p_sys->end_date, 0 );
-
- p_dec->p_sys->p_aout = NULL;
- p_dec->p_sys->p_aout_input = NULL;
- p_dec->p_sys->p_aout_buffer = NULL;
- p_dec->p_sys->aout_format.i_format = VLC_FOURCC('a','5','2',' ');
-
- p_dec->p_sys->p_sout_input = NULL;
- p_dec->p_sys->p_sout_buffer = NULL;
- p_dec->p_sys->sout_format.i_cat = AUDIO_ES;
- p_dec->p_sys->sout_format.i_fourcc = VLC_FOURCC( 'a', '5', '2', ' ' );
-
- p_dec->p_sys->p_chain = NULL;
-
- return VLC_SUCCESS;
+ return OpenCommon( p_this, true );
}
/****************************************************************************
- * RunDecoder: the whole thing
+ * DecodeBlock: the whole thing
****************************************************************************
* This function is called just after the thread is launched.
****************************************************************************/
-static int RunDecoder( decoder_t *p_dec, block_t *p_block )
+static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
- uint8_t p_header[A52_HEADER_SIZE];
+ uint8_t p_header[VLC_A52_HEADER_SIZE];
+ uint8_t *p_buf;
+ block_t *p_out_buffer;
+
+ if( !pp_block || !*pp_block ) return NULL;
- if( p_sys->p_chain )
+ if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
{
- block_ChainAppend( &p_sys->p_chain, p_block );
+ 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 );
+ return NULL;
}
- else
+
+ if( !date_Get( &p_sys->end_date ) && (*pp_block)->i_pts <= VLC_TS_INVALID)
{
- block_ChainAppend( &p_sys->p_chain, p_block );
- p_sys->bytestream = block_BytestreamInit( p_dec, p_sys->p_chain, 0 );
+ /* We've just started the stream, wait for the first PTS. */
+ block_Release( *pp_block );
+ return NULL;
}
+ block_BytestreamPush( &p_sys->bytestream, *pp_block );
+
while( 1 )
{
switch( p_sys->i_state )
{
-
case STATE_NOSYNC:
while( block_PeekBytes( &p_sys->bytestream, p_header, 2 )
== VLC_SUCCESS )
break;
}
block_SkipByte( &p_sys->bytestream );
- p_dec->p_sys->b_synchro = VLC_FALSE;
}
if( p_sys->i_state != STATE_SYNC )
{
- block_ChainRelease( p_sys->p_chain );
- p_sys->p_chain = NULL;
+ block_BytestreamFlush( &p_sys->bytestream );
/* Need more data */
- return VLC_SUCCESS;
+ return NULL;
}
case STATE_SYNC:
/* New frame, set the Presentation Time Stamp */
- p_sys->pts = p_sys->bytestream.p_block->i_pts;
- if( p_sys->pts != 0 &&
- p_sys->pts != aout_DateGet( &p_sys->end_date ) )
+ 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 ) )
{
- aout_DateSet( &p_sys->end_date, p_sys->pts );
+ date_Set( &p_sys->end_date, p_sys->i_pts );
}
p_sys->i_state = STATE_HEADER;
- break;
case STATE_HEADER:
- /* Get A/52 frame header (A52_HEADER_SIZE bytes) */
+ /* Get A/52 frame header (VLC_A52_HEADER_SIZE bytes) */
if( block_PeekBytes( &p_sys->bytestream, p_header,
- A52_HEADER_SIZE ) != VLC_SUCCESS )
+ VLC_A52_HEADER_SIZE ) != VLC_SUCCESS )
{
/* Need more data */
- return VLC_SUCCESS;
+ return NULL;
}
/* Check if frame is valid and get frame info */
- p_sys->i_frame_size = SyncInfo( p_header,
- &p_sys->i_channels,
- &p_sys->i_channels_conf,
- &p_sys->i_rate,
- &p_sys->i_bit_rate );
- if( !p_sys->i_frame_size )
+ if( vlc_a52_header_Parse( &p_sys->frame, p_header, VLC_A52_HEADER_SIZE ) )
{
msg_Dbg( p_dec, "emulated sync word" );
block_SkipByte( &p_sys->bytestream );
p_sys->i_state = STATE_NOSYNC;
- p_dec->p_sys->b_synchro = VLC_FALSE;
break;
}
- p_sys->i_state = STATE_DATA;
- case STATE_DATA:
- /* TODO: If p_block == NULL, flush the buffer without checking the
+ p_sys->i_state = STATE_NEXT_SYNC;
+
+ case STATE_NEXT_SYNC:
+ /* TODO: If pp_block == NULL, flush the buffer without checking the
* next sync word */
- if( !p_dec->p_sys->b_synchro )
+ /* Check if next expected frame contains the sync word */
+ if( block_PeekOffsetBytes( &p_sys->bytestream,
+ p_sys->frame.i_size, p_header, 2 )
+ != VLC_SUCCESS )
{
- /* Check if next expected frame contains the sync word */
- if( block_PeekOffsetBytes( &p_sys->bytestream,
- p_sys->i_frame_size, p_header, 2 )
- != VLC_SUCCESS )
- {
- /* Need more data */
- return VLC_SUCCESS;
- }
+ /* Need more data */
+ return NULL;
+ }
- if( p_header[0] != 0x0b || p_header[1] != 0x77 )
- {
- msg_Dbg( p_dec, "emulated sync word "
- "(no sync on following frame)" );
- p_sys->i_state = STATE_NOSYNC;
- block_SkipByte( &p_sys->bytestream );
- p_dec->p_sys->b_synchro = VLC_FALSE;
- break;
- }
+ 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_dec->p_sys->p_out_buffer )
- if( GetOutBuffer( p_dec, &p_sys->p_out_buffer ) != VLC_SUCCESS )
+ if( p_header[0] != 0x0b || p_header[1] != 0x77 )
{
- return VLC_EGENERIC;
+ msg_Dbg( p_dec, "emulated sync word "
+ "(no sync on following frame)" );
+ p_sys->i_state = STATE_NOSYNC;
+ block_SkipByte( &p_sys->bytestream );
+ break;
}
+ p_sys->i_state = STATE_SEND_DATA;
+ break;
- /* Copy the whole frame into the buffer */
- if( block_GetBytes( &p_sys->bytestream, p_sys->p_out_buffer,
- p_sys->i_frame_size ) != VLC_SUCCESS )
+ case STATE_GET_DATA:
+ /* Make sure we have enough data.
+ * (Not useful if we went through NEXT_SYNC) */
+ if( block_WaitBytes( &p_sys->bytestream,
+ p_sys->frame.i_size ) != VLC_SUCCESS )
{
/* Need more data */
- return VLC_SUCCESS;
+ return NULL;
}
+ p_sys->i_state = STATE_SEND_DATA;
- p_sys->p_chain = block_BytestreamFlush( &p_sys->bytestream );
+ case STATE_SEND_DATA:
+ if( !(p_buf = GetOutBuffer( p_dec, &p_out_buffer )) )
+ {
+ //p_dec->b_error = true;
+ return NULL;
+ }
- SendOutBuffer( p_dec );
- p_sys->i_state = STATE_NOSYNC;
- p_dec->p_sys->b_synchro = VLC_TRUE;
+ /* 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( p_sys->frame.i_size, p_out_buffer->i_buffer ) );
/* Make sure we don't reuse the same pts twice */
- if( p_sys->pts == p_sys->bytestream.p_block->i_pts )
- p_sys->pts = p_sys->bytestream.p_block->i_pts = 0;
- }
- }
-
- return VLC_SUCCESS;
-}
+ if( p_sys->i_pts == p_sys->bytestream.p_block->i_pts )
+ p_sys->i_pts = p_sys->bytestream.p_block->i_pts = VLC_TS_INVALID;
-/*****************************************************************************
- * EndDecoder: clean up the decoder
- *****************************************************************************/
-static int EndDecoder( decoder_t *p_dec )
-{
- if( p_dec->p_sys->p_aout_input != NULL )
- {
- if( p_dec->p_sys->p_aout_buffer )
- {
- aout_DecDeleteBuffer( p_dec->p_sys->p_aout,
- p_dec->p_sys->p_aout_input,
- p_dec->p_sys->p_aout_buffer );
- }
+ /* So p_block doesn't get re-added several times */
+ *pp_block = block_BytestreamPop( &p_sys->bytestream );
- aout_DecDelete( p_dec->p_sys->p_aout, p_dec->p_sys->p_aout_input );
- }
+ p_sys->i_state = STATE_NOSYNC;
- if( p_dec->p_sys->p_sout_input != NULL )
- {
- if( p_dec->p_sys->p_sout_buffer )
- {
- sout_BufferDelete( p_dec->p_sys->p_sout_input->p_sout,
- p_dec->p_sys->p_sout_buffer );
+ return p_out_buffer;
}
-
- sout_InputDelete( p_dec->p_sys->p_sout_input );
}
- if( p_dec->p_sys->p_chain ) block_ChainRelease( p_dec->p_sys->p_chain );
-
- free( p_dec->p_sys );
-
- return VLC_SUCCESS;
+ return NULL;
}
/*****************************************************************************
- * GetOutBuffer:
+ * CloseCommon: clean up the decoder
*****************************************************************************/
-static int GetOutBuffer( decoder_t *p_dec, uint8_t **pp_out_buffer )
+static void CloseCommon( vlc_object_t *p_this )
{
+ decoder_t *p_dec = (decoder_t*)p_this;
decoder_sys_t *p_sys = p_dec->p_sys;
- int i_ret;
- if( p_sys->b_packetizer )
- {
- i_ret= GetSoutBuffer( p_dec, &p_sys->p_sout_buffer );
- *pp_out_buffer =
- p_sys->p_sout_buffer ? p_sys->p_sout_buffer->p_buffer : NULL;
- }
- else
- {
- i_ret = GetAoutBuffer( p_dec, &p_sys->p_aout_buffer );
- *pp_out_buffer =
- p_sys->p_aout_buffer ? p_sys->p_aout_buffer->p_buffer : NULL;
- }
+ block_BytestreamRelease( &p_sys->bytestream );
- return i_ret;
+ free( p_sys );
}
/*****************************************************************************
- * GetAoutBuffer:
+ * GetOutBuffer:
*****************************************************************************/
-static int GetAoutBuffer( decoder_t *p_dec, aout_buffer_t **pp_buffer )
+static uint8_t *GetOutBuffer( decoder_t *p_dec, block_t **pp_out_buffer )
{
decoder_sys_t *p_sys = p_dec->p_sys;
+ uint8_t *p_buf;
- if( p_sys->p_aout_input != NULL &&
- ( p_sys->aout_format.i_rate != p_sys->i_rate
- || p_sys->aout_format.i_original_channels != p_sys->i_channels_conf
- || (int)p_sys->aout_format.i_bytes_per_frame != p_sys->i_frame_size ) )
+ if( p_dec->fmt_out.audio.i_rate != p_sys->frame.i_rate )
{
- /* Parameters changed - this should not happen. */
- aout_DecDelete( p_sys->p_aout, p_sys->p_aout_input );
- p_sys->p_aout_input = NULL;
- }
+ msg_Dbg( p_dec, "A/52 channels:%d samplerate:%d bitrate:%d",
+ p_sys->frame.i_channels, p_sys->frame.i_rate, p_sys->frame.i_bitrate );
- /* Creating the audio input if not created yet. */
- if( p_sys->p_aout_input == NULL )
- {
- p_sys->aout_format.i_rate = p_sys->i_rate;
- p_sys->aout_format.i_original_channels = p_sys->i_channels_conf;
- p_sys->aout_format.i_physical_channels
- = p_sys->i_channels_conf & AOUT_CHAN_PHYSMASK;
- p_sys->aout_format.i_bytes_per_frame = p_sys->i_frame_size;
- p_sys->aout_format.i_frame_length = A52_FRAME_NB;
- aout_DateInit( &p_sys->end_date, p_sys->i_rate );
- aout_DateSet( &p_sys->end_date, p_sys->pts );
- p_sys->p_aout_input = aout_DecNew( p_dec,
- &p_sys->p_aout,
- &p_sys->aout_format );
-
- if ( p_sys->p_aout_input == NULL )
- {
- *pp_buffer = NULL;
- return VLC_SUCCESS;
- }
+ date_Init( &p_sys->end_date, p_sys->frame.i_rate, 1 );
+ date_Set( &p_sys->end_date, p_sys->i_pts );
}
- if( !aout_DateGet( &p_sys->end_date ) )
- {
- /* We've just started the stream, wait for the first PTS. */
- *pp_buffer = NULL;
- return VLC_SUCCESS;
- }
+ p_dec->fmt_out.audio.i_rate = p_sys->frame.i_rate;
+ p_dec->fmt_out.audio.i_channels = p_sys->frame.i_channels;
+ if( p_dec->fmt_out.audio.i_bytes_per_frame < p_sys->frame.i_size )
+ p_dec->fmt_out.audio.i_bytes_per_frame = p_sys->frame.i_size;
+ p_dec->fmt_out.audio.i_frame_length = p_sys->frame.i_samples;
- *pp_buffer = aout_DecNewBuffer( p_sys->p_aout, p_sys->p_aout_input,
- A52_FRAME_NB );
- if( *pp_buffer == NULL )
- {
- return VLC_SUCCESS;
- }
-
- (*pp_buffer)->start_date = aout_DateGet( &p_sys->end_date );
- (*pp_buffer)->end_date =
- aout_DateIncrement( &p_sys->end_date, A52_FRAME_NB );
-
- return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * GetSoutBuffer:
- *****************************************************************************/
-static int GetSoutBuffer( decoder_t *p_dec, sout_buffer_t **pp_buffer )
-{
- decoder_sys_t *p_sys = p_dec->p_sys;
-
- if( p_sys->p_sout_input != NULL &&
- ( p_sys->sout_format.i_sample_rate != (int)p_sys->i_rate
- || p_sys->sout_format.i_channels != (int)p_sys->i_channels ) )
- {
- /* Parameters changed - this should not happen. */
- }
+ p_dec->fmt_out.audio.i_original_channels = p_sys->frame.i_channels_conf;
+ p_dec->fmt_out.audio.i_physical_channels =
+ p_sys->frame.i_channels_conf & AOUT_CHAN_PHYSMASK;
- /* Creating the sout input if not created yet. */
- if( p_sys->p_sout_input == NULL )
- {
- p_sys->sout_format.i_sample_rate = p_sys->i_rate;
- p_sys->sout_format.i_channels = p_sys->i_channels;
- p_sys->sout_format.i_block_align = 0;
- p_sys->sout_format.i_bitrate = p_sys->i_bit_rate;
- p_sys->sout_format.i_extra_data = 0;
- p_sys->sout_format.p_extra_data = NULL;
-
- aout_DateInit( &p_sys->end_date, p_sys->i_rate );
- aout_DateSet( &p_sys->end_date, p_sys->pts );
-
- p_sys->p_sout_input = sout_InputNew( p_dec, &p_sys->sout_format );
- if( p_sys->p_sout_input == NULL )
- {
- msg_Err( p_dec, "cannot add a new stream" );
- *pp_buffer = NULL;
- return VLC_EGENERIC;
- }
- msg_Info( p_dec, "A/52 channels:%d samplerate:%d bitrate:%d",
- p_sys->i_channels, p_sys->i_rate, p_sys->i_bit_rate );
- }
+ p_dec->fmt_out.i_bitrate = p_sys->frame.i_bitrate;
- if( !aout_DateGet( &p_sys->end_date ) )
+ if( p_sys->b_packetizer )
{
- /* We've just started the stream, wait for the first PTS. */
- *pp_buffer = NULL;
- return VLC_SUCCESS;
+ 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;
}
-
- *pp_buffer = sout_BufferNew( p_sys->p_sout_input->p_sout,
- p_sys->i_frame_size );
- if( *pp_buffer == NULL )
+ else
{
- return VLC_SUCCESS;
+ aout_buffer_t *p_aout_buffer = GetAoutBuffer( p_dec );
+ p_buf = p_aout_buffer ? p_aout_buffer->p_buffer : NULL;
+ *pp_out_buffer = p_aout_buffer;
}
- (*pp_buffer)->i_pts =
- (*pp_buffer)->i_dts = aout_DateGet( &p_sys->end_date );
-
- (*pp_buffer)->i_length =
- aout_DateIncrement( &p_sys->end_date, A52_FRAME_NB )
- - (*pp_buffer)->i_pts;
-
- return VLC_SUCCESS;
+ return p_buf;
}
/*****************************************************************************
- * SendOutBuffer:
+ * GetAoutBuffer:
*****************************************************************************/
-static int SendOutBuffer( decoder_t *p_dec )
+static aout_buffer_t *GetAoutBuffer( decoder_t *p_dec )
{
decoder_sys_t *p_sys = p_dec->p_sys;
+ aout_buffer_t *p_buf;
- if( p_sys->b_packetizer )
- {
- sout_InputSendBuffer( p_sys->p_sout_input, p_sys->p_sout_buffer );
- p_sys->p_sout_buffer = NULL;
- }
- else
- {
- /* We have all we need, send the buffer to the aout core. */
- aout_DecPlay( p_sys->p_aout, p_sys->p_aout_input,
- p_sys->p_aout_buffer );
- p_sys->p_aout_buffer = NULL;
- }
+ p_buf = decoder_NewAudioBuffer( p_dec, p_sys->frame.i_samples );
+ if( p_buf == NULL ) return NULL;
- p_sys->p_out_buffer = NULL;
+ p_buf->i_pts = date_Get( &p_sys->end_date );
+ p_buf->i_length = date_Increment( &p_sys->end_date,
+ p_sys->frame.i_samples ) - p_buf->i_pts;
- return VLC_SUCCESS;
+ return p_buf;
}
/*****************************************************************************
- * SyncInfo: parse A/52 sync info
- *****************************************************************************
- * This code is borrowed from liba52 by Aaron Holtzman & Michel Lespinasse,
- * since we don't want to oblige S/PDIF people to use liba52 just to get
- * their SyncInfo...
+ * GetSoutBuffer:
*****************************************************************************/
-static int SyncInfo( const byte_t * p_buf,
- int * pi_channels, int * pi_channels_conf,
- int * pi_sample_rate, int * pi_bit_rate )
+static block_t *GetSoutBuffer( decoder_t *p_dec )
{
- 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,
- 128, 160, 192, 224, 256, 320, 384, 448,
- 512, 576, 640 };
- static const uint8_t lfeon[8] = { 0x10, 0x10, 0x04, 0x04,
- 0x04, 0x01, 0x04, 0x01 };
- int frmsizecod;
- int bitrate;
- int half;
- int acmod;
-
- if ((p_buf[0] != 0x0b) || (p_buf[1] != 0x77)) /* syncword */
- return 0;
-
- if (p_buf[5] >= 0x60) /* bsid >= 12 */
- return 0;
- half = halfrate[p_buf[5] >> 3];
-
- /* acmod, dsurmod and lfeon */
- acmod = p_buf[6] >> 5;
- if ( (p_buf[6] & 0xf8) == 0x50 )
- {
- /* Dolby surround = stereo + Dolby */
- *pi_channels = 2;
- *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
- | AOUT_CHAN_DOLBYSTEREO;
- }
- else switch ( acmod )
- {
- case 0x0:
- /* Dual-mono = stereo + dual-mono */
- *pi_channels = 2;
- *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
- | AOUT_CHAN_DUALMONO;
- break;
- case 0x1:
- /* Mono */
- *pi_channels = 1;
- *pi_channels_conf = AOUT_CHAN_CENTER;
- break;
- case 0x2:
- /* Stereo */
- *pi_channels = 2;
- *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
- break;
- case 0x3:
- /* 3F */
- *pi_channels = 3;
- *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
- | AOUT_CHAN_CENTER;
- break;
- case 0x4:
- /* 2F1R */
- *pi_channels = 3;
- *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
- | AOUT_CHAN_REARCENTER;
- break;
- case 0x5:
- /* 3F1R */
- *pi_channels = 4;
- *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
- | AOUT_CHAN_REARCENTER;
- break;
- case 0x6:
- /* 2F2R */
- *pi_channels = 4;
- *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
- | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
- break;
- case 0x7:
- /* 3F2R */
- *pi_channels = 5;
- *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
- | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
- break;
- default:
- return 0;
- }
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ block_t *p_block;
- if ( p_buf[6] & lfeon[acmod] )
- {
- (*pi_channels)++;
- *pi_channels_conf |= AOUT_CHAN_LFE;
- }
+ p_block = block_New( p_dec, p_sys->frame.i_size );
+ if( p_block == NULL ) return NULL;
- frmsizecod = p_buf[4] & 63;
- if (frmsizecod >= 38)
- return 0;
- bitrate = rate [frmsizecod >> 1];
- *pi_bit_rate = (bitrate * 1000) >> half;
-
- switch (p_buf[4] & 0xc0) {
- case 0:
- *pi_sample_rate = 48000 >> half;
- return 4 * bitrate;
- case 0x40:
- *pi_sample_rate = 44100 >> half;
- return 2 * (320 * bitrate / 147 + (frmsizecod & 1));
- case 0x80:
- *pi_sample_rate = 32000 >> half;
- return 6 * bitrate;
- default:
- return 0;
- }
+ p_block->i_pts = p_block->i_dts = date_Get( &p_sys->end_date );
+
+ p_block->i_length =
+ date_Increment( &p_sys->end_date, p_sys->frame.i_samples ) - p_block->i_pts;
+
+ return p_block;
}
+
projects / vlc / blobdiff