X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Frawdv.c;h=9b9611d85d70e89389d689f78c4bc3072b680ea9;hb=e276b6488d2c59d61549828aafe95221f0e76146;hp=1965dc1e7801ca96c2c00c8884e2f78277ea7b02;hpb=c366075e5b2e88e59ea84e64968d28cd94fb4030;p=vlc diff --git a/modules/demux/rawdv.c b/modules/demux/rawdv.c index 1965dc1e78..9b9611d85d 100644 --- a/modules/demux/rawdv.c +++ b/modules/demux/rawdv.c @@ -26,7 +26,12 @@ * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include /***************************************************************************** @@ -39,16 +44,16 @@ 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( "demux2", 3 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - add_bool( "rawdv-hurry-up", 0, NULL, HURRYUP_TEXT, HURRYUP_LONGTEXT, VLC_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 () /***************************************************************************** @@ -109,7 +114,7 @@ struct demux_sys_t /* program clock reference (in units of 90kHz) */ mtime_t i_pcr; - vlc_bool_t b_hurry_up; + bool b_hurry_up; }; /***************************************************************************** @@ -129,7 +134,7 @@ static int Open( vlc_object_t * p_this ) 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; @@ -141,7 +146,7 @@ static int Open( vlc_object_t * p_this ) * it is possible to force this demux. */ /* Check for DV file extension */ - if( !demux2_IsPathExtension( p_demux, ".dv" ) && !p_demux->b_force ) + if( !demux_IsPathExtension( p_demux, ".dv" ) && !p_demux->b_force ) return VLC_EGENERIC; if( stream_Peek( p_demux->s, &p_peek, DV_PAL_FRAME_SIZE ) < @@ -211,13 +216,13 @@ static int Open( vlc_object_t * p_this ) 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;; @@ -234,9 +239,10 @@ static int Open( vlc_object_t * p_this ) 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 ) { @@ -252,9 +258,6 @@ static int Open( vlc_object_t * p_this ) 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 ); } @@ -282,7 +285,7 @@ static int Demux( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; block_t *p_block; - vlc_bool_t b_audio = VLC_FALSE; + bool b_audio = false; if( p_sys->b_hurry_up ) { @@ -291,7 +294,7 @@ static int Demux( demux_t *p_demux ) } /* 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 ) { @@ -306,7 +309,7 @@ static int Demux( demux_t *p_demux ) } 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 ) { @@ -314,7 +317,7 @@ static int Demux( demux_t *p_demux ) 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 ); } } @@ -323,7 +326,7 @@ static int Demux( demux_t *p_demux ) 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; @@ -337,7 +340,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) demux_sys_t *p_sys = p_demux->p_sys; /* XXX: DEMUX_SET_TIME is precise here */ - return demux2_vaControlHelper( p_demux->s, + return demux_vaControlHelper( p_demux->s, 0, -1, p_sys->frame_size * p_sys->f_rate * 8, p_sys->frame_size, i_query, args );