X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fdts.c;h=5d777d4f01eb29dd47e0d4fb5693d7e52e9d49f3;hb=865d4b77957f3d16f667e2d62de5c423cc68928b;hp=15149365df3d48ae248b251d5d6c4850b1e822c5;hpb=df61d33b06e2b3cbbe746b2f5a9bea5b370c24ff;p=vlc diff --git a/modules/codec/dts.c b/modules/codec/dts.c index 15149365df..5d777d4f01 100644 --- a/modules/codec/dts.c +++ b/modules/codec/dts.c @@ -1,7 +1,7 @@ /***************************************************************************** * dts.c: parse DTS audio sync info and packetize the stream ***************************************************************************** - * Copyright (C) 2003-2005 the VideoLAN team + * Copyright (C) 2003-2009 VLC authors and VideoLAN * $Id$ * * Authors: Jon Lech Johansen @@ -25,16 +25,40 @@ /***************************************************************************** * Preamble *****************************************************************************/ + #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include -#include +#include +#include #include -#include #include +#include +#include +#include + +#include "../packetizer/packetizer_helper.h" +#include "dts_header.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_("DTS parser") ) + set_capability( "decoder", 100 ) + set_callbacks( OpenDecoder, CloseCommon ) -#define DTS_HEADER_SIZE 14 + add_submodule () + set_description( N_("DTS audio packetizer") ) + set_capability( "packetizer", 10 ) + set_callbacks( OpenPacketizer, CloseCommon ) +vlc_module_end () /***************************************************************************** * decoder_sys_t : decoder descriptor @@ -54,10 +78,11 @@ struct decoder_sys_t /* * Common properties */ - audio_date_t end_date; + date_t end_date; mtime_t i_pts; + bool b_dts_hd; /* Is the current frame a DTS HD one */ unsigned int i_bit_rate; unsigned int i_frame_size; unsigned int i_frame_length; @@ -66,127 +91,101 @@ struct decoder_sys_t unsigned int 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 OpenPacketizer( vlc_object_t * ); -static void CloseDecoder ( vlc_object_t * ); -static void *DecodeBlock ( decoder_t *, block_t ** ); +static int OpenCommon( vlc_object_t *, bool b_packetizer ); +static block_t *DecodeBlock( decoder_t *, block_t ** ); -static inline int SyncCode( const uint8_t * ); -static int SyncInfo ( const uint8_t *, unsigned int *, unsigned int *, - unsigned int *, unsigned int *, unsigned int * ); +static int SyncInfo( const uint8_t *, bool *, unsigned int *, unsigned int *, + unsigned int *, unsigned int *, unsigned int * ); -static uint8_t *GetOutBuffer ( decoder_t *, void ** ); -static aout_buffer_t *GetAoutBuffer( decoder_t * ); -static block_t *GetSoutBuffer( decoder_t * ); +static uint8_t *GetOutBuffer ( decoder_t *, block_t ** ); +static block_t *GetAoutBuffer( decoder_t * ); +static block_t *GetSoutBuffer( decoder_t * ); /***************************************************************************** - * Module descriptor + * OpenDecoder: probe the decoder *****************************************************************************/ -vlc_module_begin(); - set_description( _("DTS parser") ); - set_capability( "decoder", 100 ); - set_callbacks( OpenDecoder, CloseDecoder ); +static int OpenDecoder( vlc_object_t *p_this ) +{ + /* HACK: Don't use this codec if we don't have an dts audio filter */ + if( !module_exists( "dtstofloat32" ) ) + return VLC_EGENERIC; - add_submodule(); - set_description( _("DTS audio packetizer") ); - set_capability( "packetizer", 10 ); - set_callbacks( OpenPacketizer, CloseDecoder ); -vlc_module_end(); + return OpenCommon( p_this, false ); +} /***************************************************************************** - * OpenDecoder: probe the decoder and return score + * OpenPacketizer: probe the packetizer *****************************************************************************/ -static int OpenDecoder( vlc_object_t *p_this ) +static int OpenPacketizer( vlc_object_t *p_this ) +{ + return OpenCommon( p_this, true ); +} + +/***************************************************************************** + * OpenCommon: + *****************************************************************************/ +static int OpenCommon( vlc_object_t *p_this, bool b_packetizer ) { decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; - if( p_dec->fmt_in.i_codec != VLC_FOURCC('d','t','s',' ') - && p_dec->fmt_in.i_codec != VLC_FOURCC('d','t','s','b') ) - { + if( p_dec->fmt_in.i_codec != VLC_CODEC_DTS ) 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; - } + if( ( p_dec->p_sys = p_sys = malloc(sizeof(*p_sys)) ) == NULL ) + return VLC_ENOMEM; /* Misc init */ - p_sys->b_packetizer = 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->b_dts_hd = false; + p_sys->i_pts = VLC_TS_INVALID; - p_sys->bytestream = block_BytestreamInit(); + block_BytestreamInit( &p_sys->bytestream ); /* Set output properties */ p_dec->fmt_out.i_cat = AUDIO_ES; - p_dec->fmt_out.i_codec = VLC_FOURCC('d','t','s',' '); + p_dec->fmt_out.i_codec = VLC_CODEC_DTS; p_dec->fmt_out.audio.i_rate = 0; /* So end_date gets initialized */ /* 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; + p_dec->pf_decode_audio = DecodeBlock; + p_dec->pf_packetize = 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 = true; - - return i_ret; -} - /**************************************************************************** * DecodeBlock: the whole thing - **************************************************************************** - * This function is called just after the thread is launched. ****************************************************************************/ -static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) +static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) { decoder_sys_t *p_sys = p_dec->p_sys; uint8_t p_header[DTS_HEADER_SIZE]; uint8_t *p_buf; - void *p_out_buffer; + block_t *p_out_buffer; - if( !pp_block || !*pp_block ) return NULL; + if( !pp_block || !*pp_block ) + return NULL; if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) { if( (*pp_block)->i_flags&BLOCK_FLAG_CORRUPTED ) { p_sys->i_state = STATE_NOSYNC; - block_BytestreamFlush( &p_sys->bytestream ); + block_BytestreamEmpty( &p_sys->bytestream ); } -// aout_DateSet( &p_sys->end_date, 0 ); + date_Set( &p_sys->end_date, 0 ); block_Release( *pp_block ); return NULL; } - if( !aout_DateGet( &p_sys->end_date ) && !(*pp_block)->i_pts ) + if( !date_Get( &p_sys->end_date ) && (*pp_block)->i_pts <= VLC_TS_INVALID ) { /* We've just started the stream, wait for the first PTS. */ block_Release( *pp_block ); @@ -222,10 +221,10 @@ 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; @@ -240,6 +239,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) /* Check if frame is valid and get frame info */ p_sys->i_frame_size = SyncInfo( p_header, + &p_sys->b_dts_hd, &p_sys->i_channels, &p_sys->i_channels_conf, &p_sys->i_rate, @@ -267,6 +267,14 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) return NULL; } + if( p_sys->b_packetizer && + p_header[0] == 0 && p_header[1] == 0 ) + { + /* DTS wav files and audio CD's use stuffing */ + p_sys->i_state = STATE_SEND_DATA; + break; + } + if( SyncCode( p_header ) != VLC_SUCCESS ) { msg_Dbg( p_dec, "emulated sync word " @@ -292,6 +300,14 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) p_sys->i_state = STATE_SEND_DATA; case STATE_SEND_DATA: + if( p_sys->b_dts_hd ) + { + /* Ignore DTS-HD */ + block_SkipBytes( &p_sys->bytestream, p_sys->i_frame_size ); + p_sys->i_state = STATE_NOSYNC; + break; + } + if( !(p_buf = GetOutBuffer( p_dec, &p_out_buffer )) ) { //p_dec->b_error = true; @@ -300,11 +316,12 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) /* 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->i_frame_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; p_sys->i_state = STATE_NOSYNC; @@ -319,9 +336,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; @@ -334,7 +351,7 @@ 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; @@ -344,8 +361,8 @@ static uint8_t *GetOutBuffer( decoder_t *p_dec, void **pp_out_buffer ) msg_Info( p_dec, "DTS 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 ); + date_Init( &p_sys->end_date, p_sys->i_rate, 1 ); + date_Set( &p_sys->end_date, p_sys->i_pts ); } p_dec->fmt_out.audio.i_rate = p_sys->i_rate; @@ -369,7 +386,7 @@ static uint8_t *GetOutBuffer( decoder_t *p_dec, void **pp_out_buffer ) } else { - aout_buffer_t *p_aout_buffer = GetAoutBuffer( p_dec ); + block_t *p_aout_buffer = GetAoutBuffer( p_dec ); p_buf = p_aout_buffer ? p_aout_buffer->p_buffer : NULL; *pp_out_buffer = p_aout_buffer; } @@ -380,21 +397,22 @@ static uint8_t *GetOutBuffer( decoder_t *p_dec, void **pp_out_buffer ) /***************************************************************************** * GetAoutBuffer: *****************************************************************************/ -static aout_buffer_t *GetAoutBuffer( decoder_t *p_dec ) +static block_t *GetAoutBuffer( decoder_t *p_dec ) { decoder_sys_t *p_sys = p_dec->p_sys; - aout_buffer_t *p_buf; + block_t *p_buf; /* Hack for DTS S/PDIF filter which needs to send 3 frames at a time * (plus a few header bytes) */ - p_buf = p_dec->pf_aout_buffer_new( p_dec, p_sys->i_frame_length * 4 ); + p_buf = decoder_NewAudioBuffer( p_dec, p_sys->i_frame_length * 4 ); if( p_buf == NULL ) return NULL; + p_buf->i_nb_samples = p_sys->i_frame_length; - p_buf->i_nb_bytes = p_sys->i_frame_size; + p_buf->i_buffer = p_sys->i_frame_size; - p_buf->start_date = aout_DateGet( &p_sys->end_date ); - p_buf->end_date = - aout_DateIncrement( &p_sys->end_date, p_sys->i_frame_length ); + p_buf->i_pts = date_Get( &p_sys->end_date ); + p_buf->i_length = date_Increment( &p_sys->end_date, p_sys->i_frame_length ) + - p_buf->i_pts; return p_buf; } @@ -407,12 +425,12 @@ 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_Alloc( 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_pts = p_block->i_dts = date_Get( &p_sys->end_date ); - p_block->i_length = aout_DateIncrement( &p_sys->end_date, + p_block->i_length = date_Increment( &p_sys->end_date, p_sys->i_frame_length ) - p_block->i_pts; return p_block; @@ -437,118 +455,8 @@ static const unsigned int ppi_dts_bitrate[] = 2048000, 3072000, 3840000, 1/*open*/, 2/*variable*/, 3/*lossless*/ }; -static int SyncInfo16be( const uint8_t *p_buf, - unsigned int *pi_audio_mode, - unsigned int *pi_sample_rate, - unsigned int *pi_bit_rate, - unsigned int *pi_frame_length ) -{ - unsigned int i_frame_size; - unsigned int i_lfe; - - *pi_frame_length = (p_buf[4] & 0x01) << 6 | (p_buf[5] >> 2); - i_frame_size = (p_buf[5] & 0x03) << 12 | (p_buf[6] << 4) | - (p_buf[7] >> 4); - - *pi_audio_mode = (p_buf[7] & 0x0f) << 2 | (p_buf[8] >> 6); - *pi_sample_rate = (p_buf[8] >> 2) & 0x0f; - *pi_bit_rate = (p_buf[8] & 0x03) << 3 | ((p_buf[9] >> 5) & 0x07); - - i_lfe = (p_buf[10] >> 1) & 0x03; - if( i_lfe ) *pi_audio_mode |= 0x10000; - - return i_frame_size + 1; -} - -static void BufLeToBe( uint8_t *p_out, const uint8_t *p_in, int i_in ) -{ - int i; - - for( i = 0; i < i_in/2; i++ ) - { - p_out[i*2] = p_in[i*2+1]; - p_out[i*2+1] = p_in[i*2]; - } -} - -static int Buf14To16( uint8_t *p_out, const uint8_t *p_in, int i_in, int i_le ) -{ - unsigned char tmp, cur = 0; - int bits_in, bits_out = 0; - int i, i_out = 0; - - for( i = 0; i < i_in; i++ ) - { - if( i%2 ) - { - tmp = p_in[i-i_le]; - bits_in = 8; - } - else - { - tmp = p_in[i+i_le] & 0x3F; - bits_in = 8 - 2; - } - - if( bits_out < 8 ) - { - int need = __MIN( 8 - bits_out, bits_in ); - cur <<= need; - cur |= ( tmp >> (bits_in - need) ); - tmp <<= (8 - bits_in + need); - tmp >>= (8 - bits_in + need); - bits_in -= need; - bits_out += need; - } - - if( bits_out == 8 ) - { - p_out[i_out] = cur; - cur = 0; - bits_out = 0; - i_out++; - } - - bits_out += bits_in; - cur <<= bits_in; - cur |= tmp; - } - - return i_out; -} - -static inline int SyncCode( const uint8_t *p_buf ) -{ - /* 14 bits, little endian version of the bitstream */ - if( p_buf[0] == 0xff && p_buf[1] == 0x1f && - p_buf[2] == 0x00 && p_buf[3] == 0xe8 && - (p_buf[4] & 0xf0) == 0xf0 && p_buf[5] == 0x07 ) - { - return VLC_SUCCESS; - } - /* 14 bits, big endian version of the bitstream */ - else if( p_buf[0] == 0x1f && p_buf[1] == 0xff && - p_buf[2] == 0xe8 && p_buf[3] == 0x00 && - p_buf[4] == 0x07 && (p_buf[5] & 0xf0) == 0xf0 ) - { - return VLC_SUCCESS; - } - /* 16 bits, big endian version of the bitstream */ - else if( p_buf[0] == 0x7f && p_buf[1] == 0xfe && - p_buf[2] == 0x80 && p_buf[3] == 0x01 ) - { - return VLC_SUCCESS; - } - /* 16 bits, little endian version of the bitstream */ - else if( p_buf[0] == 0xfe && p_buf[1] == 0x7f && - p_buf[2] == 0x01 && p_buf[3] == 0x80 ) - { - return VLC_SUCCESS; - } - else return VLC_EGENERIC; -} - static int SyncInfo( const uint8_t *p_buf, + bool *pb_dts_hd, unsigned int *pi_channels, unsigned int *pi_channels_conf, unsigned int *pi_sample_rate, @@ -556,56 +464,23 @@ static int SyncInfo( const uint8_t *p_buf, unsigned int *pi_frame_length ) { unsigned int i_audio_mode; - unsigned int i_frame_size; - /* 14 bits, little endian version of the bitstream */ - if( p_buf[0] == 0xff && p_buf[1] == 0x1f && - p_buf[2] == 0x00 && p_buf[3] == 0xe8 && - (p_buf[4] & 0xf0) == 0xf0 && p_buf[5] == 0x07 ) - { - uint8_t conv_buf[DTS_HEADER_SIZE]; - Buf14To16( conv_buf, p_buf, DTS_HEADER_SIZE, 1 ); - i_frame_size = SyncInfo16be( conv_buf, &i_audio_mode, pi_sample_rate, - pi_bit_rate, pi_frame_length ); - i_frame_size = i_frame_size * 8 / 14 * 2; - } - /* 14 bits, big endian version of the bitstream */ - else if( p_buf[0] == 0x1f && p_buf[1] == 0xff && - p_buf[2] == 0xe8 && p_buf[3] == 0x00 && - p_buf[4] == 0x07 && (p_buf[5] & 0xf0) == 0xf0 ) - { - uint8_t conv_buf[DTS_HEADER_SIZE]; - Buf14To16( conv_buf, p_buf, DTS_HEADER_SIZE, 0 ); - i_frame_size = SyncInfo16be( conv_buf, &i_audio_mode, pi_sample_rate, - pi_bit_rate, pi_frame_length ); - i_frame_size = i_frame_size * 8 / 14 * 2; - } - /* 16 bits, big endian version of the bitstream */ - else if( p_buf[0] == 0x7f && p_buf[1] == 0xfe && - p_buf[2] == 0x80 && p_buf[3] == 0x01 ) - { - i_frame_size = SyncInfo16be( p_buf, &i_audio_mode, pi_sample_rate, - pi_bit_rate, pi_frame_length ); - } - /* 16 bits, little endian version of the bitstream */ - else if( p_buf[0] == 0xfe && p_buf[1] == 0x7f && - p_buf[2] == 0x01 && p_buf[3] == 0x80 ) - { - uint8_t conv_buf[DTS_HEADER_SIZE]; - BufLeToBe( conv_buf, p_buf, DTS_HEADER_SIZE ); - i_frame_size = SyncInfo16be( p_buf, &i_audio_mode, pi_sample_rate, - pi_bit_rate, pi_frame_length ); - } - else return 0; + unsigned int i_frame_size = GetSyncInfo( p_buf, pb_dts_hd, + pi_sample_rate, pi_bit_rate, pi_frame_length, &i_audio_mode); + + if( *pb_dts_hd == true ) + return i_frame_size; switch( i_audio_mode & 0xFFFF ) { case 0x0: /* Mono */ + *pi_channels = 1; *pi_channels_conf = AOUT_CHAN_CENTER; break; case 0x1: /* Dual-mono = stereo + dual-mono */ + *pi_channels = 2; *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_DUALMONO; break; @@ -673,18 +548,20 @@ static int SyncInfo( const uint8_t *p_buf, AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE; break; + case 0xF: default: - if( i_audio_mode <= 63 ) + if( (i_audio_mode & 0xFFFF) >= 0x10 ) { /* User defined */ *pi_channels = 0; *pi_channels_conf = 0; } else return 0; + break; } - if( i_audio_mode & 0x10000 ) + if( *pi_channels && (i_audio_mode & 0x10000) ) { (*pi_channels)++; *pi_channels_conf |= AOUT_CHAN_LFE;