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

DeckLink display - do no report device index

Browse Source 
* it was actually subdevice index which was a bit confusing
This commit is contained in:
Martin Pulec
2012-07-23 17:50:21 +02:00
parent 603265dcb9
commit b4e64c1d9d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/video_display/decklink.cpp
View File

@@ -449,7 +449,7 @@ int display_decklink_putf(void *state, char *frame)
}
static BMDDisplayMode get_mode(IDeckLinkOutput *deckLinkOutput, struct video_desc desc, BMDTimeValue *frameRateDuration,
BMDTimeScale *frameRateScale, int index)
BMDTimeScale *frameRateScale)
{ IDeckLinkDisplayModeIterator *displayModeIterator;
IDeckLinkDisplayMode* deckLinkDisplayMode;
BMDDisplayMode displayMode = bmdModeUnknown;
@@ -493,7 +493,7 @@ static BMDDisplayMode get_mode(IDeckLinkOutput *deckLinkOutput, struct video_des
if(fabs(desc.fps - displayFPS) < 0.01 && (desc.interlacing == INTERLACED_MERGED ? interlaced : !interlaced)
)
{
printf("Device %d - selected mode: %s\n", index, modeNameCString);
printf("DeckLink - selected mode: %s\n", modeNameCString);
displayMode = deckLinkDisplayMode->GetDisplayMode();
break;
}
@@ -548,7 +548,7 @@ display_decklink_reconfigure(void *state, struct video_desc desc)
tile->data_len = tile->linesize * tile->height;
}
displayMode = get_mode(s->state[0].deckLinkOutput, desc, &s->frameRateDuration,
&s->frameRateScale, 0);
&s->frameRateScale);
if(displayMode == (BMDDisplayMode) -1)
goto error;
@@ -582,7 +582,7 @@ display_decklink_reconfigure(void *state, struct video_desc desc)
tile->data_len = tile->linesize * tile->height;
displayMode = get_mode(s->state[i].deckLinkOutput, desc, &s->frameRateDuration,
&s->frameRateScale, i);
&s->frameRateScale);
if(displayMode == (BMDDisplayMode) -1)
goto error;