X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fa52.c;h=da59b1664b5fd2fa22a956f82534e7e6d8c8b598;hb=98c1ff6e3d80c30af01c0c211c0ead8964d3d8a1;hp=b5d6b4c3df224f3ff5e769707f27f02f114dddbb;hpb=305bc15e9a8b3af465359951f035643e19928072;p=vlc diff --git a/modules/codec/a52.c b/modules/codec/a52.c index b5d6b4c3df..da59b1664b 100644 --- a/modules/codec/a52.c +++ b/modules/codec/a52.c @@ -1,13 +1,12 @@ /***************************************************************************** - * 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.21 2003/01/15 10:58:47 massiot Exp $ + * Copyright (C) 2001-2002 the VideoLAN team + * $Id$ * - * Authors: Stéphane Borel + * Authors: Stéphane Borel * Christophe Massiot - * Michel Lespinasse - * Aaron Holtzman + * Gildas Bazin * * 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 @@ -21,350 +20,408 @@ * * 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 -#include -#include /* memcpy() */ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include -#include -#include +#include +#include +#include +#include +#include +#include -#ifdef HAVE_UNISTD_H -# include -#endif +#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 () /***************************************************************************** - * dec_thread_t : decoder thread descriptor + * decoder_sys_t : decoder descriptor *****************************************************************************/ -typedef struct dec_thread_t + +struct decoder_sys_t { - /* - * Thread properties - */ - vlc_thread_t thread_id; /* id for thread functions */ + /* Module mode */ + bool b_packetizer; /* * Input properties */ - decoder_fifo_t * p_fifo; /* stores the PES stream data */ - bit_stream_t bit_stream; + int i_state; + + block_bytestream_t bytestream; /* - * Output properties + * Common properties */ - aout_instance_t * p_aout; /* opaque */ - aout_input_t * p_aout_input; /* opaque */ - audio_sample_format_t output_format; -} dec_thread_t; + date_t end_date; + + mtime_t i_pts; + + vlc_a52_header_t frame; +}; + +enum { + + STATE_NOSYNC, + STATE_SYNC, + STATE_HEADER, + STATE_NEXT_SYNC, + STATE_GET_DATA, + STATE_SEND_DATA +}; /**************************************************************************** * Local prototypes ****************************************************************************/ -static int OpenDecoder ( vlc_object_t * ); -static int RunDecoder ( decoder_fifo_t * ); +static void *DecodeBlock ( decoder_t *, block_t ** ); -static void EndThread ( dec_thread_t * ); - -static int SyncInfo ( const byte_t *, int *, int *, int * ); +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 ); -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_fifo_t *p_fifo = (decoder_fifo_t*) p_this; + decoder_t *p_dec = (decoder_t*)p_this; + decoder_sys_t *p_sys; + vlc_fourcc_t i_codec; - if( p_fifo->i_fourcc != VLC_FOURCC('a','5','2',' ') - && 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_fifo->pf_run = RunDecoder; + /* 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 ) + 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 OpenDecoder( vlc_object_t *p_this ) +{ + /* 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 ); +} + +static int OpenPacketizer( vlc_object_t *p_this ) +{ + 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_fifo_t *p_fifo ) +static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) { - dec_thread_t * p_dec; - audio_date_t end_date; + decoder_sys_t *p_sys = p_dec->p_sys; + uint8_t p_header[VLC_A52_HEADER_SIZE]; + uint8_t *p_buf; + block_t *p_out_buffer; - /* Allocate the memory needed to store the thread's structure */ - p_dec = malloc( sizeof(dec_thread_t) ); - if( p_dec == NULL ) + if( !pp_block || !*pp_block ) return NULL; + + if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) { - msg_Err( p_fifo, "out of memory" ); - DecoderError( p_fifo ); - return -1; + 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; } - /* 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 ) + if( !date_Get( &p_sys->end_date ) && (*pp_block)->i_pts <= VLC_TS_INVALID) { - msg_Err( p_fifo, "cannot initialize bitstream" ); - DecoderError( p_fifo ); - free( p_dec ); - return -1; + /* We've just started the stream, wait for the first PTS. */ + block_Release( *pp_block ); + return NULL; } - /* Decoder thread's main loop */ - while ( !p_dec->p_fifo->b_die && !p_dec->p_fifo->b_error ) + block_BytestreamPush( &p_sys->bytestream, *pp_block ); + + while( 1 ) { - int i_bit_rate; - unsigned int i_rate, i_original_channels, i_frame_size; - mtime_t pts; - 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) ) + switch( p_sys->i_state ) { - RemoveBits( &p_dec->bit_stream, 8 ); - } - if ( p_dec->p_fifo->b_die || p_dec->p_fifo->b_error ) break; + case STATE_NOSYNC: + while( block_PeekBytes( &p_sys->bytestream, p_header, 2 ) + == VLC_SUCCESS ) + { + if( p_header[0] == 0x0b && p_header[1] == 0x77 ) + { + p_sys->i_state = STATE_SYNC; + break; + } + block_SkipByte( &p_sys->bytestream ); + } + if( p_sys->i_state != STATE_SYNC ) + { + block_BytestreamFlush( &p_sys->bytestream ); - /* Set the Presentation Time Stamp */ - NextPTS( &p_dec->bit_stream, &pts, NULL ); - if ( pts != 0 && pts != aout_DateGet( &end_date ) ) - { - aout_DateSet( &end_date, pts ); - } + /* Need more data */ + return NULL; + } - /* Get A/52 frame header */ - GetChunk( &p_dec->bit_stream, p_header, 7 ); - if ( p_dec->p_fifo->b_die || p_dec->p_fifo->b_error ) break; + case STATE_SYNC: + /* New frame, set the Presentation Time Stamp */ + 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 ) ) + { + date_Set( &p_sys->end_date, p_sys->i_pts ); + } + p_sys->i_state = STATE_HEADER; - /* Check if frame is valid and get frame info */ - i_frame_size = SyncInfo( p_header, &i_original_channels, &i_rate, - &i_bit_rate ); + case STATE_HEADER: + /* Get A/52 frame header (VLC_A52_HEADER_SIZE bytes) */ + if( block_PeekBytes( &p_sys->bytestream, p_header, + VLC_A52_HEADER_SIZE ) != VLC_SUCCESS ) + { + /* Need more data */ + return NULL; + } - if( !i_frame_size ) - { - msg_Warn( p_dec->p_fifo, "a52_syncinfo failed" ); - continue; - } + /* Check if frame is valid and get frame info */ + 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; + break; + } - if( (p_dec->p_aout_input != NULL) && - ( (p_dec->output_format.i_rate != i_rate) - || (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_DecDelete( p_dec->p_aout, p_dec->p_aout_input ); - p_dec->p_aout_input = NULL; - } + p_sys->i_state = STATE_NEXT_SYNC; - /* 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_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_DecNew( p_dec->p_fifo, - &p_dec->p_aout, - &p_dec->output_format ); - - if ( p_dec->p_aout_input == NULL ) + 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->frame.i_size, p_header, 2 ) + != VLC_SUCCESS ) { - p_dec->p_fifo->b_error = 1; + /* Need more data */ + 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 ( !aout_DateGet( &end_date ) ) - { - byte_t p_junk[3840]; + 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; - /* We've just started the stream, wait for the first PTS. */ - GetChunk( &p_dec->bit_stream, p_junk, i_frame_size - 7 ); - continue; - } + 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 NULL; + } + p_sys->i_state = STATE_SEND_DATA; - 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 ); - - /* Get the whole frame. */ - memcpy( p_buffer->p_buffer, p_header, 7 ); - GetChunk( &p_dec->bit_stream, p_buffer->p_buffer + 7, - i_frame_size - 7 ); - if( p_dec->p_fifo->b_die ) - { - aout_DecDeleteBuffer( p_dec->p_aout, p_dec->p_aout_input, - p_buffer ); - break; - } + case STATE_SEND_DATA: + if( !(p_buf = GetOutBuffer( p_dec, &p_out_buffer )) ) + { + //p_dec->b_error = true; + return NULL; + } - /* Send the buffer to the aout core. */ - aout_DecPlay( p_dec->p_aout, p_dec->p_aout_input, p_buffer ); - } + /* 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 ) ); - if( p_dec->p_fifo->b_error ) - { - DecoderError( p_dec->p_fifo ); - } + /* 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 = VLC_TS_INVALID; + + /* So p_block doesn't get re-added several times */ + *pp_block = block_BytestreamPop( &p_sys->bytestream ); + + p_sys->i_state = STATE_NOSYNC; - EndThread( p_dec ); + return p_out_buffer; + } + } - return 0; + return NULL; } /***************************************************************************** - * EndThread : thread destruction + * CloseCommon: clean up the decoder *****************************************************************************/ -static void EndThread( dec_thread_t * p_dec ) +static void CloseCommon( vlc_object_t *p_this ) { - if ( p_dec->p_aout_input != NULL ) - { - aout_DecDelete( p_dec->p_aout, p_dec->p_aout_input ); - } + decoder_t *p_dec = (decoder_t*)p_this; + decoder_sys_t *p_sys = p_dec->p_sys; - CloseBitstream( &p_dec->bit_stream ); - free( p_dec ); + block_BytestreamRelease( &p_sys->bytestream ); + + free( p_sys ); } /***************************************************************************** - * 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... + * GetOutBuffer: *****************************************************************************/ -static int SyncInfo( const byte_t * p_buf, int * pi_channels, - int * pi_sample_rate, int * pi_bit_rate ) +static uint8_t *GetOutBuffer( decoder_t *p_dec, block_t **pp_out_buffer ) { - 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 ) + decoder_sys_t *p_sys = p_dec->p_sys; + uint8_t *p_buf; + + if( p_dec->fmt_out.audio.i_rate != p_sys->frame.i_rate ) + { + 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 ); + + date_Init( &p_sys->end_date, p_sys->frame.i_rate, 1 ); + date_Set( &p_sys->end_date, p_sys->i_pts ); + } + + 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; + + 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; + + p_dec->fmt_out.i_bitrate = p_sys->frame.i_bitrate; + + if( p_sys->b_packetizer ) { - /* Dolby surround = stereo + Dolby */ - *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT - | AOUT_CHAN_DOLBYSTEREO; + 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; } - else switch ( acmod ) + else { - 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; + 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; } - if ( p_buf[6] & lfeon[acmod] ) *pi_channels |= 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; - } + return p_buf; +} + +/***************************************************************************** + * GetAoutBuffer: + *****************************************************************************/ +static aout_buffer_t *GetAoutBuffer( decoder_t *p_dec ) +{ + decoder_sys_t *p_sys = p_dec->p_sys; + aout_buffer_t *p_buf; + + p_buf = decoder_NewAudioBuffer( p_dec, p_sys->frame.i_samples ); + if( p_buf == NULL ) return 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 p_buf; +} + +/***************************************************************************** + * GetSoutBuffer: + *****************************************************************************/ +static block_t *GetSoutBuffer( decoder_t *p_dec ) +{ + decoder_sys_t *p_sys = p_dec->p_sys; + block_t *p_block; + + p_block = block_New( p_dec, p_sys->frame.i_size ); + if( p_block == NULL ) return NULL; + + 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; }