X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fa52.c;h=f4f7a08af31e6d2530b0e07193587684caf5551c;hb=ffdca9af740e111153ab385cf00e887c652e7b4c;hp=24fb533975688e2651a6074082b0a18f1bacb448;hpb=8928554ebd629ddc1d4cdc6d670bc2e1a918dd83;p=vlc diff --git a/modules/codec/a52.c b/modules/codec/a52.c index 24fb533975..f4f7a08af3 100644 --- a/modules/codec/a52.c +++ b/modules/codec/a52.c @@ -1,19 +1,18 @@ /***************************************************************************** - * 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.18 2002/11/14 22:38:47 massiot Exp $ + * $Id: a52.c,v 1.32 2003/12/22 14:32:55 sam Exp $ * * 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 * 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 @@ -27,52 +26,62 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include /* memcpy() */ -#include - #include #include -#include -#ifdef HAVE_UNISTD_H -# include -#endif +#include "vlc_block_helper.h" + +#define A52_HEADER_SIZE 7 /***************************************************************************** - * dec_thread_t : A52 pass-through 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 */ + vlc_bool_t 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; + audio_date_t end_date; + + mtime_t i_pts; + int i_frame_size, i_bit_rate; + unsigned int i_rate, i_channels, i_channels_conf; + +}; + +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 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 void EndThread ( dec_thread_t * ); +static int SyncInfo ( const byte_t *, int *, int *, int *,int * ); -static int SyncInfo ( const byte_t *, int *, int *, int * ); +static uint8_t *GetOutBuffer ( decoder_t *, void ** ); +static aout_buffer_t *GetAoutBuffer( decoder_t * ); +static block_t *GetSoutBuffer( decoder_t * ); /***************************************************************************** * Module descriptor @@ -80,204 +89,324 @@ static int SyncInfo ( const byte_t *, int *, int *, int * ); vlc_module_begin(); set_description( _("A/52 parser") ); set_capability( "decoder", 100 ); - set_callbacks( OpenDecoder, NULL ); + set_callbacks( OpenDecoder, CloseDecoder ); + + add_submodule(); + set_description( _("A/52 audio packetizer") ); + set_capability( "packetizer", 10 ); + set_callbacks( OpenPacketizer, CloseDecoder ); vlc_module_end(); /***************************************************************************** * OpenDecoder: probe the decoder and return score *****************************************************************************/ -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; +static int OpenDecoder( vlc_object_t *p_this ) +{ + decoder_t *p_dec = (decoder_t*)p_this; + decoder_sys_t *p_sys; + + 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_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 ) + { + msg_Err( p_dec, "out of memory" ); + return VLC_EGENERIC; + } + + /* Misc init */ + p_sys->b_packetizer = VLC_FALSE; + p_sys->i_state = STATE_NOSYNC; + aout_DateSet( &p_sys->end_date, 0 ); + + p_sys->bytestream = block_BytestreamInit( p_dec ); + + /* Set output properties */ + p_dec->fmt_out.i_cat = AUDIO_ES; + p_dec->fmt_out.i_codec = VLC_FOURCC('a','5','2',' '); + + /* 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; } +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: 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; - - /* Allocate the memory needed to store the thread's structure */ - p_dec = malloc( sizeof(dec_thread_t) ); - if( p_dec == NULL ) - { - msg_Err( p_fifo, "out of memory" ); - DecoderError( p_fifo ); - return -1; - } + decoder_sys_t *p_sys = p_dec->p_sys; + uint8_t p_header[A52_HEADER_SIZE]; + uint8_t *p_buf; + void *p_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 = VLC_FOURCC('a','5','2',' '); + if( !pp_block || !*pp_block ) return NULL; - aout_DateSet( &end_date, 0 ); + 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; + } - /* Init the bitstream */ - if( InitBitstream( &p_dec->bit_stream, p_dec->p_fifo, - NULL, NULL ) != VLC_SUCCESS ) + if( (*pp_block)->b_discontinuity ) { - msg_Err( p_fifo, "cannot initialize bitstream" ); - DecoderError( p_fifo ); - free( p_dec ); - return -1; + p_sys->i_state = STATE_NOSYNC; } - /* 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_frame_size, i_original_channels, i_rate, i_bit_rate; - 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 ); - } + 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 ) 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 != 0 && + p_sys->i_pts != aout_DateGet( &p_sys->end_date ) ) + { + aout_DateSet( &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 (A52_HEADER_SIZE bytes) */ + if( block_PeekBytes( &p_sys->bytestream, p_header, + 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 */ + 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( (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; - } + case STATE_NEXT_SYNC: + /* TODO: If pp_block == NULL, flush the buffer without checking the + * next sync word */ - /* 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 ) + /* 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 NULL; + } + + if( p_header[0] != 0x0b || p_header[1] != 0x77 ) { - p_dec->p_fifo->b_error = 1; + 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; - if ( !aout_DateGet( &end_date ) ) - { - byte_t p_junk[3840]; + 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 ) + { + /* Need more data */ + return NULL; + } + p_sys->i_state = STATE_SEND_DATA; - /* 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_SEND_DATA: + if( !(p_buf = GetOutBuffer( p_dec, &p_out_buffer )) ) + { + //p_dec->b_error = VLC_TRUE; + return NULL; + } - p_buffer = aout_DecNewBuffer( p_dec->p_aout, p_dec->p_aout_input, - A52_FRAME_NB ); - if ( p_buffer == NULL ) return -1; - 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; + /* 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 ); + + /* 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; + + /* So p_block doesn't get re-added several times */ + *pp_block = block_BytestreamPop( &p_sys->bytestream ); + + p_sys->i_state = STATE_NOSYNC; + + return p_out_buffer; } + } + + return NULL; +} - /* Send the buffer to the mixer. */ - aout_DecPlay( p_dec->p_aout, p_dec->p_aout_input, p_buffer ); +/***************************************************************************** + * CloseDecoder: clean up the decoder + *****************************************************************************/ +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; + + block_BytestreamRelease( &p_sys->bytestream ); + + free( p_sys ); +} + +/***************************************************************************** + * GetOutBuffer: + *****************************************************************************/ +static uint8_t *GetOutBuffer( decoder_t *p_dec, void **pp_out_buffer ) +{ + decoder_sys_t *p_sys = p_dec->p_sys; + uint8_t *p_buf; + + if( p_dec->fmt_out.audio.i_rate != p_sys->i_rate ) + { + 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 ); + + aout_DateInit( &p_sys->end_date, p_sys->i_rate ); + aout_DateSet( &p_sys->end_date, p_sys->i_pts ); } - /* If b_error is set, the spdif thread enters the error loop */ - if( p_dec->p_fifo->b_error ) + 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( p_sys->b_packetizer ) { - DecoderError( p_dec->p_fifo ); + 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 + { + 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; } - /* End of the spdif decoder thread */ - EndThread( p_dec ); - - return 0; + return p_buf; } /***************************************************************************** - * EndThread : spdif thread destruction + * GetAoutBuffer: *****************************************************************************/ -static void EndThread( dec_thread_t * p_dec ) +static aout_buffer_t *GetAoutBuffer( decoder_t *p_dec ) { - if ( p_dec->p_aout_input != NULL ) - { - aout_DecDelete( p_dec->p_aout, p_dec->p_aout_input ); - } + decoder_sys_t *p_sys = p_dec->p_sys; + aout_buffer_t *p_buf; + + p_buf = p_dec->pf_aout_buffer_new( p_dec, A52_FRAME_NB ); + if( p_buf == NULL ) return NULL; + + p_buf->start_date = aout_DateGet( &p_sys->end_date ); + p_buf->end_date = aout_DateIncrement( &p_sys->end_date, A52_FRAME_NB ); - CloseBitstream( &p_dec->bit_stream ); - free( p_dec ); + return p_buf; } /***************************************************************************** - * SyncInfo: parse A52 sync info + * 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->i_frame_size ); + if( p_block == NULL ) return NULL; + + 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_block->i_pts; + + return p_block; +} + +/***************************************************************************** + * 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_channels_conf, + 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; @@ -295,52 +424,67 @@ int SyncInfo( const byte_t * p_buf, int * pi_channels, int * pi_sample_rate, if ( (p_buf[6] & 0xf8) == 0x50 ) { /* Dolby surround = stereo + Dolby */ - *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT - | AOUT_CHAN_DOLBYSTEREO; + *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 = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT - | AOUT_CHAN_DUALMONO; + *pi_channels = 2; + *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT + | AOUT_CHAN_DUALMONO; break; case 0x1: /* Mono */ - *pi_channels = AOUT_CHAN_CENTER; + *pi_channels = 1; + *pi_channels_conf = AOUT_CHAN_CENTER; break; case 0x2: /* Stereo */ - *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT; + *pi_channels = 2; + *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT; break; case 0x3: /* 3F */ - *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER; + *pi_channels = 3; + *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT + | AOUT_CHAN_CENTER; break; case 0x4: /* 2F1R */ - *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARCENTER; + *pi_channels = 3; + *pi_channels_conf = 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; + *pi_channels = 4; + *pi_channels_conf = 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; + *pi_channels = 4; + *pi_channels_conf = 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; + *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 |= AOUT_CHAN_LFE; + + if ( p_buf[6] & lfeon[acmod] ) + { + (*pi_channels)++; + *pi_channels_conf |= AOUT_CHAN_LFE; + } frmsizecod = p_buf[4] & 63; if (frmsizecod >= 38) @@ -362,4 +506,3 @@ int SyncInfo( const byte_t * p_buf, int * pi_channels, int * pi_sample_rate, return 0; } } -