# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_demux.h>
/*****************************************************************************
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
-vlc_module_begin();
- set_shortname( "DV" );
- set_description( _("DV (Digital Video) demuxer") );
- set_capability( "demux", 3 );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_DEMUX );
- add_bool( "rawdv-hurry-up", 0, NULL, HURRYUP_TEXT, HURRYUP_LONGTEXT, false );
- set_callbacks( Open, Close );
- add_shortcut( "rawdv" );
-vlc_module_end();
+vlc_module_begin ()
+ set_shortname( "DV" )
+ set_description( N_("DV (Digital Video) demuxer") )
+ set_capability( "demux", 3 )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_DEMUX )
+ add_bool( "rawdv-hurry-up", false, NULL, HURRYUP_TEXT, HURRYUP_LONGTEXT, false )
+ set_callbacks( Open, Close )
+ add_shortcut( "rawdv" )
+vlc_module_end ()
/*****************************************************************************
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
- const byte_t *p_peek, *p_peek_backup;
+ const uint8_t *p_peek, *p_peek_backup;
uint32_t i_dword;
dv_header_t dv_header;
p_sys->frame_size = dv_header.dsf ? 12 * 150 * 80 : 10 * 150 * 80;
p_sys->f_rate = dv_header.dsf ? 25 : 29.97;
- p_sys->i_pcr = 1;
+ p_sys->i_pcr = 0;
p_sys->p_es_video = NULL;
p_sys->p_es_audio = NULL;
p_sys->i_bitrate = 0;
- es_format_Init( &p_sys->fmt_video, VIDEO_ES, VLC_FOURCC('d','v','s','d') );
+ es_format_Init( &p_sys->fmt_video, VIDEO_ES, VLC_CODEC_DV );
p_sys->fmt_video.video.i_width = 720;
p_sys->fmt_video.video.i_height= dv_header.dsf ? 576 : 480;;
p_peek = p_peek_backup + 80*6+80*16*3 + 3; /* beginning of AAUX pack */
if( *p_peek == 0x50 )
{
- es_format_Init( &p_sys->fmt_audio, AUDIO_ES,
- VLC_FOURCC('a','r','a','w') );
+ /* 12 bits non-linear will be converted to 16 bits linear */
+ es_format_Init( &p_sys->fmt_audio, AUDIO_ES, VLC_CODEC_S16L );
+ p_sys->fmt_audio.audio.i_bitspersample = 16;
p_sys->fmt_audio.audio.i_channels = 2;
switch( (p_peek[4] >> 3) & 0x07 )
{
break;
}
- /* 12 bits non-linear will be converted to 16 bits linear */
- p_sys->fmt_audio.audio.i_bitspersample = 16;
-
p_sys->p_es_audio = es_out_Add( p_demux->out, &p_sys->fmt_audio );
}
}
/* Call the pace control */
- es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pcr );
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_sys->i_pcr );
p_block = stream_Block( p_demux->s, p_sys->frame_size );
if( p_block == NULL )
{
}
p_block->i_dts =
- p_block->i_pts = p_sys->i_pcr;
+ p_block->i_pts = VLC_TS_0 + p_sys->i_pcr;
if( b_audio )
{
if( p_audio_block )
{
p_audio_block->i_pts =
- p_audio_block->i_dts = p_sys->i_pcr;
+ p_audio_block->i_dts = VLC_TS_0 + p_sys->i_pcr;
es_out_Send( p_demux->out, p_sys->p_es_audio, p_audio_block );
}
}
if( !p_sys->b_hurry_up )
{
- p_sys->i_pcr += ( I64C(1000000) / p_sys->f_rate );
+ p_sys->i_pcr += ( INT64_C(1000000) / p_sys->f_rate );
}
return 1;