From 014202e81f8eb97d040b18fd9f2e2e4166236a38 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Sat, 12 May 2012 15:24:49 +0200 Subject: [PATCH] Revert "Decklink: use DisplayVideoFrameSync instead of scheduling" This reverts commit 1a12b06bcbc913febc091e417e6e46d7bd139c58. --- ultragrid/src/video_display/decklink.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ultragrid/src/video_display/decklink.cpp b/ultragrid/src/video_display/decklink.cpp index d55edefdd..3c33b4393 100644 --- a/ultragrid/src/video_display/decklink.cpp +++ b/ultragrid/src/video_display/decklink.cpp @@ -381,9 +381,8 @@ int display_decklink_putf(void *state, char *frame) if(s->emit_timecode) { s->state[j].deckLinkFrame->SetTimecode(bmdVideoOutputRP188, s->timecode); } - s->state[j].deckLinkOutput->DisplayVideoFrameSync(s->state[j].deckLinkFrame); - /*s->state[j].deckLinkOutput->ScheduleVideoFrame(s->state[j].deckLinkFrame, - s->frames * s->frameRateDuration, s->frameRateDuration, s->frameRateScale);*/ + s->state[j].deckLinkOutput->ScheduleVideoFrame(s->state[j].deckLinkFrame, + s->frames * s->frameRateDuration, s->frameRateDuration, s->frameRateScale); } s->frames++; if(s->emit_timecode) { @@ -522,7 +521,7 @@ display_decklink_reconfigure(void *state, struct video_desc desc) dynamic_cast(s->state[0].deckLinkFrame)->GetFrameForRightEye(&right); right->GetBytes((void **) &s->frame->tiles[1].data); - //s->state[0].deckLinkOutput->StartScheduledPlayback(0, s->frameRateScale, (double) s->frameRateDuration); + s->state[0].deckLinkOutput->StartScheduledPlayback(0, s->frameRateScale, (double) s->frameRateDuration); } else { if(desc.tile_count > s->devices_cnt) { fprintf(stderr, "[decklink] Expected at most %d streams. Got %d.\n", s->devices_cnt, @@ -577,7 +576,7 @@ display_decklink_reconfigure(void *state, struct video_desc desc) } for(int i = 0; i < s->devices_cnt; ++i) { - //s->state[i].deckLinkOutput->StartScheduledPlayback(0, s->frameRateScale, (double) s->frameRateDuration); + s->state[i].deckLinkOutput->StartScheduledPlayback(0, s->frameRateScale, (double) s->frameRateDuration); } } @@ -835,7 +834,7 @@ void *display_decklink_init(char *fmt, unsigned int flags) s->state[i].delegate = new PlaybackDelegate(s, i); // Provide this class as a delegate to the audio and video output interfaces - //s->state[i].deckLinkOutput->SetScheduledFrameCompletionCallback(s->state[i].delegate); + s->state[i].deckLinkOutput->SetScheduledFrameCompletionCallback(s->state[i].delegate); //s->state[i].deckLinkOutput->DisableAudioOutput(); }