X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fdts.c;h=a2325546e615528892799e5501ac789f0af8688d;hb=27e306df96c937068816685406593e980a53a585;hp=163609d3422bae1ea0e9572df26d50f06a4e4622;hpb=fd7f8f854a13f7b65cb2b8622755aa47ee932919;p=vlc diff --git a/modules/codec/dts.c b/modules/codec/dts.c index 163609d342..a2325546e6 100644 --- a/modules/codec/dts.c +++ b/modules/codec/dts.c @@ -29,6 +29,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include #include #include @@ -73,7 +74,7 @@ struct decoder_sys_t /* * Common properties */ - audio_date_t end_date; + date_t end_date; mtime_t i_pts; @@ -108,7 +109,7 @@ static inline int SyncCode( const uint8_t * ); 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 * ); @@ -150,8 +151,9 @@ static int OpenCommon( vlc_object_t *p_this, bool b_packetizer ) /* Misc init */ 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(); @@ -177,7 +179,7 @@ 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; @@ -189,12 +191,12 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) p_sys->i_state = STATE_NOSYNC; 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 ); @@ -230,10 +232,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; @@ -276,6 +278,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 " @@ -317,11 +327,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; @@ -351,7 +362,7 @@ static void CloseCommon( 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; @@ -361,8 +372,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; @@ -407,11 +418,11 @@ static aout_buffer_t *GetAoutBuffer( decoder_t *p_dec ) 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; } @@ -427,9 +438,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; @@ -622,9 +633,11 @@ static int SyncInfo( const uint8_t *p_buf, pi_bit_rate, pi_frame_length ); } /* DTS-HD */ - else if( p_buf[0] == 0x64 && p_buf[1] == 0x58 && - p_buf[2] == 0x20 && p_buf[3] == 0x25 ) + 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 ); @@ -662,10 +675,12 @@ static int SyncInfo( const uint8_t *p_buf, { 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;