X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fdts.c;h=d12c89ae43cb949fa29fc3f06eeade61171c5ba7;hb=276a9657f77872122e43f73c49970b9b06d5af8e;hp=59a9fbd410c5d23b49738c398e02b546578eec8e;hpb=b34b9a2e5fbbc87e7387e2b34e4fb8640212d6b8;p=vlc diff --git a/modules/codec/dts.c b/modules/codec/dts.c index 59a9fbd410..d12c89ae43 100644 --- a/modules/codec/dts.c +++ b/modules/codec/dts.c @@ -1,8 +1,8 @@ /***************************************************************************** * dts.c: parse DTS audio sync info and packetize the stream ***************************************************************************** - * Copyright (C) 2003 VideoLAN - * $Id: dts.c,v 1.10 2004/01/21 17:56:05 gbazin Exp $ + * Copyright (C) 2003-2009 the VideoLAN team + * $Id$ * * Authors: Jon Lech Johansen * Gildas Bazin @@ -19,18 +19,43 @@ * * 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 "vlc_block_helper.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif +#include -#define DTS_HEADER_SIZE 12 +#include +#include +#include +#include +#include +#include +#include + +/***************************************************************************** + * 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 ) + + add_submodule () + set_description( N_("DTS audio packetizer") ) + set_capability( "packetizer", 10 ) + set_callbacks( OpenPacketizer, CloseCommon ) +vlc_module_end () /***************************************************************************** * decoder_sys_t : decoder descriptor @@ -38,7 +63,7 @@ struct decoder_sys_t { /* Module mode */ - vlc_bool_t b_packetizer; + bool b_packetizer; /* * Input properties @@ -50,18 +75,17 @@ 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_frame_length, i_rate, i_channels, i_channels_conf; - - /* This is very hacky. For DTS over S/PDIF we apparently need to send - * 3 frames at a time. This should likely be moved to the output stage. */ - int i_frames_in_buf; - aout_buffer_t *p_aout_buffer; /* current aout buffer being filled */ - + 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; + unsigned int i_rate; + unsigned int i_channels; + unsigned int i_channels_conf; }; enum { @@ -74,69 +98,70 @@ enum { STATE_SEND_DATA }; +#define DTS_HEADER_SIZE 14 + /**************************************************************************** * 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 void *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 uint8_t *GetOutBuffer ( decoder_t *, block_t ** ); static aout_buffer_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, NULL ); -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 = VLC_FALSE; + p_sys->b_packetizer = b_packetizer; p_sys->i_state = STATE_NOSYNC; - aout_DateSet( &p_sys->end_date, 0 ); - p_sys->i_frames_in_buf = 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( 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('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 **)) @@ -147,41 +172,36 @@ static int OpenDecoder( vlc_object_t *p_this ) 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; -} - /**************************************************************************** * 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 ) { 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( !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 ); @@ -213,10 +233,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; @@ -231,6 +251,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, @@ -258,10 +279,18 @@ 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 " - "(no sync on following frame) %2.2x%2.2x%2.2x%2.2x", + "(no sync on following frame): %2.2x%2.2x%2.2x%2.2x", (int)p_header[0], (int)p_header[1], (int)p_header[2], (int)p_header[3] ); p_sys->i_state = STATE_NOSYNC; @@ -283,34 +312,33 @@ 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 = 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->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; - - /* So p_block doesn't get re-added several times */ - *pp_block = block_BytestreamPop( &p_sys->bytestream ); + p_sys->i_pts = p_sys->bytestream.p_block->i_pts = VLC_TS_INVALID; p_sys->i_state = STATE_NOSYNC; - if( !p_sys->b_packetizer ) - { - if( p_sys->i_frames_in_buf != 3 ) return NULL; - else - { - p_sys->i_frames_in_buf = 0; - p_sys->p_aout_buffer = 0; - } - } + /* So p_block doesn't get re-added several times */ + *pp_block = block_BytestreamPop( &p_sys->bytestream ); return p_out_buffer; } @@ -320,9 +348,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; @@ -335,7 +363,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; @@ -345,13 +373,15 @@ 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; 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; + /* Hack for DTS S/PDIF filter which needs to pad the DTS frames */ + p_dec->fmt_out.audio.i_bytes_per_frame = + __MAX( p_sys->i_frame_size, p_sys->i_frame_length * 4 ); p_dec->fmt_out.audio.i_frame_length = p_sys->i_frame_length; p_dec->fmt_out.audio.i_original_channels = p_sys->i_channels_conf; @@ -368,17 +398,11 @@ static uint8_t *GetOutBuffer( decoder_t *p_dec, void **pp_out_buffer ) } else { - if( !p_sys->i_frames_in_buf ) - { - p_sys->p_aout_buffer = GetAoutBuffer( p_dec ); - } - p_buf = p_sys->p_aout_buffer ? p_sys->p_aout_buffer->p_buffer + - p_sys->i_frames_in_buf * p_sys->i_frame_size : NULL; - *pp_out_buffer = p_sys->p_aout_buffer; + 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; } - p_sys->i_frames_in_buf++; - return p_buf; } @@ -390,12 +414,16 @@ 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, p_sys->i_frame_length * 3 ); + /* Hack for DTS S/PDIF filter which needs to send 3 frames at a time + * (plus a few header bytes) */ + 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_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 * 3 ); + 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; } @@ -411,9 +439,9 @@ static block_t *GetSoutBuffer( decoder_t *p_dec ) 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_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; @@ -424,8 +452,7 @@ static block_t *GetSoutBuffer( decoder_t *p_dec ) *****************************************************************************/ static const unsigned int ppi_dts_samplerate[] = { - 0, 8000, 16000, 32000, 64000, 128000, - 11025, 22050, 44010, 88020, 176400, + 0, 8000, 16000, 32000, 0, 0, 11025, 22050, 44100, 0, 0, 12000, 24000, 48000, 96000, 192000 }; @@ -436,7 +463,7 @@ static const unsigned int ppi_dts_bitrate[] = 448000, 512000, 576000, 640000, 768000, 896000, 1024000, 1152000, 1280000, 1344000, 1408000, 1411200, 1472000, 1536000, 1920000, - 2048000, 3072000, 3840000, 4096000, 0, 0 + 2048000, 3072000, 3840000, 1/*open*/, 2/*variable*/, 3/*lossless*/ }; static int SyncInfo16be( const uint8_t *p_buf, @@ -446,6 +473,7 @@ static int SyncInfo16be( const uint8_t *p_buf, 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) | @@ -455,10 +483,24 @@ static int SyncInfo16be( const uint8_t *p_buf, *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 int Buf14leTO16be( uint8_t *p_out, const uint8_t *p_in, int i_in ) +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; @@ -466,16 +508,16 @@ static int Buf14leTO16be( uint8_t *p_out, const uint8_t *p_in, int i_in ) for( i = 0; i < i_in; i++ ) { - if( i%2 ) - { - tmp = p_in[i-1]; - bits_in = 8; - } - else - { - tmp = p_in[i+1] & 0x3F; - bits_in = 8 - 2; - } + 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 ) { @@ -513,16 +555,37 @@ static inline int SyncCode( const uint8_t *p_buf ) { 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; } - else return VLC_EGENERIC; + /* 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; + } + /* DTS-HD */ + else if( p_buf[0] == 0x64 && p_buf[1] == 0x58 && + p_buf[2] == 0x20 && p_buf[3] == 0x25 ) + { + return VLC_SUCCESS; + } + + 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, @@ -537,11 +600,22 @@ static int SyncInfo( const uint8_t *p_buf, p_buf[2] == 0x00 && p_buf[3] == 0xe8 && (p_buf[4] & 0xf0) == 0xf0 && p_buf[5] == 0x07 ) { - uint8_t conv_buf[12]; - Buf14leTO16be( conv_buf, p_buf, 12 ); + 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; + 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 && @@ -550,16 +624,64 @@ static int SyncInfo( const uint8_t *p_buf, i_frame_size = SyncInfo16be( p_buf, &i_audio_mode, pi_sample_rate, pi_bit_rate, pi_frame_length ); } - else return 0; + /* 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 ); + } + /* DTS-HD */ + else + { + assert( p_buf[0] == 0x64 && p_buf[1] == 0x58 && + p_buf[2] == 0x20 && p_buf[3] == 0x25 ); + + int i_dts_hd_size; + bs_t s; + bs_init( &s, &p_buf[4], DTS_HEADER_SIZE - 4 ); + + bs_skip( &s, 8 + 2 ); + + if( bs_read1( &s ) ) + { + bs_skip( &s, 12 ); + i_dts_hd_size = bs_read( &s, 20 ) + 1; + } + else + { + bs_skip( &s, 8 ); + i_dts_hd_size = bs_read( &s, 16 ) + 1; + } + //uint16_t s0 = bs_read( &s, 16 ); + //uint16_t s1 = bs_read( &s, 16 ); + //fprintf( stderr, "DTS HD=%d : %x %x\n", i_dts_hd_size, s0, s1 ); + + *pb_dts_hd = true; + /* As we ignore the stream, do not modify those variables: + *pi_channels = ; + *pi_channels_conf = ; + *pi_sample_rate = ; + *pi_bit_rate = ; + *pi_frame_length = ; + */ + return i_dts_hd_size; + } - switch( i_audio_mode ) + *pb_dts_hd = false; + + 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; @@ -577,16 +699,16 @@ static int SyncInfo( const uint8_t *p_buf, AOUT_CHAN_CENTER; break; case 0x6: - /* 2F/LFE */ + /* 2F/1R */ *pi_channels = 3; *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | - AOUT_CHAN_LFE; + AOUT_CHAN_REARCENTER; break; case 0x7: - /* 3F/LFE */ + /* 3F/1R */ *pi_channels = 4; *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | - AOUT_CHAN_CENTER | AOUT_CHAN_LFE; + AOUT_CHAN_CENTER | AOUT_CHAN_REARCENTER; break; case 0x8: /* 2F2R */ @@ -638,21 +760,27 @@ static int SyncInfo( const uint8_t *p_buf, break; } + if( i_audio_mode & 0x10000 ) + { + (*pi_channels)++; + *pi_channels_conf |= AOUT_CHAN_LFE; + } + if( *pi_sample_rate >= sizeof( ppi_dts_samplerate ) / sizeof( ppi_dts_samplerate[0] ) ) { return 0; } - *pi_sample_rate = ppi_dts_samplerate[ *pi_sample_rate ]; + if( !*pi_sample_rate ) return 0; if( *pi_bit_rate >= sizeof( ppi_dts_bitrate ) / sizeof( ppi_dts_bitrate[0] ) ) { return 0; } - *pi_bit_rate = ppi_dts_bitrate[ *pi_bit_rate ]; + if( !*pi_bit_rate ) return 0; *pi_frame_length = (*pi_frame_length + 1) * 32;