es_out_id_t *p_video_es;
es_out_id_t *p_audio_es;
bool b_first_frame;
+ int i_last_pts;
int i_width, i_height, i_fps_num, i_fps_den;
uint32_t i_dominance_flags;
if( result != S_OK )
{
msg_Err( p_demux, "Could not get model name" );
+ free( psz_model_name );
Close( p_this );
return VLC_EGENERIC;
}
msg_Dbg( p_demux, "Opened DeckLink PCI card %d (%s)", i_card_index, psz_model_name );
+ free( psz_model_name );
if( p_sys->p_card->QueryInterface( IID_IDeckLinkInput, (void**)&p_sys->p_input) != S_OK )
{
{
msg_Err( p_demux, "Invalid --sdi-audio-connection specified; choose one of " \
"embedded, aesebu, or analog." );
+ p_config->Release();
Close( p_this );
return VLC_EGENERIC;
}
if( result != S_OK )
{
msg_Err( p_demux, "Failed to get display mode name" );
+ free( psz_mode_name );
p_display_iterator->Release();
Close( p_this );
return VLC_EGENERIC;
if( result != S_OK )
{
msg_Err( p_demux, "Failed to get frame rate" );
+ free( psz_mode_name );
p_display_iterator->Release();
Close( p_this );
return VLC_EGENERIC;
sz_mode_id_text, psz_mode_name,
p_display_mode->GetWidth(), p_display_mode->GetHeight(),
double(time_scale) / frame_duration, psz_field_dominance );
+ free( psz_mode_name );
if( wanted_mode_id == mode_id )
{
static int Control( demux_t *p_demux, int i_query, va_list args )
{
+ demux_sys_t *p_sys = p_demux->p_sys;
bool *pb;
int64_t *pi64;
case DEMUX_GET_TIME:
pi64 = (int64_t*)va_arg( args, int64_t * );
- *pi64 = mdate(); /* FIXME */
+ *pi64 = p_sys->i_last_pts;
return VLC_SUCCESS;
/* TODO implement others */
if( p_video_block )
{
+ if( p_video_block->i_pts > p_sys->i_last_pts )
+ p_sys->i_last_pts = p_video_block->i_pts;
es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_video_block->i_pts );
es_out_Send( p_demux->out, p_sys->p_video_es, p_video_block );
}
if( p_audio_block )
{
+ if( p_audio_block->i_pts > p_sys->i_last_pts )
+ p_sys->i_last_pts = p_audio_block->i_pts;
es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_audio_block->i_pts );
es_out_Send( p_demux->out, p_sys->p_audio_es, p_audio_block );
}