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;
int i_card_index = var_CreateGetInteger( p_demux, "sdi-card-index" );
for( int i = 0; i <= i_card_index; ++i )
{
+ if( p_sys->p_card )
+ p_sys->p_card->Release();
result = decklink_iterator->Next( &p_sys->p_card );
if( result != S_OK )
break;
{
msg_Err( p_demux, "Invalid --sdi-audio-connection specified; choose one of " \
"embedded, aesebu, or analog." );
+ free( psz_tmp );
+ p_config->Release();
Close( p_this );
return VLC_EGENERIC;
}
char *psz_display_mode = var_CreateGetString( p_demux, "sdi-mode" );
if( !psz_display_mode || strlen( psz_display_mode ) == 0 || strlen( psz_display_mode ) > 4 ) {
msg_Err( p_demux, "Missing or invalid --sdi-mode string" );
+ free( psz_display_mode );
p_display_iterator->Release();
Close( p_this );
return VLC_EGENERIC;
strcpy(sz_display_mode_padded, " ");
for( int i = 0; i < strlen( psz_display_mode ); ++i )
sz_display_mode_padded[i] = psz_display_mode[i];
+
+ free( psz_display_mode );
BMDDisplayMode wanted_mode_id;
memcpy( &wanted_mode_id, &sz_display_mode_padded, sizeof(wanted_mode_id) );
IDeckLinkDisplayMode *p_display_mode;
result = p_display_iterator->Next( &p_display_mode );
if( result != S_OK || !p_display_mode )
- {
break;
- }
char sz_mode_id_text[5] = {0};
BMDDisplayMode mode_id = ntohl( p_display_mode->GetDisplayMode() );
if( result != S_OK )
{
msg_Err( p_demux, "Failed to get display mode name" );
+ p_display_mode->Release();
p_display_iterator->Release();
Close( p_this );
return VLC_EGENERIC;
if( result != S_OK )
{
msg_Err( p_demux, "Failed to get frame rate" );
+ p_display_mode->Release();
p_display_iterator->Release();
Close( p_this );
return VLC_EGENERIC;
p_sys->i_fps_den = frame_duration;
p_sys->i_dominance_flags = i_dominance_flags;
}
+
+ p_display_mode->Release();
}
p_display_iterator->Release();
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 );
}