set_callbacks( Open, Close )
vlc_module_end ()
-static int Demux ( demux_t * );
static int Control( demux_t *, int, va_list );
class DeckLinkCaptureDelegate;
es_out_id_t *p_video_es;
es_out_id_t *p_audio_es;
- bool b_first_frame;
- int i_last_pts;
+
+ vlc_mutex_t pts_lock;
+ int i_last_pts; /* protected by <pts_lock> */
uint32_t i_dominance_flags;
int i_channels;
-
- vlc_mutex_t frame_lock;
- block_t *p_video_frame; /* protected by <frame_lock> */
- block_t *p_audio_frame; /* protected by <frame_lock> */
- vlc_cond_t has_frame; /* related to <frame_lock> */
};
class DeckLinkCaptureDelegate : public IDeckLinkInputCallback
videoFrame->GetStreamTime( &stream_time, &frame_duration, CLOCK_FREQ );
p_video_frame->i_flags = BLOCK_FLAG_TYPE_I | p_sys->i_dominance_flags;
p_video_frame->i_pts = p_video_frame->i_dts = VLC_TS_0 + stream_time;
+
+ vlc_mutex_lock( &p_sys->pts_lock );
+ if( p_video_frame->i_pts > p_sys->i_last_pts )
+ p_sys->i_last_pts = p_video_frame->i_pts;
+ vlc_mutex_unlock( &p_sys->pts_lock );
+
+ es_out_Control( p_demux_->out, ES_OUT_SET_PCR, p_video_frame->i_pts );
+ es_out_Send( p_demux_->out, p_sys->p_video_es, p_video_frame );
}
if( audioFrame )
BMDTimeValue packet_time;
audioFrame->GetPacketTime( &packet_time, CLOCK_FREQ );
p_audio_frame->i_pts = p_audio_frame->i_dts = VLC_TS_0 + packet_time;
- }
-
- if( p_video_frame || p_audio_frame )
- {
- vlc_mutex_lock( &p_sys->frame_lock );
- if( p_video_frame )
- {
- if( p_sys->p_video_frame )
- block_Release( p_sys->p_video_frame );
- p_sys->p_video_frame = p_video_frame;
- }
- if( p_audio_frame )
- {
- if( p_sys->p_audio_frame )
- block_Release( p_sys->p_audio_frame );
- p_sys->p_audio_frame = p_audio_frame;
- }
- vlc_cond_signal( &p_sys->has_frame );
- vlc_mutex_unlock( &p_sys->frame_lock );
+
+ vlc_mutex_lock( &p_sys->pts_lock );
+ if( p_audio_frame->i_pts > p_sys->i_last_pts )
+ p_sys->i_last_pts = p_audio_frame->i_pts;
+ vlc_mutex_unlock( &p_sys->pts_lock );
+ if( p_audio_frame->i_pts > p_sys->i_last_pts )
+
+ es_out_Control( p_demux_->out, ES_OUT_SET_PCR, p_audio_frame->i_pts );
+ es_out_Send( p_demux_->out, p_sys->p_audio_es, p_audio_frame );
}
return S_OK;
return VLC_EGENERIC;
/* Set up p_demux */
- p_demux->pf_demux = Demux;
+ p_demux->pf_demux = NULL;
p_demux->pf_control = Control;
p_demux->info.i_update = 0;
p_demux->info.i_title = 0;
if( !p_sys )
return VLC_ENOMEM;
- vlc_mutex_init( &p_sys->frame_lock );
- vlc_cond_init( &p_sys->has_frame );
- p_sys->b_first_frame = true;
+ vlc_mutex_init( &p_sys->pts_lock );
IDeckLinkIterator *decklink_iterator = CreateDeckLinkIteratorInstance();
if( !decklink_iterator )
goto finish;
}
- psz_video_connection = var_CreateGetNonEmptyString( p_demux, "decklink-video-connection" );
+ psz_video_connection = var_InheritString( p_demux, "decklink-video-connection" );
if( psz_video_connection )
{
BMDVideoConnection conn;
if( p_sys->p_delegate )
p_sys->p_delegate->Release();
- if( p_sys->p_video_frame )
- block_Release( p_sys->p_video_frame );
-
- if( p_sys->p_audio_frame )
- block_Release( p_sys->p_audio_frame );
-
free( p_sys );
}
case DEMUX_GET_TIME:
pi64 = (int64_t*)va_arg( args, int64_t * );
+ vlc_mutex_lock( &p_sys->pts_lock );
*pi64 = p_sys->i_last_pts;
+ vlc_mutex_unlock( &p_sys->pts_lock );
return VLC_SUCCESS;
- /* TODO implement others */
default:
return VLC_EGENERIC;
}
return VLC_EGENERIC;
}
-
-static int Demux( demux_t *p_demux )
-{
- demux_sys_t *p_sys = p_demux->p_sys;
- block_t *p_video_block = NULL;
- block_t *p_audio_block = NULL;
-
- vlc_mutex_lock( &p_sys->frame_lock );
-
- while( !p_sys->p_video_frame && !p_sys->p_audio_frame )
- vlc_cond_wait( &p_sys->has_frame, &p_sys->frame_lock );
-
- p_video_block = p_sys->p_video_frame;
- p_sys->p_video_frame = NULL;
-
- p_audio_block = p_sys->p_audio_frame;
- p_sys->p_audio_frame = NULL;
-
- vlc_mutex_unlock( &p_sys->frame_lock );
-
- 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 );
- }
-
- return 1;
-}
-