/*****************************************************************************
* dts.c : raw DTS stream input module for vlc
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: dts.c,v 1.12 2004/03/03 20:39:51 gbazin Exp $
+ * Copyright (C) 2001-2007 the VideoLAN team
+ * $Id$
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
*
* 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
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_plugin.h>
+#include <vlc_demux.h>
#include <vlc_codec.h>
/*****************************************************************************
static void Close ( vlc_object_t * );
vlc_module_begin();
- set_description( _("Raw DTS demuxer") );
- set_capability( "demux2", 155 );
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_DEMUX );
+ 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 */
int i_mux_rate;
};
-static int CheckSync( uint8_t *p_peek );
+static int CheckSync( const uint8_t *p_peek );
#define DTS_PACKET_SIZE 16384
#define DTS_PROBE_SIZE (DTS_PACKET_SIZE * 4)
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
- 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 &&
- !strncmp( p_peek, "RIFF", 4 ) && !strncmp( &p_peek[8], "WAVE", 4 ) )
+ !memcmp( p_peek, "RIFF", 4 ) && !memcmp( &p_peek[8], "WAVE", 4 ) )
{
int i_size;
/* Find the wave format header */
i_peek = 20;
- while( strncmp( p_peek + i_peek - 8, "fmt ", 4 ) )
+ 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;
return VLC_EGENERIC;
/* Skip the wave header */
- while( strncmp( p_peek + i_peek - 8, "data", 4 ) )
+ 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;
}
/* Have a peep at the show. */
- if( stream_Peek( p_demux->s, &p_peek, i_peek + DTS_MAX_HEADER_SIZE * 2 ) <
- i_peek + DTS_MAX_HEADER_SIZE * 2 )
- {
- /* Stream too short */
- msg_Warn( p_demux, "cannot peek()" );
- return VLC_EGENERIC;
- }
+ CHECK_PEEK( p_peek, i_peek + DTS_MAX_HEADER_SIZE * 2 );
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" );
}
- p_demux->pf_demux = Demux;
- p_demux->pf_control = Control;
- p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
- p_sys->b_start = VLC_TRUE;
- p_sys->i_mux_rate = 0;
-
- /*
- * Load the DTS packetizer
- */
- p_sys->p_packetizer = vlc_object_create( p_demux, VLC_OBJECT_DECODER );
- p_sys->p_packetizer->pf_decode_audio = 0;
- p_sys->p_packetizer->pf_decode_video = 0;
- p_sys->p_packetizer->pf_decode_sub = 0;
- p_sys->p_packetizer->pf_packetize = 0;
-
- /* Initialization of decoder structure */
- es_format_Init( &p_sys->p_packetizer->fmt_in, AUDIO_ES,
- VLC_FOURCC( 'd', 't', 's', ' ' ) );
-
- p_sys->p_packetizer->p_module =
- module_Need( p_sys->p_packetizer, "packetizer", NULL, 0 );
- if( !p_sys->p_packetizer->p_module )
- {
- msg_Err( p_demux, "cannot find DTS packetizer" );
- return VLC_EGENERIC;
- }
+ 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" );
p_sys->p_es = es_out_Add( p_demux->out, &p_sys->p_packetizer->fmt_in );
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
- /* Unneed module */
- module_Unneed( p_sys->p_packetizer, p_sys->p_packetizer->p_module );
-
- /* Delete the decoder */
- vlc_object_destroy( p_sys->p_packetizer );
+ DESTROY_PACKETIZER( p_sys->p_packetizer );
free( p_sys );
}
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 */
static int Control( demux_t *p_demux, int i_query, va_list args )
{
demux_sys_t *p_sys = p_demux->p_sys;
- return demux2_vaControlHelper( p_demux->s,
- 0, -1,
- 8*p_sys->i_mux_rate, 1, i_query, args );
+ if( i_query == DEMUX_SET_TIME )
+ return VLC_EGENERIC;
+ else
+ return demux_vaControlHelper( p_demux->s,
+ 0, -1,
+ 8*p_sys->i_mux_rate, 1, i_query, args );
}
/*****************************************************************************
* CheckSync: Check if buffer starts with a DTS sync code
*****************************************************************************/
-static int CheckSync( uint8_t *p_peek )
+static int CheckSync( const uint8_t *p_peek )
{
/* 14 bits, little endian version of the bitstream */
if( p_peek[0] == 0xff && p_peek[1] == 0x1f &&