* 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"
+#include <vlc_codec.h>
/*****************************************************************************
* Module descriptor
#define FPS_TEXT N_("Frames per Second")
#define FPS_LONGTEXT N_("Desired frame rate for the VC-1 stream.")
-vlc_module_begin();
- set_shortname( "VC-1");
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_DEMUX );
- set_description( _("VC1 video demuxer" ) );
- set_capability( "demux2", 0 );
- add_float( "vc1-fps", 25.0, NULL, FPS_TEXT, FPS_LONGTEXT, VLC_TRUE );
- set_callbacks( Open, Close );
- add_shortcut( "vc1" );
-vlc_module_end();
+vlc_module_begin ()
+ set_shortname( "VC-1")
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_DEMUX )
+ set_description( N_("VC1 video demuxer" ) )
+ set_capability( "demux", 0 )
+ add_float( "vc1-fps", 25.0, NULL, FPS_TEXT, FPS_LONGTEXT, true )
+ set_callbacks( Open, Close )
+ add_shortcut( "vc1" )
+vlc_module_end ()
/*****************************************************************************
* Local prototypes
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
const uint8_t *p_peek;
- vlc_value_t val;
+ es_format_t fmt;
- if( stream_Peek( p_demux->s, &p_peek, 5 ) < 5 ) return VLC_EGENERIC;
+ if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
if( p_peek[0] != 0x00 || p_peek[1] != 0x00 ||
- p_peek[2] != 0x00 || p_peek[3] != 0x01 ||
- p_peek[4] != 0x0f ) /* Sequence header */
+ p_peek[2] != 0x01 || p_peek[3] != 0x0f ) /* Sequence header */
{
if( !p_demux->b_force )
{
p_demux->pf_control= Control;
p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
p_sys->p_es = NULL;
- p_sys->i_dts = 1;
+ p_sys->i_dts = 0;
p_sys->f_fps = var_CreateGetFloat( p_demux, "vc1-fps" );
- if( val.f_float < 0.001 ) p_sys->f_fps = 0.0;
+ if( p_sys->f_fps < 0.001 )
+ p_sys->f_fps = 0.0;
/* Load the packetizer */
- INIT_VPACKETIZER( p_sys->p_packetizer, 'W', 'V', 'C', '1' );
- es_format_Init( &p_sys->p_packetizer->fmt_out, UNKNOWN_ES, 0 );
- LOAD_PACKETIZER_OR_FAIL( p_sys->p_packetizer, "VC-1" );
-
+ es_format_Init( &fmt, VIDEO_ES, VLC_CODEC_VC1 );
+ p_sys->p_packetizer = demux_PacketizerNew( p_demux, &fmt, "VC-1" );
+ if( !p_sys->p_packetizer )
+ {
+ free( p_sys );
+ return VLC_EGENERIC;
+ }
return VLC_SUCCESS;
}
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
- DESTROY_PACKETIZER( p_sys->p_packetizer );
-
+ demux_PacketizerDestroy( p_sys->p_packetizer );
free( p_sys );
}
return 0;
/* */
- p_block_in->i_dts = 1;
- p_block_in->i_pts = 1;
+ p_block_in->i_dts = VLC_TS_0;
+ p_block_in->i_pts = VLC_TS_0;
while( (p_block_out = p_sys->p_packetizer->pf_packetize( p_sys->p_packetizer, &p_block_in )) )
{
if( p_sys->p_es == NULL )
{
- p_sys->p_packetizer->fmt_out.b_packetized = VLC_TRUE;
+ p_sys->p_packetizer->fmt_out.b_packetized = true;
p_sys->p_es = es_out_Add( p_demux->out, &p_sys->p_packetizer->fmt_out);
}
- es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_dts );
- p_block_out->i_dts = p_sys->i_dts;
- p_block_out->i_pts = p_sys->i_dts;
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_sys->i_dts );
+ p_block_out->i_dts = VLC_TS_0 + p_sys->i_dts;
+ p_block_out->i_pts = VLC_TS_0 + p_sys->i_dts;
es_out_Send( p_demux->out, p_sys->p_es, p_block_out );
if( p_sys->p_packetizer->fmt_out.video.i_frame_rate > 0 &&
p_sys->p_packetizer->fmt_out.video.i_frame_rate_base > 0 )
- p_sys->i_dts += I64C(1000000) *
+ p_sys->i_dts += INT64_C(1000000) *
p_sys->p_packetizer->fmt_out.video.i_frame_rate_base /
p_sys->p_packetizer->fmt_out.video.i_frame_rate;
else if( p_sys->f_fps > 0.001 )
p_sys->i_dts += (int64_t)((double)1000000.0 / p_sys->f_fps);
else
- p_sys->i_dts += I64C(1000000) / 25;
+ p_sys->i_dts += INT64_C(1000000) / 25;
}
}
return 1;
if( i_query == DEMUX_SET_TIME )
return VLC_EGENERIC;
else
- return demux2_vaControlHelper( p_demux->s,
+ return demux_vaControlHelper( p_demux->s,
0, -1,
0, 1, i_query, args );
}