X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fa52.c;h=da59b1664b5fd2fa22a956f82534e7e6d8c8b598;hb=b6858433aa498c15b537c9af8d0e9766b89df626;hp=a07030f649b9b9c416a1d2898fa80db56bdae058;hpb=7bf9ebcf6611b3b091ea6a144c58c6a85bba20e2;p=vlc diff --git a/modules/codec/a52.c b/modules/codec/a52.c index a07030f649..da59b1664b 100644 --- a/modules/codec/a52.c +++ b/modules/codec/a52.c @@ -1,12 +1,12 @@ /***************************************************************************** * a52.c: parse A/52 audio sync info and packetize the stream ***************************************************************************** - * Copyright (C) 2001-2002 VideoLAN - * $Id: a52.c,v 1.33 2004/02/13 21:48:32 gbazin Exp $ + * Copyright (C) 2001-2002 the VideoLAN team + * $Id$ * - * Authors: Stéphane Borel + * Authors: Stéphane Borel * Christophe Massiot - * Gildas Bazin + * 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 @@ -20,26 +20,53 @@ * * 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 +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include "vlc_block_helper.h" +#include +#include +#include +#include +#include +#include -#define A52_HEADER_SIZE 7 +#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 () /***************************************************************************** * decoder_sys_t : decoder descriptor *****************************************************************************/ + struct decoder_sys_t { /* Module mode */ - vlc_bool_t b_packetizer; + bool b_packetizer; /* * Input properties @@ -51,12 +78,11 @@ struct decoder_sys_t /* * Common properties */ - audio_date_t end_date; + date_t end_date; mtime_t i_pts; - int i_frame_size, i_bit_rate; - unsigned int i_rate, i_channels, i_channels_conf; + vlc_a52_header_t frame; }; enum { @@ -72,82 +98,77 @@ enum { /**************************************************************************** * Local prototypes ****************************************************************************/ -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 SyncInfo ( const byte_t *, int *, int *, int *,int * ); - -static uint8_t *GetOutBuffer ( decoder_t *, void ** ); +static uint8_t *GetOutBuffer ( decoder_t *, block_t ** ); static aout_buffer_t *GetAoutBuffer( decoder_t * ); static block_t *GetSoutBuffer( decoder_t * ); /***************************************************************************** - * Module descriptor - *****************************************************************************/ -vlc_module_begin(); - set_description( _("A/52 parser") ); - set_capability( "decoder", 100 ); - 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 + * OpenCommon: probe the decoder/packetizer and return score *****************************************************************************/ -static int OpenDecoder( vlc_object_t *p_this ) +static int OpenCommon( vlc_object_t *p_this, bool b_packetizer ) { decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; + vlc_fourcc_t i_codec; - if( p_dec->fmt_in.i_codec != VLC_FOURCC('a','5','2',' ') - && p_dec->fmt_in.i_codec != 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; } /* 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; - } + return VLC_ENOMEM; /* Misc init */ - p_sys->b_packetizer = VLC_FALSE; + p_sys->b_packetizer = b_packetizer; p_sys->i_state = STATE_NOSYNC; - aout_DateSet( &p_sys->end_date, 0 ); + date_Set( &p_sys->end_date, 0 ); + p_sys->i_pts = VLC_TS_INVALID; - p_sys->bytestream = block_BytestreamInit( p_dec ); + p_sys->bytestream = block_BytestreamInit(); /* 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.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 */ - p_dec->pf_decode_audio = (aout_buffer_t *(*)(decoder_t *, block_t **)) - DecodeBlock; - p_dec->pf_packetize = (block_t *(*)(decoder_t *, block_t **)) - DecodeBlock; - + 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 OpenPacketizer( vlc_object_t *p_this ) +static int OpenDecoder( 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; + /* 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 ); +} - return i_ret; +static int OpenPacketizer( vlc_object_t *p_this ) +{ + return OpenCommon( p_this, true ); } /**************************************************************************** @@ -158,22 +179,29 @@ static int OpenPacketizer( vlc_object_t *p_this ) static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) { decoder_sys_t *p_sys = p_dec->p_sys; - uint8_t p_header[A52_HEADER_SIZE]; + uint8_t p_header[VLC_A52_HEADER_SIZE]; uint8_t *p_buf; - void *p_out_buffer; + block_t *p_out_buffer; if( !pp_block || !*pp_block ) return NULL; - if( !aout_DateGet( &p_sys->end_date ) && !(*pp_block)->i_pts ) + if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) { - /* We've just started the stream, wait for the first PTS. */ + 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; } - if( (*pp_block)->b_discontinuity ) + if( !date_Get( &p_sys->end_date ) && (*pp_block)->i_pts <= VLC_TS_INVALID) { - p_sys->i_state = STATE_NOSYNC; + /* We've just started the stream, wait for the first PTS. */ + block_Release( *pp_block ); + return NULL; } block_BytestreamPush( &p_sys->bytestream, *pp_block ); @@ -204,35 +232,31 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) 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 ) ) + if( p_sys->i_pts > VLC_TS_INVALID && + p_sys->i_pts != date_Get( &p_sys->end_date ) ) { - aout_DateSet( &p_sys->end_date, p_sys->i_pts ); + date_Set( &p_sys->end_date, p_sys->i_pts ); } p_sys->i_state = STATE_HEADER; case STATE_HEADER: - /* Get A/52 frame header (A52_HEADER_SIZE bytes) */ + /* Get A/52 frame header (VLC_A52_HEADER_SIZE bytes) */ if( block_PeekBytes( &p_sys->bytestream, p_header, - A52_HEADER_SIZE ) != VLC_SUCCESS ) + VLC_A52_HEADER_SIZE ) != VLC_SUCCESS ) { /* Need more data */ return NULL; } /* 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 ) + 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; } + p_sys->i_state = STATE_NEXT_SYNC; case STATE_NEXT_SYNC: @@ -241,7 +265,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) /* Check if next expected frame contains the sync word */ if( block_PeekOffsetBytes( &p_sys->bytestream, - p_sys->i_frame_size, p_header, 2 ) + p_sys->frame.i_size, p_header, 2 ) != VLC_SUCCESS ) { /* Need more data */ @@ -271,7 +295,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) /* 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 ) + p_sys->frame.i_size ) != VLC_SUCCESS ) { /* Need more data */ return NULL; @@ -281,17 +305,18 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) case STATE_SEND_DATA: if( !(p_buf = GetOutBuffer( p_dec, &p_out_buffer )) ) { - //p_dec->b_error = VLC_TRUE; + //p_dec->b_error = true; return NULL; } /* 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 ); + block_GetBytes( &p_sys->bytestream, + p_buf, __MIN( p_sys->frame.i_size, p_out_buffer->i_buffer ) ); /* 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_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 ); @@ -306,9 +331,9 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) } /***************************************************************************** - * CloseDecoder: clean up the decoder + * CloseCommon: clean up the decoder *****************************************************************************/ -static void CloseDecoder( vlc_object_t *p_this ) +static void CloseCommon( vlc_object_t *p_this ) { decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys = p_dec->p_sys; @@ -321,30 +346,31 @@ static void CloseDecoder( vlc_object_t *p_this ) /***************************************************************************** * GetOutBuffer: *****************************************************************************/ -static uint8_t *GetOutBuffer( decoder_t *p_dec, void **pp_out_buffer ) +static uint8_t *GetOutBuffer( decoder_t *p_dec, block_t **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 ) + if( p_dec->fmt_out.audio.i_rate != p_sys->frame.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 ); + 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 ); - aout_DateInit( &p_sys->end_date, p_sys->i_rate ); - aout_DateSet( &p_sys->end_date, p_sys->i_pts ); + 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->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_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->i_channels_conf; + p_dec->fmt_out.audio.i_original_channels = p_sys->frame.i_channels_conf; p_dec->fmt_out.audio.i_physical_channels = - p_sys->i_channels_conf & AOUT_CHAN_PHYSMASK; + p_sys->frame.i_channels_conf & AOUT_CHAN_PHYSMASK; - p_dec->fmt_out.i_bitrate = p_sys->i_bit_rate; + p_dec->fmt_out.i_bitrate = p_sys->frame.i_bitrate; if( p_sys->b_packetizer ) { @@ -370,11 +396,12 @@ 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 = p_dec->pf_aout_buffer_new( p_dec, A52_FRAME_NB ); + p_buf = decoder_NewAudioBuffer( p_dec, p_sys->frame.i_samples ); 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 ); + 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; } @@ -387,130 +414,14 @@ 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 ); + 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 = aout_DateGet( &p_sys->end_date ); + p_block->i_pts = p_block->i_dts = date_Get( &p_sys->end_date ); - p_block->i_length = aout_DateIncrement( &p_sys->end_date, A52_FRAME_NB ) - - p_block->i_pts; + p_block->i_length = + date_Increment( &p_sys->end_date, p_sys->frame.i_samples ) - 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... - *****************************************************************************/ -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; - } -}