/*****************************************************************************
- * 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.23 2003/09/02 20:19:25 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_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_state;
-
- uint8_t p_header[A52_HEADER_SIZE];
- int i_header;
+ int i_state;
- mtime_t pts;
-
- int i_frame_size;
+ block_bytestream_t bytestream;
/*
- * Decoder output properties
+ * Common properties
*/
- aout_instance_t * p_aout; /* opaque */
- aout_input_t * p_aout_input; /* opaque */
- audio_sample_format_t aout_format;
+ audio_date_t end_date;
- 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 */
+ mtime_t i_pts;
+ int i_frame_size, i_bit_rate;
+ unsigned int i_rate, i_channels, i_channels_conf;
- /*
- * Common properties
- */
- uint8_t *p_out_buffer; /* output buffer */
- int i_out_buffer; /* position in output buffer */
- audio_date_t end_date;
+ int i_input_rate;
};
enum {
STATE_NOSYNC,
- STATE_PARTIAL_SYNC,
STATE_SYNC,
STATE_HEADER,
- STATE_DATA
+ STATE_NEXT_SYNC,
+ STATE_GET_DATA,
+ STATE_SEND_DATA
};
/****************************************************************************
****************************************************************************/
static int OpenDecoder ( vlc_object_t * );
static int OpenPacketizer( vlc_object_t * );
+static void CloseDecoder ( 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 SyncInfo ( const uint8_t *, unsigned int *, unsigned int *,
+ unsigned 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 *, void ** );
+static aout_buffer_t *GetAoutBuffer( decoder_t * );
+static block_t *GetSoutBuffer( 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, NULL );
+ 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, NULL );
+ set_callbacks( OpenPacketizer, CloseDecoder );
vlc_module_end();
/*****************************************************************************
static int OpenDecoder( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t*)p_this;
+ decoder_sys_t *p_sys;
- if( p_dec->p_fifo->i_fourcc != VLC_FOURCC('a','5','2',' ')
- && p_dec->p_fifo->i_fourcc != VLC_FOURCC('a','5','2','b') )
+ if( p_dec->fmt_in.i_codec != VLC_FOURCC('a','5','2',' ')
+ && p_dec->fmt_in.i_codec != VLC_FOURCC('a','5','2','b') )
{
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 = false;
+ p_sys->i_state = STATE_NOSYNC;
+ aout_DateSet( &p_sys->end_date, 0 );
+
+ 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 **))
+ DecodeBlock;
+ p_dec->pf_packetize = (block_t *(*)(decoder_t *, block_t **))
+ DecodeBlock;
return VLC_SUCCESS;
}
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;
}
-/*****************************************************************************
- * InitDecoder: Initalize the decoder
- *****************************************************************************/
-static int InitDecoder( decoder_t *p_dec )
-{
- p_dec->p_sys->i_state = STATE_NOSYNC;
-
- 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', ' ' );
-
- return VLC_SUCCESS;
-}
-
/****************************************************************************
- * 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;
- int i_block_pos = 0;
- mtime_t i_pts = p_block->i_pts;
+ uint8_t p_header[A52_HEADER_SIZE];
+ uint8_t *p_buf;
+ void *p_out_buffer;
+
+ if( !pp_block || !*pp_block ) return NULL;
+
+ if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
+ {
+ 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;
+ }
- while( i_block_pos < p_block->i_buffer )
+ if( !aout_DateGet( &p_sys->end_date ) && !(*pp_block)->i_pts )
+ {
+ /* 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 )
{
switch( p_sys->i_state )
{
case STATE_NOSYNC:
- /* Look for sync word - should be 0x0b77 */
- while( i_block_pos < p_block->i_buffer &&
- p_block->p_buffer[i_block_pos] != 0x0b )
+ while( block_PeekBytes( &p_sys->bytestream, p_header, 2 )
+ == VLC_SUCCESS )
{
- i_block_pos++;
+ if( p_header[0] == 0x0b && p_header[1] == 0x77 )
+ {
+ p_sys->i_state = STATE_SYNC;
+ break;
+ }
+ block_SkipByte( &p_sys->bytestream );
}
-
- if( i_block_pos < p_block->i_buffer )
+ if( p_sys->i_state != STATE_SYNC )
{
- p_sys->i_state = STATE_PARTIAL_SYNC;
- i_block_pos++;
- p_sys->p_header[0] = 0x0b;
- break;
- }
- break;
+ block_BytestreamFlush( &p_sys->bytestream );
- case STATE_PARTIAL_SYNC:
- if( p_block->p_buffer[i_block_pos] == 0x77 )
- {
- p_sys->i_state = STATE_SYNC;
- i_block_pos++;
- p_sys->p_header[1] = 0x77;
- p_sys->i_header = 2;
+ /* Need more data */
+ return NULL;
}
- else
- {
- p_sys->i_state = STATE_NOSYNC;
- }
- break;
case STATE_SYNC:
/* New frame, set the Presentation Time Stamp */
- p_sys->pts = i_pts; i_pts = 0;
- 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 != 0 &&
+ p_sys->i_pts != aout_DateGet( &p_sys->end_date ) )
{
- aout_DateSet( &p_sys->end_date, p_sys->pts );
+ aout_DateSet( &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) */
- if( p_sys->i_header < A52_HEADER_SIZE )
+ if( block_PeekBytes( &p_sys->bytestream, p_header,
+ A52_HEADER_SIZE ) != VLC_SUCCESS )
{
- int i_size = __MIN( A52_HEADER_SIZE - p_sys->i_header,
- p_block->i_buffer - i_block_pos );
-
- memcpy( p_sys->p_header + p_sys->i_header,
- p_block->p_buffer + i_block_pos, i_size );
- i_block_pos += i_size;
- p_sys->i_header += i_size;
+ /* Need more data */
+ return NULL;
}
- if( p_sys->i_header < A52_HEADER_SIZE )
+ /* 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 )
+ {
+ msg_Dbg( p_dec, "emulated sync word" );
+ block_SkipByte( &p_sys->bytestream );
+ p_sys->i_state = STATE_NOSYNC;
break;
+ }
+ p_sys->i_state = STATE_NEXT_SYNC;
- if( GetOutBuffer( p_dec, &p_sys->p_out_buffer )
+ case STATE_NEXT_SYNC:
+ /* TODO: If pp_block == NULL, flush the buffer without checking the
+ * next sync word */
+
+ /* 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 )
{
- block_Release( p_block );
- return VLC_EGENERIC;
+ /* Need more data */
+ return NULL;
}
- if( !p_sys->p_out_buffer )
+ if( p_sys->b_packetizer &&
+ p_header[0] == 0 && p_header[1] == 0 )
{
- p_sys->i_state = STATE_NOSYNC;
+ /* A52 wav files and audio CD's use stuffing */
+ p_sys->i_state = STATE_GET_DATA;
break;
}
- memcpy( p_sys->p_out_buffer, p_sys->p_header, A52_HEADER_SIZE );
- p_sys->i_out_buffer = A52_HEADER_SIZE;
- p_sys->i_state = STATE_DATA;
+ 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 );
+ break;
+ }
+ p_sys->i_state = STATE_SEND_DATA;
break;
- case STATE_DATA:
- /* Copy the whole A52 frame into the aout buffer */
- if( p_sys->i_out_buffer < p_sys->i_frame_size )
+ 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->i_frame_size ) != VLC_SUCCESS )
{
- int i_size = __MIN( p_sys->i_frame_size - p_sys->i_out_buffer,
- p_block->i_buffer - i_block_pos );
+ /* Need more data */
+ return NULL;
+ }
+ p_sys->i_state = STATE_SEND_DATA;
- memcpy( p_sys->p_out_buffer + p_sys->i_out_buffer,
- p_block->p_buffer + i_block_pos, i_size );
- i_block_pos += i_size;
- p_sys->i_out_buffer += i_size;
+ case STATE_SEND_DATA:
+ if( !(p_buf = GetOutBuffer( p_dec, &p_out_buffer )) )
+ {
+ //p_dec->b_error = true;
+ return NULL;
}
- if( p_sys->i_out_buffer < p_sys->i_frame_size )
- break; /* Need more data */
+ /* 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, p_sys->i_frame_size );
- SendOutBuffer( p_dec );
+ /* Make sure we don't reuse the same pts twice */
+ if( p_sys->i_pts == p_sys->bytestream.p_block->i_pts )
+ p_sys->i_pts = p_sys->bytestream.p_block->i_pts = 0;
- p_sys->i_state = STATE_NOSYNC;
- break;
- }
- }
-
- block_Release( p_block );
- return VLC_SUCCESS;
-}
+ /* So p_block doesn't get re-added several times */
+ *pp_block = block_BytestreamPop( &p_sys->bytestream );
-/*****************************************************************************
- * 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 );
- }
-
- 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 );
}
- free( p_dec->p_sys );
-
- return VLC_SUCCESS;
+ return NULL;
}
/*****************************************************************************
- * GetOutBuffer:
+ * CloseDecoder: clean up the decoder
*****************************************************************************/
-static int GetOutBuffer ( decoder_t *p_dec, uint8_t **pp_out_buffer )
+static void CloseDecoder( 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, void **pp_out_buffer )
{
- int i_bit_rate;
- unsigned int i_rate, i_channels, i_channels_conf;
-
decoder_sys_t *p_sys = p_dec->p_sys;
+ uint8_t *p_buf;
- /* Check if frame is valid and get frame info */
- p_sys->i_frame_size = SyncInfo( p_sys->p_header,
- &i_channels, &i_channels_conf,
- &i_rate, &i_bit_rate );
-
- if( !p_sys->i_frame_size )
+ if( p_dec->fmt_out.audio.i_rate != p_sys->i_rate )
{
- msg_Warn( p_dec, "a52 syncinfo failed" );
- *pp_buffer = NULL;
- return VLC_SUCCESS;
- }
+ 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 );
- if( p_sys->p_aout_input != NULL && ( p_sys->aout_format.i_rate != i_rate
- || p_sys->aout_format.i_original_channels != i_channels_conf
- || (int)p_sys->aout_format.i_bytes_per_frame != p_sys->i_frame_size ) )
- {
- /* Parameters changed - this should not happen. */
- aout_DecDelete( p_sys->p_aout, p_sys->p_aout_input );
- p_sys->p_aout_input = NULL;
+ aout_DateInit( &p_sys->end_date, p_sys->i_rate );
+ aout_DateSet( &p_sys->end_date, p_sys->i_pts );
}
- /* Creating the audio input if not created yet. */
- if( p_sys->p_aout_input == NULL )
- {
- p_sys->aout_format.i_rate = i_rate;
- p_sys->aout_format.i_original_channels = i_channels_conf;
- p_sys->aout_format.i_physical_channels
- = 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, 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;
- }
- }
+ p_dec->fmt_out.audio.i_rate = p_sys->i_rate;
+ p_dec->fmt_out.audio.i_channels = p_sys->i_channels;
+ p_dec->fmt_out.audio.i_bytes_per_frame = p_sys->i_frame_size;
+ p_dec->fmt_out.audio.i_frame_length = A52_FRAME_NB;
+
+ p_dec->fmt_out.audio.i_original_channels = p_sys->i_channels_conf;
+ 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;
- 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 = aout_DecNewBuffer( p_sys->p_aout, p_sys->p_aout_input,
- A52_FRAME_NB );
- 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)->start_date = aout_DateGet( &p_sys->end_date );
- (*pp_buffer)->end_date =
- aout_DateIncrement( &p_sys->end_date, A52_FRAME_NB );
-
- return VLC_SUCCESS;
+ return p_buf;
}
/*****************************************************************************
- * GetSoutBuffer:
+ * GetAoutBuffer:
*****************************************************************************/
-static int GetSoutBuffer( decoder_t *p_dec, sout_buffer_t **pp_buffer )
+static aout_buffer_t *GetAoutBuffer( decoder_t *p_dec )
{
- int i_bit_rate;
- unsigned int i_rate, i_channels, i_channels_conf;
-
decoder_sys_t *p_sys = p_dec->p_sys;
+ aout_buffer_t *p_buf;
- /* Check if frame is valid and get frame info */
- p_sys->i_frame_size = SyncInfo( p_sys->p_header,
- &i_channels, &i_channels_conf,
- &i_rate, &i_bit_rate );
-
- if( !p_sys->i_frame_size )
- {
- msg_Warn( p_dec, "a52 syncinfo failed" );
- *pp_buffer = NULL;
- return VLC_SUCCESS;
- }
-
- if( p_sys->p_sout_input != NULL &&
- ( p_sys->sout_format.i_sample_rate != (int)i_rate
- || p_sys->sout_format.i_channels != (int)i_channels ) )
- {
- /* Parameters changed - this should not happen. */
- }
-
- /* Creating the sout input if not created yet. */
- if( p_sys->p_sout_input == NULL )
- {
- p_sys->sout_format.i_sample_rate = i_rate;
- p_sys->sout_format.i_channels = i_channels;
- p_sys->sout_format.i_block_align = 0;
- p_sys->sout_format.i_bitrate = 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, 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",
- i_channels, i_rate, i_bit_rate );
- }
-
- if( !aout_DateGet( &p_sys->end_date ) )
- {
- /* We've just started the stream, wait for the first PTS. */
- *pp_buffer = NULL;
- return VLC_SUCCESS;
- }
-
- *pp_buffer = sout_BufferNew( p_sys->p_sout_input->p_sout,
- p_sys->i_frame_size );
- if( *pp_buffer == NULL )
- {
- return VLC_SUCCESS;
- }
-
- (*pp_buffer)->i_pts =
- (*pp_buffer)->i_dts = aout_DateGet( &p_sys->end_date );
+ p_buf = p_dec->pf_aout_buffer_new( p_dec, A52_FRAME_NB );
+ if( p_buf == NULL ) return NULL;
- (*pp_buffer)->i_length =
- aout_DateIncrement( &p_sys->end_date, A52_FRAME_NB )
- - (*pp_buffer)->i_pts;
+ p_buf->start_date = aout_DateGet( &p_sys->end_date );
+ p_buf->end_date = aout_DateIncrement( &p_sys->end_date,
+ A52_FRAME_NB * p_sys->i_input_rate / INPUT_RATE_DEFAULT );
- return VLC_SUCCESS;
+ return p_buf;
}
/*****************************************************************************
- * SendOutBuffer:
+ * GetSoutBuffer:
*****************************************************************************/
-static int SendOutBuffer( decoder_t *p_dec )
+static block_t *GetSoutBuffer( decoder_t *p_dec )
{
decoder_sys_t *p_sys = p_dec->p_sys;
+ block_t *p_block;
- 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_block = block_New( p_dec, p_sys->i_frame_size );
+ if( p_block == NULL ) return NULL;
- return VLC_SUCCESS;
+ 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_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,
projects / vlc / blobdiff