/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_demux.h>
#include <vlc_codec.h>
vlc_module_begin();
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_DEMUX );
- set_description( _("Raw DTS demuxer") );
- set_capability( "demux2", 155 );
+ set_description( N_("Raw DTS demuxer") );
+ set_capability( "demux", 155 );
set_callbacks( Open, Close );
add_shortcut( "dts" );
vlc_module_end();
struct demux_sys_t
{
- vlc_bool_t b_start;
+ bool b_start;
es_out_id_t *p_es;
/* Packetizer */
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
- const byte_t *p_peek;
+ const uint8_t *p_peek;
int i_peek = 0;
/* Check if we are dealing with a WAV file */
if( stream_Peek( p_demux->s, &p_peek, 20 ) == 20 &&
!memcmp( p_peek, "RIFF", 4 ) && !memcmp( &p_peek[8], "WAVE", 4 ) )
{
- int i_size;
-
/* Find the wave format header */
- i_peek = 20;
+ i_peek = 12 + 8;
while( memcmp( p_peek + i_peek - 8, "fmt ", 4 ) )
{
- i_size = GetDWLE( p_peek + i_peek - 4 );
- if( i_size + i_peek > DTS_PROBE_SIZE ) return VLC_EGENERIC;
- i_peek += i_size + 8;
+ uint32_t i_len = GetDWLE( p_peek + i_peek - 4 );
+ if( i_len > DTS_PROBE_SIZE || i_peek + i_len > DTS_PROBE_SIZE )
+ return VLC_EGENERIC;
+ i_peek += i_len + 8;
if( stream_Peek( p_demux->s, &p_peek, i_peek ) != i_peek )
return VLC_EGENERIC;
}
/* Sanity check the wave format header */
- i_size = GetDWLE( p_peek + i_peek - 4 );
- if( i_size + i_peek > DTS_PROBE_SIZE ) return VLC_EGENERIC;
- i_peek += i_size + 8;
+ uint32_t i_len = GetDWLE( p_peek + i_peek - 4 );
+ if( i_len > DTS_PROBE_SIZE )
+ return VLC_EGENERIC;
+
+ i_peek += i_len + 8;
if( stream_Peek( p_demux->s, &p_peek, i_peek ) != i_peek )
return VLC_EGENERIC;
- if( GetWLE( p_peek + i_peek - i_size - 8 /* wFormatTag */ ) !=
+ if( GetWLE( p_peek + i_peek - i_len - 8 /* wFormatTag */ ) !=
1 /* WAVE_FORMAT_PCM */ )
return VLC_EGENERIC;
- if( GetWLE( p_peek + i_peek - i_size - 6 /* nChannels */ ) != 2 )
+ if( GetWLE( p_peek + i_peek - i_len - 6 /* nChannels */ ) != 2 )
return VLC_EGENERIC;
- if( GetDWLE( p_peek + i_peek - i_size - 4 /* nSamplesPerSec */ ) !=
+ if( GetDWLE( p_peek + i_peek - i_len - 4 /* nSamplesPerSec */ ) !=
44100 )
return VLC_EGENERIC;
/* Skip the wave header */
while( memcmp( p_peek + i_peek - 8, "data", 4 ) )
{
- i_size = GetDWLE( p_peek + i_peek - 4 );
- if( i_size + i_peek > DTS_PROBE_SIZE ) return VLC_EGENERIC;
- i_peek += i_size + 8;
+ uint32_t i_len = GetDWLE( p_peek + i_peek - 4 );
+ if( i_len > DTS_PROBE_SIZE || i_peek + i_len > DTS_PROBE_SIZE )
+ return VLC_EGENERIC;
+ i_peek += i_len + 8;
if( stream_Peek( p_demux->s, &p_peek, i_peek ) != i_peek )
return VLC_EGENERIC;
}
/* Some DTS wav files don't begin with a sync code so we do a more
* extensive search */
- i_size = stream_Peek( p_demux->s, &p_peek, DTS_PROBE_SIZE );
+ int i_size = stream_Peek( p_demux->s, &p_peek, DTS_PROBE_SIZE );
i_size -= DTS_MAX_HEADER_SIZE;
while( i_peek < i_size )
if( CheckSync( p_peek + i_peek ) != VLC_SUCCESS )
{
- if( strncmp( p_demux->psz_demux, "dts", 3 ) )
- {
+ if( !p_demux->b_force )
return VLC_EGENERIC;
- }
+
/* User forced */
msg_Err( p_demux, "this doesn't look like a DTS audio stream, "
"continuing anyway" );
}
- STANDARD_DEMUX_INIT; p_sys = p_demux->p_sys;
-
+ DEMUX_INIT_COMMON(); p_sys = p_demux->p_sys;
+
INIT_APACKETIZER( p_sys->p_packetizer, 'd','t','s',' ' );
LOAD_PACKETIZER_OR_FAIL( p_sys->p_packetizer, "DTS" );
while( (p_block_out = p_sys->p_packetizer->pf_packetize(
p_sys->p_packetizer, &p_block_in )) )
{
- p_sys->b_start = VLC_FALSE;
+ p_sys->b_start = false;
while( p_block_out )
{
if( p_block_out->i_length )
{
p_sys->i_mux_rate =
- p_block_out->i_buffer * I64C(1000000) / p_block_out->i_length;
+ p_block_out->i_buffer * INT64_C(1000000) / p_block_out->i_length;
}
/* set PCR */
if( i_query == DEMUX_SET_TIME )
return VLC_EGENERIC;
else
- return demux2_vaControlHelper( p_demux->s,
+ return demux_vaControlHelper( p_demux->s,
0, -1,
8*p_sys->i_mux_rate, 1, i_query, args );
}