scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 06:40:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Decklink: use DisplayVideoFrameSync instead of scheduling"

Browse Source 
This reverts commit 1a12b06bcb.
This commit is contained in:
Martin Pulec
2012-05-12 15:24:49 +02:00
parent 99acb14aa7
commit 014202e81f
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ultragrid/src/video_display/decklink.cpp
View File

@@ -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<DeckLink3DFrame *>(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();
}