X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fdts.c;h=22d1f9c6cb57ed2b8b44b1c3a5e36857341f3e46;hb=3f6288216a3f3e92d4ea04add0be59097b08a29a;hp=84e41ed2e204708e96a5cecece455d86838b1b72;hpb=7bb574fdf5724bee95a011cf96f33c95f1ff8645;p=vlc diff --git a/modules/codec/dts.c b/modules/codec/dts.c index 84e41ed2e2..22d1f9c6cb 100644 --- a/modules/codec/dts.c +++ b/modules/codec/dts.c @@ -1,8 +1,8 @@ /***************************************************************************** - * dts.c: DTS basic parser + * dts.c: parse DTS audio sync info and packetize the stream ***************************************************************************** - * Copyright (C) 2003 VideoLAN - * $Id: dts.c,v 1.4 2003/09/02 20:19:25 gbazin Exp $ + * Copyright (C) 2003-2009 the VideoLAN team + * $Id$ * * Authors: Jon Lech Johansen * Gildas Bazin @@ -19,28 +19,42 @@ * * 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 - -#include -#include -#include -#include -#include - -#ifdef HAVE_UNISTD_H -# include + +#ifdef HAVE_CONFIG_H +# include "config.h" #endif +#include -#define DTS_HEADER_SIZE 10 +#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 @@ -48,598 +62,624 @@ struct decoder_sys_t { /* Module mode */ - vlc_bool_t b_packetizer; + bool b_packetizer; /* * Input properties */ - int i_state; - - uint8_t p_header[DTS_HEADER_SIZE]; - int i_header; - - mtime_t pts; + int i_state; - int i_frame_size; + block_bytestream_t bytestream; /* - * Decoder output properties + * Common properties */ - aout_instance_t * p_aout; /* opaque */ - aout_input_t * p_aout_input; /* opaque */ - audio_sample_format_t aout_format; - aout_buffer_t * p_aout_buffer; /* current aout buffer being filled */ - /* 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; + date_t end_date; - /* - * Packetizer output properties - */ - sout_packetizer_input_t *p_sout_input; - sout_format_t sout_format; - sout_buffer_t * p_sout_buffer; /* current sout buffer */ + mtime_t i_pts; - /* - * Common properties - */ - uint8_t *p_out_buffer; /* output buffer */ - int i_out_buffer; /* position in output buffer */ - audio_date_t end_date; + 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 { STATE_NOSYNC, - STATE_PARTIAL_SYNC, STATE_SYNC, STATE_HEADER, - STATE_DATA + STATE_NEXT_SYNC, + STATE_GET_DATA, + STATE_SEND_DATA }; +#define DTS_HEADER_SIZE 14 + /**************************************************************************** * Local prototypes ****************************************************************************/ -static int OpenDecoder ( vlc_object_t * ); -static int OpenPacketizer( vlc_object_t * ); - -static int InitDecoder ( decoder_t * ); -static int RunDecoder ( decoder_t *, block_t * ); -static int EndDecoder ( decoder_t * ); - -static int SyncInfo ( const byte_t *, unsigned int *, unsigned int *, - unsigned int *, unsigned int *, unsigned int * ); - -static int GetOutBuffer ( decoder_t *, uint8_t ** ); -static int GetAoutBuffer( decoder_t *, aout_buffer_t ** ); -static int GetSoutBuffer( decoder_t *, sout_buffer_t ** ); -static int SendOutBuffer( decoder_t * ); +static int OpenCommon( vlc_object_t *, bool b_packetizer ); +static void *DecodeBlock( decoder_t *, block_t ** ); -/***************************************************************************** - * Module descriptor - *****************************************************************************/ -vlc_module_begin(); - set_description( _("DTS parser") ); - set_capability( "decoder", 100 ); - set_callbacks( OpenDecoder, NULL ); +static inline int SyncCode( const uint8_t * ); +static int SyncInfo( const uint8_t *, bool *, unsigned int *, unsigned int *, + unsigned int *, unsigned int *, unsigned int * ); - add_submodule(); - set_description( _("DTS audio packetizer") ); - set_capability( "packetizer", 10 ); - set_callbacks( OpenPacketizer, NULL ); -vlc_module_end(); +static uint8_t *GetOutBuffer ( decoder_t *, void ** ); +static aout_buffer_t *GetAoutBuffer( decoder_t * ); +static block_t *GetSoutBuffer( decoder_t * ); /***************************************************************************** - * OpenDecoder: probe the decoder and return score + * OpenDecoder: probe the decoder *****************************************************************************/ static int OpenDecoder( vlc_object_t *p_this ) { - decoder_t *p_dec = (decoder_t*)p_this; - - if( p_dec->p_fifo->i_fourcc != VLC_FOURCC('d','t','s',' ') - && p_dec->p_fifo->i_fourcc != VLC_FOURCC('d','t','s','b') ) - { + /* HACK: Don't use this codec if we don't have an dts audio filter */ + if( !module_exists( "dtstofloat32" ) ) return VLC_EGENERIC; - } - p_dec->pf_init = InitDecoder; - p_dec->pf_decode = RunDecoder; - p_dec->pf_end = EndDecoder; - - /* Allocate the memory needed to store the decoder's structure */ - if( ( p_dec->p_sys = - (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL ) - { - msg_Err( p_dec, "out of memory" ); - return VLC_EGENERIC; - } - p_dec->p_sys->b_packetizer = VLC_FALSE; - - return VLC_SUCCESS; + return OpenCommon( p_this, false ); } +/***************************************************************************** + * OpenPacketizer: probe the packetizer + *****************************************************************************/ 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; + return OpenCommon( p_this, true ); } /***************************************************************************** - * InitDecoder: Initalize the decoder + * OpenCommon: *****************************************************************************/ -static int InitDecoder( decoder_t *p_dec ) +static int OpenCommon( vlc_object_t *p_this, bool b_packetizer ) { - p_dec->p_sys->i_state = STATE_NOSYNC; + decoder_t *p_dec = (decoder_t*)p_this; + decoder_sys_t *p_sys; + + 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 = malloc(sizeof(*p_sys)) ) == 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->b_dts_hd = false; + p_sys->i_pts = VLC_TS_INVALID; - p_dec->p_sys->p_out_buffer = NULL; - p_dec->p_sys->i_out_buffer = 0; - aout_DateSet( &p_dec->p_sys->end_date, 0 ); + p_sys->bytestream = block_BytestreamInit(); - p_dec->p_sys->p_aout = NULL; - p_dec->p_sys->p_aout_input = NULL; - p_dec->p_sys->p_aout_buffer = NULL; - p_dec->p_sys->aout_format.i_format = VLC_FOURCC('d','t','s',' '); + /* Set output properties */ + p_dec->fmt_out.i_cat = AUDIO_ES; + p_dec->fmt_out.i_codec = VLC_CODEC_DTS; + p_dec->fmt_out.audio.i_rate = 0; /* So end_date gets initialized */ - p_dec->p_sys->p_sout_input = NULL; - p_dec->p_sys->p_sout_buffer = NULL; - p_dec->p_sys->sout_format.i_cat = AUDIO_ES; - p_dec->p_sys->sout_format.i_fourcc = VLC_FOURCC('d','t','s',' '); + /* 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; } /**************************************************************************** - * RunDecoder: the whole thing - **************************************************************************** - * This function is called just after the thread is launched. + * DecodeBlock: the whole thing ****************************************************************************/ -static int RunDecoder( decoder_t *p_dec, block_t *p_block ) +static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) { decoder_sys_t *p_sys = p_dec->p_sys; - int i, i_block_pos = 0; - mtime_t i_pts = p_block->i_pts; + uint8_t p_header[DTS_HEADER_SIZE]; + uint8_t *p_buf; + void *p_out_buffer; + + if( !pp_block || !*pp_block ) + return NULL; - while( i_block_pos < p_block->i_buffer ) + if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) { - switch( p_sys->i_state ) + if( (*pp_block)->i_flags&BLOCK_FLAG_CORRUPTED ) { - case STATE_NOSYNC: - /* Look for sync dword - should be 0x7ffe8001 */ - while( i_block_pos < p_block->i_buffer && - p_block->p_buffer[i_block_pos] != 0x7f ) - { - i_block_pos++; - } - - if( i_block_pos < p_block->i_buffer ) - { - p_sys->i_state = STATE_PARTIAL_SYNC; - i_block_pos++; - p_sys->p_header[0] = 0x7f; - p_sys->i_header = 1; - break; - } - break; - - case STATE_PARTIAL_SYNC: - /* Get the full 4 sync bytes */ - if( p_sys->i_header < 4 ) - { - int i_size = __MIN( 4 - p_sys->i_header, - p_block->i_buffer - i_block_pos ); + p_sys->i_state = STATE_NOSYNC; + block_BytestreamEmpty( &p_sys->bytestream ); + } + date_Set( &p_sys->end_date, 0 ); + block_Release( *pp_block ); + return NULL; + } - memcpy( p_sys->p_header + p_sys->i_header, - p_block->p_buffer + i_block_pos, i_size ); - i_block_pos += i_size; - p_sys->i_header += i_size; - } + 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 ); + return NULL; + } - if( p_sys->i_header < 4 ) - break; + block_BytestreamPush( &p_sys->bytestream, *pp_block ); - if( p_sys->p_header[0] == 0x7f && p_sys->p_header[1] == 0xfe && - p_sys->p_header[2] == 0x80 && p_sys->p_header[3] == 0x01 ) - { - p_sys->i_state = STATE_SYNC; - } - else + while( 1 ) + { + switch( p_sys->i_state ) + { + case STATE_NOSYNC: + /* Look for sync code - should be 0x7ffe8001 */ + while( block_PeekBytes( &p_sys->bytestream, p_header, 6 ) + == VLC_SUCCESS ) { - for( i = 1; i < 4; i++ ) - { - if( p_sys->p_header[i] == 0x7f ) break; - } - - if( p_sys->p_header[i] == 0x7f ) + if( SyncCode( p_header ) == VLC_SUCCESS ) { - /* Potential new sync */ - p_sys->i_header -= i; - memmove( p_sys->p_header, &p_sys->p_header[i], - p_sys->i_header ); + p_sys->i_state = STATE_SYNC; break; } + block_SkipByte( &p_sys->bytestream ); + } + if( p_sys->i_state != STATE_SYNC ) + { + block_BytestreamFlush( &p_sys->bytestream ); - /* retry to sync*/ - p_sys->i_state = STATE_NOSYNC; + /* Need more data */ + return NULL; } - break; case STATE_SYNC: /* New frame, set the Presentation Time Stamp */ - p_sys->pts = i_pts; i_pts = 0; - if( p_sys->pts != 0 && - p_sys->pts != aout_DateGet( &p_sys->end_date ) ) + 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 ) ) { - aout_DateSet( &p_sys->end_date, p_sys->pts ); + date_Set( &p_sys->end_date, p_sys->i_pts ); } p_sys->i_state = STATE_HEADER; - break; case STATE_HEADER: /* Get DTS frame header (DTS_HEADER_SIZE bytes) */ - if( p_sys->i_header < DTS_HEADER_SIZE ) + if( block_PeekBytes( &p_sys->bytestream, p_header, + DTS_HEADER_SIZE ) != VLC_SUCCESS ) { - int i_size = __MIN( DTS_HEADER_SIZE - p_sys->i_header, - p_block->i_buffer - i_block_pos ); - - memcpy( p_sys->p_header + p_sys->i_header, - p_block->p_buffer + i_block_pos, i_size ); - i_block_pos += i_size; - p_sys->i_header += i_size; + /* Need more data */ + return NULL; } - if( p_sys->i_header < DTS_HEADER_SIZE ) + /* 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, + &p_sys->i_bit_rate, + &p_sys->i_frame_length ); + 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( GetOutBuffer( p_dec, &p_sys->p_out_buffer ) + 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->i_frame_size, p_header, 6 ) != VLC_SUCCESS ) { - block_Release( p_block ); - return VLC_EGENERIC; + /* Need more data */ + return NULL; } - if( !p_sys->p_out_buffer ) + if( p_sys->b_packetizer && + p_header[0] == 0 && p_header[1] == 0 ) { - p_sys->i_state = STATE_NOSYNC; + /* DTS wav files and audio CD's use stuffing */ + p_sys->i_state = STATE_SEND_DATA; break; } - memcpy( p_sys->p_out_buffer, p_sys->p_header, DTS_HEADER_SIZE ); - p_sys->i_out_buffer = DTS_HEADER_SIZE; - p_sys->i_state = STATE_DATA; + 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", + (int)p_header[0], (int)p_header[1], + (int)p_header[2], (int)p_header[3] ); + p_sys->i_state = STATE_NOSYNC; + block_SkipByte( &p_sys->bytestream ); + break; + } + p_sys->i_state = STATE_SEND_DATA; break; - case STATE_DATA: - /* Copy the whole DTS frame into the aout buffer */ - if( p_sys->i_out_buffer < p_sys->i_frame_size ) + 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 ) { - int i_size = __MIN( p_sys->i_frame_size - p_sys->i_out_buffer, - p_block->i_buffer - i_block_pos ); + /* Need more data */ + return NULL; + } + p_sys->i_state = STATE_SEND_DATA; - memcpy( p_sys->p_out_buffer + p_sys->i_out_buffer, - p_block->p_buffer + i_block_pos, i_size ); - i_block_pos += i_size; - p_sys->i_out_buffer += i_size; + 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; + return NULL; } - if( p_sys->i_out_buffer < p_sys->i_frame_size ) - break; /* Need more data */ + /* 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 ); - SendOutBuffer( p_dec ); + /* 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; p_sys->i_state = STATE_NOSYNC; - break; + + /* So p_block doesn't get re-added several times */ + *pp_block = block_BytestreamPop( &p_sys->bytestream ); + + return p_out_buffer; } } - block_Release( p_block ); - return VLC_SUCCESS; + return NULL; } /***************************************************************************** - * EndDecoder: clean up the decoder + * CloseCommon: clean up the decoder *****************************************************************************/ -static int EndDecoder( decoder_t *p_dec ) +static void CloseCommon( vlc_object_t *p_this ) { - if( p_dec->p_sys->p_aout_input != NULL ) - { - if( p_dec->p_sys->p_aout_buffer ) - { - aout_DecDeleteBuffer( p_dec->p_sys->p_aout, - p_dec->p_sys->p_aout_input, - p_dec->p_sys->p_aout_buffer ); - } - - aout_DecDelete( p_dec->p_sys->p_aout, p_dec->p_sys->p_aout_input ); - } - - if( p_dec->p_sys->p_sout_input != NULL ) - { - if( p_dec->p_sys->p_sout_buffer ) - { - sout_BufferDelete( p_dec->p_sys->p_sout_input->p_sout, - p_dec->p_sys->p_sout_buffer ); - } - - sout_InputDelete( p_dec->p_sys->p_sout_input ); - } + decoder_t *p_dec = (decoder_t*)p_this; + decoder_sys_t *p_sys = p_dec->p_sys; - free( p_dec->p_sys ); + block_BytestreamRelease( &p_sys->bytestream ); - return VLC_SUCCESS; + free( p_sys ); } /***************************************************************************** * GetOutBuffer: *****************************************************************************/ -static int GetOutBuffer ( decoder_t *p_dec, uint8_t **pp_out_buffer ) +static uint8_t *GetOutBuffer( decoder_t *p_dec, void **pp_out_buffer ) { decoder_sys_t *p_sys = p_dec->p_sys; - int i_ret; + uint8_t *p_buf; + + if( p_dec->fmt_out.audio.i_rate != p_sys->i_rate ) + { + msg_Info( p_dec, "DTS channels:%d samplerate:%d bitrate:%d", + p_sys->i_channels, p_sys->i_rate, p_sys->i_bit_rate ); + + 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; + /* 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; + 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 ) { - i_ret= GetSoutBuffer( p_dec, &p_sys->p_sout_buffer ); - *pp_out_buffer = - p_sys->p_sout_buffer ? p_sys->p_sout_buffer->p_buffer : NULL; + 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 { - i_ret = GetAoutBuffer( p_dec, &p_sys->p_aout_buffer ); - if( p_sys->i_frames_in_buf == 1 ) - *pp_out_buffer = p_sys->p_aout_buffer ? - p_sys->p_aout_buffer->p_buffer : NULL; - else - *pp_out_buffer = p_sys->p_aout_buffer ? - p_sys->p_aout_buffer->p_buffer + p_sys->i_frame_size * - (p_sys->i_frames_in_buf - 1) : NULL; + 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; } - return i_ret; + return p_buf; } /***************************************************************************** * GetAoutBuffer: *****************************************************************************/ -static int GetAoutBuffer( decoder_t *p_dec, aout_buffer_t **pp_buffer ) +static aout_buffer_t *GetAoutBuffer( decoder_t *p_dec ) { - int i_bit_rate; - unsigned int i_frame_length, i_rate, i_channels, i_channels_conf; - decoder_sys_t *p_sys = p_dec->p_sys; + aout_buffer_t *p_buf; - /* Check if frame is valid and get frame info */ - p_sys->i_frame_size = SyncInfo( p_sys->p_header, - &i_channels, &i_channels_conf, - &i_rate, &i_bit_rate, &i_frame_length ); - - if( !p_sys->i_frame_size ) - { - msg_Warn( p_dec, "dts syncinfo failed" ); - *pp_buffer = NULL; - return VLC_SUCCESS; - } + /* 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; - if( p_sys->p_aout_input != NULL && ( p_sys->aout_format.i_rate != i_rate - || p_sys->aout_format.i_original_channels != i_channels_conf - || (int)p_sys->aout_format.i_bytes_per_frame != p_sys->i_frame_size ) ) - { - /* Parameters changed - this should not happen. */ - aout_DecDelete( p_sys->p_aout, p_sys->p_aout_input ); - p_sys->p_aout_input = NULL; - } + 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; - /* Creating the audio input if not created yet. */ - if( p_sys->p_aout_input == NULL ) - { - p_sys->aout_format.i_rate = i_rate; - p_sys->aout_format.i_original_channels = i_channels_conf; - p_sys->aout_format.i_physical_channels - = i_channels_conf & AOUT_CHAN_PHYSMASK; - p_sys->aout_format.i_bytes_per_frame = p_sys->i_frame_size; - p_sys->aout_format.i_frame_length = i_frame_length; - aout_DateInit( &p_sys->end_date, i_rate ); - aout_DateSet( &p_sys->end_date, p_sys->pts ); - p_sys->i_frames_in_buf = 3; - p_sys->p_aout_input = aout_DecNew( p_dec, - &p_sys->p_aout, - &p_sys->aout_format ); - - if ( p_sys->p_aout_input == NULL ) - { - *pp_buffer = NULL; - return VLC_SUCCESS; - } - } + return p_buf; +} - if( !aout_DateGet( &p_sys->end_date ) ) - { - /* We've just started the stream, wait for the first PTS. */ - *pp_buffer = NULL; - return VLC_SUCCESS; - } +/***************************************************************************** + * GetSoutBuffer: + *****************************************************************************/ +static block_t *GetSoutBuffer( decoder_t *p_dec ) +{ + decoder_sys_t *p_sys = p_dec->p_sys; + block_t *p_block; - if( p_sys->i_frames_in_buf == 3 ) - { - p_sys->i_frames_in_buf = 0; - *pp_buffer = aout_DecNewBuffer( p_sys->p_aout, p_sys->p_aout_input, - i_frame_length * 3 ); - if( *pp_buffer == NULL ) - { - return VLC_SUCCESS; - } + p_block = block_New( p_dec, p_sys->i_frame_size ); + if( p_block == NULL ) return NULL; - (*pp_buffer)->start_date = aout_DateGet( &p_sys->end_date ); - (*pp_buffer)->end_date = - aout_DateIncrement( &p_sys->end_date, i_frame_length * 3 ); - } + p_block->i_pts = p_block->i_dts = date_Get( &p_sys->end_date ); - p_sys->i_frames_in_buf++; + p_block->i_length = date_Increment( &p_sys->end_date, + p_sys->i_frame_length ) - p_block->i_pts; - return VLC_SUCCESS; + return p_block; } /***************************************************************************** - * GetSoutBuffer: + * SyncInfo: parse DTS sync info *****************************************************************************/ -static int GetSoutBuffer( decoder_t *p_dec, sout_buffer_t **pp_buffer ) +static const unsigned int ppi_dts_samplerate[] = { - int i_bit_rate; - unsigned int i_frame_length, i_rate, i_channels, i_channels_conf; + 0, 8000, 16000, 32000, 0, 0, 11025, 22050, 44100, 0, 0, + 12000, 24000, 48000, 96000, 192000 +}; - decoder_sys_t *p_sys = p_dec->p_sys; +static const unsigned int ppi_dts_bitrate[] = +{ + 32000, 56000, 64000, 96000, 112000, 128000, + 192000, 224000, 256000, 320000, 384000, + 448000, 512000, 576000, 640000, 768000, + 896000, 1024000, 1152000, 1280000, 1344000, + 1408000, 1411200, 1472000, 1536000, 1920000, + 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); - /* Check if frame is valid and get frame info */ - p_sys->i_frame_size = SyncInfo( p_sys->p_header, - &i_channels, &i_channels_conf, - &i_rate, &i_bit_rate, &i_frame_length ); + *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); - if( !p_sys->i_frame_size ) - { - msg_Warn( p_dec, "dts syncinfo failed" ); - *pp_buffer = NULL; - return VLC_SUCCESS; - } + i_lfe = (p_buf[10] >> 1) & 0x03; + if( i_lfe ) *pi_audio_mode |= 0x10000; - if( p_sys->p_sout_input != NULL && - ( p_sys->sout_format.i_sample_rate != (int)i_rate - || p_sys->sout_format.i_channels != (int)i_channels ) ) + 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++ ) { - /* Parameters changed - this should not happen. */ + p_out[i*2] = p_in[i*2+1]; + p_out[i*2+1] = p_in[i*2]; } +} - /* Creating the sout input if not created yet. */ - if( p_sys->p_sout_input == NULL ) - { - p_sys->sout_format.i_sample_rate = i_rate; - p_sys->sout_format.i_channels = i_channels; - p_sys->sout_format.i_block_align = 0; - p_sys->sout_format.i_bitrate = i_bit_rate; - p_sys->sout_format.i_extra_data = 0; - p_sys->sout_format.p_extra_data = NULL; +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; - aout_DateInit( &p_sys->end_date, i_rate ); - aout_DateSet( &p_sys->end_date, p_sys->pts ); + 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; + } - p_sys->p_sout_input = sout_InputNew( p_dec, - &p_sys->sout_format ); + 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( p_sys->p_sout_input == NULL ) + if( bits_out == 8 ) { - msg_Err( p_dec, "cannot add a new stream" ); - *pp_buffer = NULL; - return VLC_EGENERIC; + p_out[i_out] = cur; + cur = 0; + bits_out = 0; + i_out++; } - msg_Info( p_dec, "DTS channels:%d samplerate:%d bitrate:%d", - i_channels, i_rate, i_bit_rate ); + + bits_out += bits_in; + cur <<= bits_in; + cur |= tmp; } - if( !aout_DateGet( &p_sys->end_date ) ) + 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 ) { - /* We've just started the stream, wait for the first PTS. */ - *pp_buffer = NULL; return VLC_SUCCESS; } - - *pp_buffer = sout_BufferNew( p_sys->p_sout_input->p_sout, - p_sys->i_frame_size ); - if( *pp_buffer == NULL ) + /* 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; } - - (*pp_buffer)->i_pts = - (*pp_buffer)->i_dts = aout_DateGet( &p_sys->end_date ); - - (*pp_buffer)->i_length = - aout_DateIncrement( &p_sys->end_date, i_frame_length ) - - (*pp_buffer)->i_pts; - - return VLC_SUCCESS; -} - -/***************************************************************************** - * SendOutBuffer: - *****************************************************************************/ -static int SendOutBuffer( decoder_t *p_dec ) -{ - decoder_sys_t *p_sys = p_dec->p_sys; - - if( p_sys->b_packetizer ) + /* 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 ) { - sout_InputSendBuffer( p_sys->p_sout_input, p_sys->p_sout_buffer ); - p_sys->p_sout_buffer = NULL; + return VLC_SUCCESS; } - else if( p_sys->i_frames_in_buf == 3 ) + /* 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 ) { - /* We have all we need, send the buffer to the aout core. */ - aout_DecPlay( p_sys->p_aout, p_sys->p_aout_input, - p_sys->p_aout_buffer ); - p_sys->p_aout_buffer = NULL; + 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_SUCCESS; + return VLC_EGENERIC; } -/***************************************************************************** - * SyncInfo: parse DTS sync info - *****************************************************************************/ -static int SyncInfo( const byte_t * p_buf, - unsigned int * pi_channels, - unsigned int * pi_channels_conf, - unsigned int * pi_sample_rate, - unsigned int * pi_bit_rate, - unsigned int * pi_frame_length ) +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, + unsigned int *pi_bit_rate, + unsigned int *pi_frame_length ) { - unsigned int i_bit_rate; unsigned int i_audio_mode; - unsigned int i_sample_rate; unsigned int i_frame_size; - unsigned int i_frame_length; - static const unsigned int ppi_dts_samplerate[] = + /* 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 ) { - 0, 8000, 16000, 32000, 64000, 128000, - 11025, 22050, 44010, 88020, 176400, - 12000, 24000, 48000, 96000, 192000 - }; - - static const unsigned int ppi_dts_bitrate[] = + 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 ) { - 32000, 56000, 64000, 96000, 112000, 128000, - 192000, 224000, 256000, 320000, 384000, - 448000, 512000, 576000, 640000, 768000, - 896000, 1024000, 1152000, 1280000, 1344000, - 1408000, 1411200, 1472000, 1536000, 1920000, - 2048000, 3072000, 3840000, 4096000, 0, 0 - }; - - 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 ) { - return( 0 ); + 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 ); - i_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); + 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; + } - i_audio_mode = (p_buf[7] & 0x0f) << 2 | (p_buf[8] >> 6); - i_sample_rate = (p_buf[8] >> 2) & 0x0f; - i_bit_rate = (p_buf[8] & 0x03) << 3 | ((p_buf[9] >> 5) & 0x07); + *pb_dts_hd = false; - switch( i_audio_mode ) + 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; @@ -657,16 +697,16 @@ static int SyncInfo( const byte_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 */ @@ -712,32 +752,35 @@ static int SyncInfo( const byte_t * p_buf, { /* User defined */ *pi_channels = 0; - *pi_channels_conf = 0; - } - else - { - return( 0 ); + *pi_channels_conf = 0; } + else return 0; break; } - if( i_sample_rate >= sizeof( ppi_dts_samplerate ) / - sizeof( ppi_dts_samplerate[0] ) ) + if( i_audio_mode & 0x10000 ) { - return( 0 ); + (*pi_channels)++; + *pi_channels_conf |= AOUT_CHAN_LFE; } - *pi_sample_rate = ppi_dts_samplerate[ i_sample_rate ]; - - if( i_bit_rate >= sizeof( ppi_dts_bitrate ) / - sizeof( ppi_dts_bitrate[0] ) ) + if( *pi_sample_rate >= sizeof( ppi_dts_samplerate ) / + sizeof( ppi_dts_samplerate[0] ) ) { - return( 0 ); + return 0; } + *pi_sample_rate = ppi_dts_samplerate[ *pi_sample_rate ]; + if( !*pi_sample_rate ) return 0; - *pi_bit_rate = ppi_dts_bitrate[ i_bit_rate ]; + 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 = (i_frame_length + 1) * 32; + *pi_frame_length = (*pi_frame_length + 1) * 32; - return( i_frame_size + 1 ); + return i_frame_size; }