/*****************************************************************************
- * a52.c: ATSC A/52 aka AC-3 decoder plugin for vlc.
- * This plugin makes use of liba52 to decode A/52 audio
- * (http://liba52.sf.net/).
+ * a52.c: A/52 basic parser
*****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
- * $Id: a52.c,v 1.1 2002/08/11 01:27:01 massiot Exp $
+ * Copyright (C) 2001-2002 VideoLAN
+ * $Id: a52.c,v 1.23 2003/09/02 20:19:25 gbazin Exp $
*
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
+ * Authors: Stéphane Borel <stef@via.ecp.fr>
* Christophe Massiot <massiot@via.ecp.fr>
- *
+ * Gildas Bazin <gbazin@netcourrier.com>
+ *
* 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
* (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
/*****************************************************************************
* Preamble
*****************************************************************************/
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h> /* memcpy() */
+#include <fcntl.h>
+
#include <vlc/vlc.h>
-#include <vlc/aout.h>
#include <vlc/decoder.h>
+#include <vlc/input.h>
+#include <vlc/aout.h>
+#include <vlc/sout.h>
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h> /* strdup() */
-#ifdef HAVE_STDINT_H
-# include <stdint.h> /* int16_t .. */
-#elif HAVE_INTTYPES_H
-# include <inttypes.h> /* int16_t .. */
-#endif
-
-#ifdef USE_A52DEC_TREE /* liba52 header file */
-# include "include/a52.h"
-#else
-# include "a52dec/a52.h"
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
#endif
-#define A52_FRAME_SIZE 1536
+#define A52_HEADER_SIZE 7
/*****************************************************************************
- * a52_thread_t : a52 decoder thread descriptor
+ * decoder_sys_t : decoder descriptor
*****************************************************************************/
-typedef struct a52_thread_s
+struct decoder_sys_t
{
+ /* Module mode */
+ vlc_bool_t b_packetizer;
+
/*
- * liba52 properties
+ * Input properties
*/
- a52_state_t * p_a52_state;
- vlc_bool_t b_dynrng;
+ int i_state;
+
+ uint8_t p_header[A52_HEADER_SIZE];
+ int i_header;
+
+ mtime_t pts;
- /* The bit stream structure handles the PES stream at the bit level */
- bit_stream_t bit_stream;
+ int i_frame_size;
/*
- * Input properties
+ * Decoder output properties
*/
- decoder_fifo_t * p_fifo; /* stores the PES stream data */
- data_packet_t * p_data;
+ 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 */
/*
- * Output properties
+ * Packetizer output properties
*/
- aout_instance_t * p_aout; /* opaque */
- aout_input_t * p_aout_input; /* opaque */
- audio_sample_format_t output_format;
- mtime_t last_date;
-} a52_thread_t;
+ 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;
+};
+
+enum {
+
+ STATE_NOSYNC,
+ STATE_PARTIAL_SYNC,
+ STATE_SYNC,
+ STATE_HEADER,
+ STATE_DATA
+};
+
+/****************************************************************************
* Local prototypes
- *****************************************************************************/
-static int OpenDecoder ( vlc_object_t * );
-static int RunDecoder ( decoder_fifo_t * );
-static int DecodeFrame ( a52_thread_t *, const byte_t * );
-static int InitThread ( a52_thread_t *, decoder_fifo_t * );
-static void EndThread ( a52_thread_t * );
+ ****************************************************************************/
+static int OpenDecoder ( vlc_object_t * );
+static int OpenPacketizer( vlc_object_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 * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define DYNRNG_TEXT N_("A/52 dynamic range compression")
-#define DYNRNG_LONGTEXT N_( \
- "Dynamic range compression makes the loud sounds softer, and the soft " \
- "sounds louder, so you can more easily listen to the stream in a noisy " \
- "environment without disturbing anyone. If you disable the dynamic range "\
- "compression the playback will be more adapted to a movie theater or a " \
- "listening room.")
-
vlc_module_begin();
- add_category_hint( N_("Miscellaneous"), NULL );
- add_bool( "a52-dynrng", 1, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT );
- set_description( _("a52 ATSC A/52 aka AC-3 audio decoder module") );
- set_capability( "decoder", 60 );
+ 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
- *****************************************************************************
- * Tries to launch a decoder and return score so that the interface is able
- * to choose.
*****************************************************************************/
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',' ') )
- {
+ decoder_t *p_dec = (decoder_t*)p_this;
+
+ if( p_dec->p_fifo->i_fourcc != VLC_FOURCC('a','5','2',' ')
+ && p_dec->p_fifo->i_fourcc != 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 =
+ (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;
- p_fifo->pf_run = RunDecoder;
return VLC_SUCCESS;
}
+static int OpenPacketizer( 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;
+}
+
/*****************************************************************************
- * RunDecoder: this function is called just after the thread is created
+ * InitDecoder: Initalize the decoder
*****************************************************************************/
-static int RunDecoder( decoder_fifo_t *p_fifo )
+static int InitDecoder( decoder_t *p_dec )
{
- a52_thread_t *p_dec;
+ p_dec->p_sys->i_state = STATE_NOSYNC;
- /* Allocate the memory needed to store the thread's structure */
- p_dec = (a52_thread_t *)malloc( sizeof(a52_thread_t) );
- if( p_dec == NULL )
- {
- msg_Err( p_fifo, "out of memory" );
- DecoderError( p_fifo );
- return -1;
- }
+ 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 );
- if( InitThread( p_dec, p_fifo ) )
- {
- msg_Err( p_dec->p_fifo, "could not initialize thread" );
- DecoderError( p_fifo );
- free( p_dec );
- return -1;
- }
+ 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;
+}
- /* liba52 decoder thread's main loop */
- while( !p_dec->p_fifo->b_die && !p_dec->p_fifo->b_error )
+/****************************************************************************
+ * RunDecoder: the whole thing
+ ****************************************************************************
+ * This function is called just after the thread is launched.
+ ****************************************************************************/
+static int RunDecoder( decoder_t *p_dec, block_t *p_block )
+{
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ int i_block_pos = 0;
+ mtime_t i_pts = p_block->i_pts;
+
+ while( i_block_pos < p_block->i_buffer )
{
- int i_frame_size, i_flags, i_rate, i_bit_rate;
- mtime_t pts;
- /* Temporary buffer to store the raw frame to be decoded */
- byte_t p_frame_buffer[3840];
-
- /* 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))
+ switch( p_sys->i_state )
{
- RemoveBits( &p_dec->bit_stream, 8 );
- }
+ 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 )
+ {
+ i_block_pos++;
+ }
- /* Get A/52 frame header */
- GetChunk( &p_dec->bit_stream, p_frame_buffer, 7 );
- if( p_dec->p_fifo->b_die ) break;
+ if( i_block_pos < p_block->i_buffer )
+ {
+ p_sys->i_state = STATE_PARTIAL_SYNC;
+ i_block_pos++;
+ p_sys->p_header[0] = 0x0b;
+ break;
+ }
+ break;
- /* Check if frame is valid and get frame info */
- i_frame_size = a52_syncinfo( p_frame_buffer, &i_flags, &i_rate,
- &i_bit_rate );
+ 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;
+ }
+ else
+ {
+ p_sys->i_state = STATE_NOSYNC;
+ }
+ break;
- if( !i_frame_size )
- {
- msg_Warn( p_dec->p_fifo, "a52_syncinfo failed" );
- continue;
- }
+ 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 ) )
+ {
+ aout_DateSet( &p_sys->end_date, p_sys->pts );
+ }
+ p_sys->i_state = STATE_HEADER;
+ break;
- if( (p_dec->p_aout_input != NULL) &&
- ( (p_dec->output_format.i_rate != i_rate)
- /* || (p_dec->output_format.i_channels != i_channels) */ ) )
- {
- /* Parameters changed - this should not happen. */
- aout_InputDelete( p_dec->p_aout, p_dec->p_aout_input );
- p_dec->p_aout_input = NULL;
- }
+ case STATE_HEADER:
+ /* Get A/52 frame header (A52_HEADER_SIZE bytes) */
+ if( p_sys->i_header < A52_HEADER_SIZE )
+ {
+ int i_size = __MIN( A52_HEADER_SIZE - p_sys->i_header,
+ p_block->i_buffer - i_block_pos );
- /* Creating the audio input if not created yet. */
- 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->p_aout_input = aout_InputNew( p_dec->p_fifo,
- &p_dec->p_aout,
- &p_dec->output_format );
+ 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;
+ }
+
+ if( p_sys->i_header < A52_HEADER_SIZE )
+ break;
- if ( p_dec->p_aout_input == NULL )
+ if( GetOutBuffer( p_dec, &p_sys->p_out_buffer )
+ != VLC_SUCCESS )
{
- p_dec->p_fifo->b_error = 1;
+ block_Release( p_block );
+ return VLC_EGENERIC;
+ }
+
+ if( !p_sys->p_out_buffer )
+ {
+ p_sys->i_state = STATE_NOSYNC;
break;
}
- }
- /* Set the Presentation Time Stamp */
- CurrentPTS( &p_dec->bit_stream, &pts, NULL );
- if ( pts != 0 )
- {
- p_dec->last_date = pts;
+ 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;
+ break;
+
+ case STATE_DATA:
+ /* Copy the whole A52 frame into the aout buffer */
+ if( p_sys->i_out_buffer < p_sys->i_frame_size )
+ {
+ int i_size = __MIN( p_sys->i_frame_size - p_sys->i_out_buffer,
+ p_block->i_buffer - i_block_pos );
+
+ 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;
+ }
+
+ if( p_sys->i_out_buffer < p_sys->i_frame_size )
+ break; /* Need more data */
+
+ SendOutBuffer( p_dec );
+
+ p_sys->i_state = STATE_NOSYNC;
+ break;
}
+ }
- /* Get the complete frame */
- GetChunk( &p_dec->bit_stream, p_frame_buffer + 7,
- i_frame_size - 7 );
- if( p_dec->p_fifo->b_die ) break;
+ block_Release( p_block );
+ return VLC_SUCCESS;
+}
- if( DecodeFrame( p_dec, p_frame_buffer ) )
+/*****************************************************************************
+ * 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 )
{
- p_dec->p_fifo->b_error = 1;
- break;
+ 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 );
}
- /* If b_error is set, the decoder thread enters the error loop */
- if( p_dec->p_fifo->b_error )
+ if( p_dec->p_sys->p_sout_input != NULL )
{
- DecoderError( p_dec->p_fifo );
+ 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 );
+ }
+
+ sout_InputDelete( p_dec->p_sys->p_sout_input );
}
- /* End of the a52 decoder thread */
- EndThread( p_dec );
+ free( p_dec->p_sys );
- return 0;
+ return VLC_SUCCESS;
}
/*****************************************************************************
- * InitThread: initialize data before entering main loop
+ * GetOutBuffer:
*****************************************************************************/
-static int InitThread( a52_thread_t * p_dec, decoder_fifo_t * p_fifo )
+static int GetOutBuffer ( decoder_t *p_dec, uint8_t **pp_out_buffer )
{
- /* 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_FLOAT32;
- p_dec->output_format.i_channels = 2; /* FIXME ! */
- p_dec->last_date = 0;
-
- /* Initialize liba52 */
- p_dec->p_a52_state = a52_init( 0 );
- if( p_dec->p_a52_state == NULL )
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ int i_ret;
+
+ if( p_sys->b_packetizer )
{
- msg_Err( p_dec->p_fifo, "unable to initialize liba52" );
- return -1;
+ 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;
}
- p_dec->b_dynrng = config_GetInt( p_dec->p_fifo, "a52-dynrng" );
-
- /* Init the Bitstream */
- InitBitstream( &p_dec->bit_stream, p_dec->p_fifo,
- NULL, NULL );
-
- return 0;
+ return i_ret;
}
/*****************************************************************************
- * Interleave: helper function to interleave channels
+ * GetAoutBuffer:
*****************************************************************************/
-static void Interleave( float * p_out, const float * p_in, int i_channels )
+static int GetAoutBuffer( decoder_t *p_dec, aout_buffer_t **pp_buffer )
{
- int i, j;
+ int i_bit_rate;
+ unsigned int i_rate, i_channels, i_channels_conf;
+
+ decoder_sys_t *p_sys = p_dec->p_sys;
+
+ /* 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_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;
+ }
- for ( j = 0; j < i_channels; j++ )
+ /* Creating the audio input if not created yet. */
+ if( p_sys->p_aout_input == NULL )
{
- for ( i = 0; i < 256; i++ )
+ 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 )
{
- p_out[i * i_channels + j] = p_in[j * 256 + i];
+ *pp_buffer = NULL;
+ return VLC_SUCCESS;
}
}
+
+ 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 = 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;
}
/*****************************************************************************
- * DecodeFrame: decode an ATSC A/52 frame.
+ * GetSoutBuffer:
*****************************************************************************/
-static int DecodeFrame( a52_thread_t * p_dec, const byte_t * p_frame_buffer )
+static int GetSoutBuffer( decoder_t *p_dec, sout_buffer_t **pp_buffer )
{
- sample_t i_sample_level = 1;
- aout_buffer_t * p_buffer;
- int i, i_flags;
- int i_bytes_per_block = 256 * p_dec->output_format.i_channels
- * sizeof(float);
+ int i_bit_rate;
+ unsigned int i_rate, i_channels, i_channels_conf;
- if( !p_dec->last_date )
- {
- /* We've just started the stream, wait for the first PTS. */
- return 0;
- }
-
- p_buffer = aout_BufferNew( p_dec->p_aout, p_dec->p_aout_input,
- A52_FRAME_SIZE );
- if ( p_buffer == NULL ) return -1;
- p_buffer->start_date = p_dec->last_date;
- p_dec->last_date += (mtime_t)(A52_FRAME_SIZE * 1000000)
- / p_dec->output_format.i_rate;
- p_buffer->end_date = p_dec->last_date;
+ decoder_sys_t *p_sys = p_dec->p_sys;
- /* FIXME */
- i_flags = A52_STEREO | A52_ADJUST_LEVEL;
+ /* 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 );
- /* Do the actual decoding now */
- a52_frame( p_dec->p_a52_state, p_frame_buffer,
- &i_flags, &i_sample_level, 0 );
+ if( !p_sys->i_frame_size )
+ {
+ msg_Warn( p_dec, "a52 syncinfo failed" );
+ *pp_buffer = NULL;
+ return VLC_SUCCESS;
+ }
- if( !p_dec->b_dynrng )
+ 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 ) )
{
- a52_dynrng( p_dec->p_a52_state, NULL, NULL );
+ /* Parameters changed - this should not happen. */
}
- for ( i = 0; i < 6; i++ )
+ /* Creating the sout input if not created yet. */
+ if( p_sys->p_sout_input == NULL )
{
- sample_t * p_samples;
+ 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( a52_block( p_dec->p_a52_state ) )
+ if( p_sys->p_sout_input == NULL )
{
- msg_Warn( p_dec->p_fifo, "a52_block failed for block %i", i );
+ 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 );
+ }
- p_samples = a52_samples( p_dec->p_a52_state );
+ if( !aout_DateGet( &p_sys->end_date ) )
+ {
+ /* We've just started the stream, wait for the first PTS. */
+ *pp_buffer = NULL;
+ return VLC_SUCCESS;
+ }
- /* Interleave the *$£%ù samples */
- Interleave( (float *)(p_buffer->p_buffer + i * i_bytes_per_block),
- p_samples, p_dec->output_format.i_channels );
+ *pp_buffer = sout_BufferNew( p_sys->p_sout_input->p_sout,
+ p_sys->i_frame_size );
+ if( *pp_buffer == NULL )
+ {
+ return VLC_SUCCESS;
}
- aout_BufferPlay( p_dec->p_aout, p_dec->p_aout_input, p_buffer );
+ (*pp_buffer)->i_pts =
+ (*pp_buffer)->i_dts = aout_DateGet( &p_sys->end_date );
- return 0;
+ (*pp_buffer)->i_length =
+ aout_DateIncrement( &p_sys->end_date, A52_FRAME_NB )
+ - (*pp_buffer)->i_pts;
+
+ return VLC_SUCCESS;
}
/*****************************************************************************
- * EndThread : liba52 decoder thread destruction
+ * SendOutBuffer:
*****************************************************************************/
-static void EndThread( a52_thread_t * p_dec )
+static int SendOutBuffer( decoder_t *p_dec )
{
- if ( p_dec->p_aout_input != NULL )
+ decoder_sys_t *p_sys = p_dec->p_sys;
+
+ if( p_sys->b_packetizer )
+ {
+ sout_InputSendBuffer( p_sys->p_sout_input, p_sys->p_sout_buffer );
+ p_sys->p_sout_buffer = NULL;
+ }
+ else
{
- aout_InputDelete( p_dec->p_aout, p_dec->p_aout_input );
+ /* 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;
}
- a52_free( p_dec->p_a52_state );
- free( p_dec );
+ return VLC_SUCCESS;
}
+/*****************************************************************************
+ * 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...
+ *****************************************************************************/
+static int SyncInfo( const byte_t * p_buf,
+ int * pi_channels, int * pi_channels_conf,
+ 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,
+ 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;
+ }
+
+ if ( p_buf[6] & lfeon[acmod] )
+ {
+ (*pi_channels)++;
+ *pi_channels_conf |= AOUT_CHAN_LFE;
+ }
+
+ 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;
+ }
+}
projects / vlc / blobdiff