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

DeckLink cap.: use bmdNoVideoInputConversion for check

Browse Source 
Although the conversion shouldn't be set (see #215), still a valid value
('none' here) must be used for the check.

Fixes #221
This commit is contained in:
Martin Pulec
2022-04-01 09:43:06 +02:00
parent 2d451e894e
commit d891cab2ca
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/video_capture/decklink.cpp
View File

@@ -1200,7 +1200,7 @@ vidcap_decklink_init(struct vidcap_params *params, void **state)
if (s->conversion_mode) {
CALL_AND_CHECK(deckLinkConfiguration->SetInt(bmdDeckLinkConfigVideoInputConversionMode, s->conversion_mode), "Unable to set conversion mode");
}
BMDVideoInputConversionMode supported_conversion_mode = s->conversion_mode ? s->conversion_mode : (BMDVideoInputConversionMode) bmdNoVideoInputConversion;
if (s->passthrough) {
EXIT_IF_FAILED(deckLinkConfiguration->SetInt(bmdDeckLinkConfigCapturePassThroughMode, s->passthrough), "Unable to set passthrough mode");
}
@@ -1269,7 +1269,7 @@ vidcap_decklink_init(struct vidcap_params *params, void **state)
}
BMDPixelFormat pf = it->second;
BMD_BOOL supported = 0;
EXIT_IF_FAILED(deckLinkInput->DoesSupportVideoMode(s->connection, displayMode->GetDisplayMode(), pf, s->conversion_mode, s->supported_flags, nullptr, &supported), "DoesSupportVideoMode");
EXIT_IF_FAILED(deckLinkInput->DoesSupportVideoMode(s->connection, displayMode->GetDisplayMode(), pf, supported_conversion_mode, s->supported_flags, nullptr, &supported), "DoesSupportVideoMode");
if (supported) {
break;
}
@@ -1331,7 +1331,7 @@ vidcap_decklink_init(struct vidcap_params *params, void **state)
}
BMD_BOOL supported = 0;
EXIT_IF_FAILED(deckLinkInput->DoesSupportVideoMode(s->connection, displayMode->GetDisplayMode(), pf, s->conversion_mode, s->supported_flags, nullptr, &supported), "DoesSupportVideoMode");
EXIT_IF_FAILED(deckLinkInput->DoesSupportVideoMode(s->connection, displayMode->GetDisplayMode(), pf, supported_conversion_mode, s->supported_flags, nullptr, &supported), "DoesSupportVideoMode");
if (!supported) {
LOG(LOG_LEVEL_ERROR) << MOD_NAME "Requested display mode not supported with the selected pixel format\n";