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

DeckLink cap.: deprecated link

Browse Source 
The option actually sets output, not input link configuration.
Do not set anything by default but leave it as an option for now.
This commit is contained in:
Martin Pulec
2022-04-01 13:09:00 +02:00
parent 435efcb63f
commit c11db7e49f
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/video_capture/decklink.cpp
View File

@@ -188,7 +188,7 @@ struct vidcap_decklink_state {
int use1080psf = BMD_OPT_KEEP; // capture PsF instead of progressive
uint32_t profile{}; // BMD_OPT_DEFAULT, BMD_OPT_KEEP, bmdDuplexHalf or one of BMDProfileID
uint32_t link = 0;
uint32_t link = 0; /// @deprecated TOREMOVE? It sets output link configuration, not input thus it should not be used here.
bool nosig_send = false; ///< send video even when no signal detected
};
@@ -1210,11 +1210,10 @@ vidcap_decklink_init(struct vidcap_params *params, void **state)
BMDVideoInputConversionMode supported_conversion_mode = s->conversion_mode ? s->conversion_mode : (BMDVideoInputConversionMode) bmdNoVideoInputConversion;
BMD_CONFIG_SET_INT(bmdDeckLinkConfigCapturePassThroughMode, s->passthrough);
if (s->link == 0) {
LOG(LOG_LEVEL_NOTICE) << MOD_NAME "Setting single link by default.\n";
s->link = bmdLinkConfigurationSingleLink;
if (s->link != 0) {
LOG(LOG_LEVEL_WARNING) << MOD_NAME << "Setting output link configuration on capture is deprecated and will be removed in future, let us know if this is needed!\n";
CALL_AND_CHECK( deckLinkConfiguration->SetInt(bmdDeckLinkConfigSDIOutputLinkConfiguration, s->link), "Unable set output SDI link mode");
}
CALL_AND_CHECK( deckLinkConfiguration->SetInt(bmdDeckLinkConfigSDIOutputLinkConfiguration, s->link), "Unable set output SDI link mode");
if (s->use1080psf != BMD_OPT_KEEP) {
CALL_AND_CHECK(deckLinkConfiguration->SetFlag(bmdDeckLinkConfigCapture1080pAsPsF, s->use1080psf != 0), "Unable to set output as PsF");
}