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

Decklink disp.: do not set conversion implicitly

Browse Source 
Even setting to 'none' is reported to fail in some setup.
This commit is contained in:
Martin Pulec
2020-04-21 11:22:27 +02:00
parent 6e7d0693d7
commit b6ca1eccf9
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/video_display/decklink.cpp
View File

@@ -845,7 +845,7 @@ static void *display_decklink_init(struct module *parent, const char *fmt, unsig
BMDAudioOutputAnalogAESSwitch audioConnection = (BMDAudioOutputAnalogAESSwitch) 0;
BMDVideo3DPackingFormat HDMI3DPacking = (BMDVideo3DPackingFormat) 0;
int audio_consumer_levels = -1;
BMDVideoOutputConversionMode conversion_mode = bmdNoVideoOutputConversion;
BMDVideoOutputConversionMode conversion_mode = 0;
bool use1080p_not_psf = true;
if (!blackmagic_api_version_check()) {
@@ -1090,11 +1090,13 @@ static void *display_decklink_init(struct module *parent, const char *fmt, unsig
goto error;
}
result = deckLinkConfiguration->SetInt(bmdDeckLinkConfigVideoOutputConversionMode, conversion_mode);
if (result != S_OK) {
log_msg(LOG_LEVEL_ERROR, "Unable to set conversion mode.\n");
goto error;
}
if (conversion_mode != 0) {
result = deckLinkConfiguration->SetInt(bmdDeckLinkConfigVideoOutputConversionMode, conversion_mode);
if (result != S_OK) {
log_msg(LOG_LEVEL_ERROR, "Unable to set conversion mode.\n");
goto error;
}
}
result = deckLinkConfiguration->SetFlag(bmdDeckLinkConfigUse1080pNotPsF, use1080p_not_psf);
if (result != S_OK) {