* a52.c: A/52 basic parser
*****************************************************************************
* Copyright (C) 2001-2002 VideoLAN
- * $Id: a52.c,v 1.10 2002/09/06 23:15:44 massiot Exp $
+ * $Id: a52.c,v 1.21 2003/01/15 10:58:47 massiot Exp $
*
* Authors: Stéphane Borel <stef@via.ecp.fr>
* Christophe Massiot <massiot@via.ecp.fr>
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 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
# include <unistd.h>
#endif
-#define A52_FRAME_NB 1536
-
/*****************************************************************************
- * spdif_thread_t : A52 pass-through thread descriptor
+ * dec_thread_t : decoder thread descriptor
*****************************************************************************/
-typedef struct spdif_thread_s
+typedef struct dec_thread_t
{
/*
* Thread properties
* Input properties
*/
decoder_fifo_t * p_fifo; /* stores the PES stream data */
-
- /* The bit stream structure handles the PES stream at the bit level */
bit_stream_t bit_stream;
/*
aout_instance_t * p_aout; /* opaque */
aout_input_t * p_aout_input; /* opaque */
audio_sample_format_t output_format;
-} spdif_thread_t;
+} dec_thread_t;
/****************************************************************************
* Local prototypes
static int OpenDecoder ( vlc_object_t * );
static int RunDecoder ( decoder_fifo_t * );
-static int InitThread ( spdif_thread_t *, decoder_fifo_t * );
-static void EndThread ( spdif_thread_t * );
+static void EndThread ( dec_thread_t * );
static int SyncInfo ( const byte_t *, int *, int *, int * );
*****************************************************************************/
vlc_module_begin();
set_description( _("A/52 parser") );
- set_capability( "decoder", 0 );
+ set_capability( "decoder", 100 );
set_callbacks( OpenDecoder, NULL );
- add_shortcut( "pass_through" );
- add_shortcut( "pass" );
vlc_module_end();
/*****************************************************************************
* OpenDecoder: probe the decoder and return score
- *****************************************************************************
- * Tries to launch a decoder and return score so that the interface is able
- * to chose.
*****************************************************************************/
-static int OpenDecoder( vlc_object_t *p_this )
-{
+static int OpenDecoder( vlc_object_t *p_this )
+{
decoder_fifo_t *p_fifo = (decoder_fifo_t*) p_this;
if( p_fifo->i_fourcc != VLC_FOURCC('a','5','2',' ')
&& p_fifo->i_fourcc != VLC_FOURCC('a','5','2','b') )
- {
- return VLC_EGENERIC;
+ {
+ return VLC_EGENERIC;
}
p_fifo->pf_run = RunDecoder;
****************************************************************************/
static int RunDecoder( decoder_fifo_t *p_fifo )
{
- spdif_thread_t * p_dec;
+ dec_thread_t * p_dec;
audio_date_t end_date;
-
+
/* Allocate the memory needed to store the thread's structure */
- p_dec = malloc( sizeof(spdif_thread_t) );
+ p_dec = malloc( sizeof(dec_thread_t) );
if( p_dec == NULL )
{
msg_Err( p_fifo, "out of memory" );
DecoderError( p_fifo );
return -1;
}
-
- if ( InitThread( p_dec, p_fifo ) )
+
+ /* Initialize the thread properties */
+ p_dec->p_aout = NULL;
+ p_dec->p_aout_input = NULL;
+ p_dec->p_fifo = p_fifo;
+ p_dec->output_format.i_format = VLC_FOURCC('a','5','2',' ');
+
+ aout_DateSet( &end_date, 0 );
+
+ /* Init the bitstream */
+ if( InitBitstream( &p_dec->bit_stream, p_dec->p_fifo,
+ NULL, NULL ) != VLC_SUCCESS )
{
-
- msg_Err( p_fifo, "could not initialize thread" );
+ msg_Err( p_fifo, "cannot initialize bitstream" );
DecoderError( p_fifo );
free( p_dec );
return -1;
}
- /* decoder thread's main loop */
+ /* Decoder thread's main loop */
while ( !p_dec->p_fifo->b_die && !p_dec->p_fifo->b_error )
{
- int i_frame_size, i_channels, i_rate, i_bit_rate;
+ int i_bit_rate;
+ unsigned int i_rate, i_original_channels, i_frame_size;
mtime_t pts;
- /* Temporary buffer to store the raw frame to be decoded */
byte_t p_header[7];
aout_buffer_t * p_buffer;
/* Look for sync word - should be 0x0b77 */
RealignBits( &p_dec->bit_stream );
- while ( (ShowBits( &p_dec->bit_stream, 16 ) ) != 0x0b77 &&
- (!p_dec->p_fifo->b_die) && (!p_dec->p_fifo->b_error))
+ while ( (ShowBits( &p_dec->bit_stream, 16 ) ) != 0x0b77 &&
+ (!p_dec->p_fifo->b_die) && (!p_dec->p_fifo->b_error) )
{
RemoveBits( &p_dec->bit_stream, 8 );
}
+ if ( p_dec->p_fifo->b_die || p_dec->p_fifo->b_error ) break;
/* Set the Presentation Time Stamp */
NextPTS( &p_dec->bit_stream, &pts, NULL );
/* Get A/52 frame header */
GetChunk( &p_dec->bit_stream, p_header, 7 );
- if( p_dec->p_fifo->b_die ) break;
+ if ( p_dec->p_fifo->b_die || p_dec->p_fifo->b_error ) break;
/* Check if frame is valid and get frame info */
- i_frame_size = SyncInfo( p_header, &i_channels, &i_rate,
+ i_frame_size = SyncInfo( p_header, &i_original_channels, &i_rate,
&i_bit_rate );
if( !i_frame_size )
if( (p_dec->p_aout_input != NULL) &&
( (p_dec->output_format.i_rate != i_rate)
- || (p_dec->output_format.i_channels != i_channels)
+ || (p_dec->output_format.i_original_channels
+ != i_original_channels)
|| (p_dec->output_format.i_bytes_per_frame != i_frame_size) ) )
{
/* Parameters changed - this should not happen. */
- aout_InputDelete( p_dec->p_aout, p_dec->p_aout_input );
+ aout_DecDelete( p_dec->p_aout, p_dec->p_aout_input );
p_dec->p_aout_input = NULL;
}
if( p_dec->p_aout_input == NULL )
{
p_dec->output_format.i_rate = i_rate;
- p_dec->output_format.i_channels = i_channels;
+ p_dec->output_format.i_original_channels = i_original_channels;
+ p_dec->output_format.i_physical_channels
+ = i_original_channels & AOUT_CHAN_PHYSMASK;
p_dec->output_format.i_bytes_per_frame = i_frame_size;
p_dec->output_format.i_frame_length = A52_FRAME_NB;
aout_DateInit( &end_date, i_rate );
- p_dec->p_aout_input = aout_InputNew( p_dec->p_fifo,
- &p_dec->p_aout,
- &p_dec->output_format );
+ p_dec->p_aout_input = aout_DecNew( p_dec->p_fifo,
+ &p_dec->p_aout,
+ &p_dec->output_format );
if ( p_dec->p_aout_input == NULL )
{
continue;
}
- p_buffer = aout_BufferNew( p_dec->p_aout, p_dec->p_aout_input,
- A52_FRAME_NB );
- if ( p_buffer == NULL ) return -1;
+ p_buffer = aout_DecNewBuffer( p_dec->p_aout, p_dec->p_aout_input,
+ A52_FRAME_NB );
+ if ( p_buffer == NULL )
+ {
+ p_dec->p_fifo->b_error = 1;
+ break;
+ }
p_buffer->start_date = aout_DateGet( &end_date );
p_buffer->end_date = aout_DateIncrement( &end_date,
A52_FRAME_NB );
i_frame_size - 7 );
if( p_dec->p_fifo->b_die )
{
- aout_BufferDelete( p_dec->p_aout, p_dec->p_aout_input,
- p_buffer );
+ aout_DecDeleteBuffer( p_dec->p_aout, p_dec->p_aout_input,
+ p_buffer );
break;
}
- /* Send the buffer to the mixer. */
- aout_BufferPlay( p_dec->p_aout, p_dec->p_aout_input, p_buffer );
+ /* Send the buffer to the aout core. */
+ aout_DecPlay( p_dec->p_aout, p_dec->p_aout_input, p_buffer );
}
- /* If b_error is set, the spdif thread enters the error loop */
if( p_dec->p_fifo->b_error )
{
DecoderError( p_dec->p_fifo );
}
- /* End of the spdif decoder thread */
EndThread( p_dec );
-
- return 0;
-}
-
-/****************************************************************************
- * InitThread: initialize thread data and create output fifo
- ****************************************************************************/
-static int InitThread( spdif_thread_t * p_dec, decoder_fifo_t * p_fifo )
-{
- /* Initialize the thread properties */
- p_dec->p_aout = NULL;
- p_dec->p_aout_input = NULL;
- p_dec->p_fifo = p_fifo;
- p_dec->output_format.i_format = AOUT_FMT_A52;
-
- /* Init the Bitstream */
- InitBitstream( &p_dec->bit_stream, p_dec->p_fifo,
- NULL, NULL );
return 0;
}
/*****************************************************************************
- * EndThread : spdif thread destruction
+ * EndThread : thread destruction
*****************************************************************************/
-static void EndThread( spdif_thread_t * p_dec )
+static void EndThread( dec_thread_t * p_dec )
{
if ( p_dec->p_aout_input != NULL )
{
- aout_InputDelete( p_dec->p_aout, p_dec->p_aout_input );
+ aout_DecDelete( p_dec->p_aout, p_dec->p_aout_input );
}
+ CloseBitstream( &p_dec->bit_stream );
free( p_dec );
}
-/****************************************************************************
- * SyncInfo: parse A52 sync info
- ****************************************************************************
+/*****************************************************************************
+ * 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...
- ****************************************************************************/
-int SyncInfo( const byte_t * p_buf, int * pi_channels, int * pi_sample_rate,
- int * pi_bit_rate)
+ *****************************************************************************/
+static int SyncInfo( const byte_t * p_buf, int * pi_channels,
+ int * pi_sample_rate, int * pi_bit_rate )
{
- static const u8 halfrate[12] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3};
+ 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 u8 lfeon[8] = {0x10, 0x10, 0x04, 0x04, 0x04, 0x01, 0x04, 0x01};
+ 512, 576, 640 };
+ static const uint8_t lfeon[8] = { 0x10, 0x10, 0x04, 0x04,
+ 0x04, 0x01, 0x04, 0x01 };
int frmsizecod;
int bitrate;
int half;
/* acmod, dsurmod and lfeon */
acmod = p_buf[6] >> 5;
- if ( p_buf[6] & 0xf8 )
+ if ( (p_buf[6] & 0xf8) == 0x50 )
{
- *pi_channels = AOUT_CHAN_DOLBY;
+ /* Dolby surround = stereo + Dolby */
+ *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
+ | AOUT_CHAN_DOLBYSTEREO;
}
else switch ( acmod )
{
- case 0x0: *pi_channels = AOUT_CHAN_CHANNEL; break;
- case 0x1: *pi_channels = AOUT_CHAN_MONO; break;
- case 0x2: *pi_channels = AOUT_CHAN_STEREO; break;
- case 0x3: *pi_channels = AOUT_CHAN_3F; break;
- case 0x4: *pi_channels = AOUT_CHAN_2F1R; break;
- case 0x5: *pi_channels = AOUT_CHAN_3F1R; break;
- case 0x6: *pi_channels = AOUT_CHAN_2F2R; break;
- case 0x7: *pi_channels = AOUT_CHAN_3F2R; break;
- case 0x8: *pi_channels = AOUT_CHAN_CHANNEL1; break;
- case 0x9: *pi_channels = AOUT_CHAN_CHANNEL2; break;
+ case 0x0:
+ /* Dual-mono = stereo + dual-mono */
+ *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
+ | AOUT_CHAN_DUALMONO;
+ break;
+ case 0x1:
+ /* Mono */
+ *pi_channels = AOUT_CHAN_CENTER;
+ break;
+ case 0x2:
+ /* Stereo */
+ *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
+ break;
+ case 0x3:
+ /* 3F */
+ *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER;
+ break;
+ case 0x4:
+ /* 2F1R */
+ *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARCENTER;
+ break;
+ case 0x5:
+ /* 3F1R */
+ *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+ | AOUT_CHAN_REARCENTER;
+ break;
+ case 0x6:
+ /* 2F2R */
+ *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
+ break;
+ case 0x7:
+ /* 3F2R */
+ *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
+ break;
+ default:
+ return 0;
}
-
+
if ( p_buf[6] & lfeon[acmod] ) *pi_channels |= AOUT_CHAN_LFE;
frmsizecod = p_buf[4] & 63;
projects / vlc / blobdiff