#include <vlc_plugin.h>
#include <vlc_demux.h>
-#include <vlc_codecs.h>
-
/*****************************************************************************
* Module descriptor
*****************************************************************************/
set_subcategory( SUBCAT_INPUT_DEMUX )
set_capability( "demux", 3 )
set_callbacks( Open, Close )
- add_shortcut( "cdg" )
- add_shortcut( "subtitle" )
+ add_shortcut( "cdg", "subtitle" )
vlc_module_end ()
/*****************************************************************************
p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
/* */
- es_format_Init( &p_sys->fmt, VIDEO_ES, VLC_FOURCC('C','D','G', ' ' ) );
+ es_format_Init( &p_sys->fmt, VIDEO_ES, VLC_CODEC_CDG );
p_sys->fmt.video.i_width = 300-2*6;
p_sys->fmt.video.i_height = 216-2*12 ;
/* There is CDG_FRAME_RATE frames per second */
date_Init( &p_sys->pts, CDG_FRAME_RATE, 1 );
- date_Set( &p_sys->pts, 1 );
+ date_Set( &p_sys->pts, 0 );
return VLC_SUCCESS;
}
}
p_block->i_dts =
- p_block->i_pts = date_Increment( &p_sys->pts, 1 );
+ p_block->i_pts = VLC_TS_0 + date_Get( &p_sys->pts );
es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block->i_pts );
es_out_Send( p_demux->out, p_sys->p_es, p_block );
+
+ date_Increment( &p_sys->pts, 1 );
+
return 1;
}
*****************************************************************************/
static int Control( demux_t *p_demux, int i_query, va_list args )
{
- switch( i_query )
- {
- default:
- return demux_vaControlHelper( p_demux->s, 0, -1,
- 8*CDG_FRAME_SIZE*CDG_FRAME_RATE, CDG_FRAME_SIZE, i_query, args );
- }
+ int i_ret = demux_vaControlHelper( p_demux->s, 0, -1,
+ 8*CDG_FRAME_SIZE*CDG_FRAME_RATE, CDG_FRAME_SIZE,
+ i_query, args );
+ if( !i_ret && ( i_query == DEMUX_SET_POSITION || i_query == DEMUX_SET_TIME ) )
+ date_Set( &p_demux->p_sys->pts,
+ stream_Tell( p_demux->s ) / CDG_FRAME_SIZE *
+ INT64_C(1000000) / CDG_FRAME_RATE );
+
+ return i_ret;
}