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 cap.: respond to notif events selectively

Browse Source 
If display mode was changed, reconfigure display; if color-space,
reconfigure only color space.

This prevents unneeded reconfiguration when eg. color space is detected
first and then display mode + CS.
This commit is contained in:
Martin Pulec
2023-04-11 16:27:14 +02:00
parent 453df639ba
commit 443fe59d24
1 changed files with 43 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/video_capture/decklink.cpp
View File

@@ -280,10 +280,6 @@ public:
IDeckLinkDisplayMode* mode, IDeckLinkDisplayMode* mode,
BMDDetectedVideoInputFormatFlags flags) noexcept override { BMDDetectedVideoInputFormatFlags flags) noexcept override {
LOG(LOG_LEVEL_NOTICE) << MODULE_NAME << "Format change detected (" << getNotificationEventsStr(notificationEvents, flags) << ").\n"; LOG(LOG_LEVEL_NOTICE) << MODULE_NAME << "Format change detected (" << getNotificationEventsStr(notificationEvents, flags) << ").\n";
notificationEvents &= ~bmdVideoInputFieldDominanceChanged; // ignore field dominance change
if (notificationEvents == 0U) {
return S_OK;
}
bool detected_3d = (flags & bmdDetectedVideoInputDualStream3D) != 0U; bool detected_3d = (flags & bmdDetectedVideoInputDualStream3D) != 0U;
if ((detected_3d && !s->stereo) || ((!detected_3d && s->stereo))) { if ((detected_3d && !s->stereo) || ((!detected_3d && s->stereo))) {
@@ -291,52 +287,53 @@ public:
return E_FAIL; return E_FAIL;
} }
BMDDetectedVideoInputFormatFlags csBitDepth = flags & (csMask | bitDepthMask); BMDDetectedVideoInputFormatFlags csBitDepth = flags & (csMask | bitDepthMask);
if ((csBitDepth & bitDepthMask) == 0U) { // if no bit depth, assume 8-bit
csBitDepth |= bmdDetectedVideoInput8BitDepth;
}
if (s->requested_bit_depth != 0) {
csBitDepth = (flags & csMask) | s->requested_bit_depth;
}
unordered_map<BMDDetectedVideoInputFormatFlags, codec_t> m = {
{bmdDetectedVideoInputYCbCr422 | bmdDetectedVideoInput8BitDepth, UYVY},
{bmdDetectedVideoInputYCbCr422 | bmdDetectedVideoInput10BitDepth, v210},
{bmdDetectedVideoInputYCbCr422 | bmdDetectedVideoInput12BitDepth, v210}, // weird
{bmdDetectedVideoInputRGB444 | bmdDetectedVideoInput8BitDepth, RGBA},
{bmdDetectedVideoInputRGB444 | bmdDetectedVideoInput10BitDepth, R10k},
{bmdDetectedVideoInputRGB444 | bmdDetectedVideoInput12BitDepth, R12L},
};
if (notificationEvents == bmdVideoInputColorspaceChanged && csBitDepth == configuredCsBitDepth) { // only CS change which was already performed
return S_OK;
}
if (s->requested_bit_depth == 0 && (flags & bmdDetectedVideoInput8BitDepth) == 0) {
const string & depth = (flags & bmdDetectedVideoInput10BitDepth) != 0U ? "10"s : "12"s;
LOG(LOG_LEVEL_WARNING) << MODULE_NAME << "Detected " << depth << "-bit signal, use \":codec=UYVY\" to enforce 8-bit capture (old behavior).\n";
}
unique_lock<mutex> lk(s->lock); unique_lock<mutex> lk(s->lock);
s->set_codec(m.at(csBitDepth)); if (notificationEvents & bmdVideoInputColorspaceChanged && csBitDepth != configuredCsBitDepth) {
configuredCsBitDepth = csBitDepth; if ((csBitDepth & bitDepthMask) == 0U) { // if no bit depth, assume 8-bit
csBitDepth |= bmdDetectedVideoInput8BitDepth;
}
if (s->requested_bit_depth != 0) {
csBitDepth = (flags & csMask) | s->requested_bit_depth;
}
unordered_map<BMDDetectedVideoInputFormatFlags, codec_t> m = {
{bmdDetectedVideoInputYCbCr422 | bmdDetectedVideoInput8BitDepth, UYVY},
{bmdDetectedVideoInputYCbCr422 | bmdDetectedVideoInput10BitDepth, v210},
{bmdDetectedVideoInputYCbCr422 | bmdDetectedVideoInput12BitDepth, v210}, // weird
{bmdDetectedVideoInputRGB444 | bmdDetectedVideoInput8BitDepth, RGBA},
{bmdDetectedVideoInputRGB444 | bmdDetectedVideoInput10BitDepth, R10k},
{bmdDetectedVideoInputRGB444 | bmdDetectedVideoInput12BitDepth, R12L},
};
if (s->requested_bit_depth == 0 && (flags & bmdDetectedVideoInput8BitDepth) == 0) {
const string & depth = (flags & bmdDetectedVideoInput10BitDepth) != 0U ? "10"s : "12"s;
LOG(LOG_LEVEL_WARNING) << MODULE_NAME << "Detected " << depth << "-bit signal, use \":codec=UYVY\" to enforce 8-bit capture (old behavior).\n";
}
IDeckLinkInput *deckLinkInput = device.deckLinkInput; s->set_codec(m.at(csBitDepth));
deckLinkInput->PauseStreams(); configuredCsBitDepth = csBitDepth;
BMDPixelFormat pf{};
if (HRESULT result = set_display_mode_properties(s, device.tile, mode, /* out */ &pf); FAILED(result)) {
LOG(LOG_LEVEL_ERROR) << MOD_NAME << "set_display_mode_properties: " << bmd_hresult_to_string(result) << "\n";
return result;
} }
CALL_AND_CHECK(deckLinkInput->EnableVideoInput(mode->GetDisplayMode(), pf, s->enable_flags), "EnableVideoInput");
if (!device.audio) { //TODO: figure out output from multiple streams if (notificationEvents & bmdVideoInputDisplayModeChanged) {
deckLinkInput->DisableAudioInput(); IDeckLinkInput *deckLinkInput = device.deckLinkInput;
} else { deckLinkInput->PauseStreams();
deckLinkInput->EnableAudioInput( BMDPixelFormat pf{};
bmdAudioSampleRate48kHz, if (HRESULT result = set_display_mode_properties(s, device.tile, mode, /* out */ &pf); FAILED(result)) {
s->audio.bps == 2 ? bmdAudioSampleType16bitInteger : LOG(LOG_LEVEL_ERROR) << MOD_NAME << "set_display_mode_properties: " << bmd_hresult_to_string(result) << "\n";
bmdAudioSampleType32bitInteger, return result;
max(s->audio.ch_count, 2)); // BMD isn't able to grab single channel }
CALL_AND_CHECK(deckLinkInput->EnableVideoInput(mode->GetDisplayMode(), pf, s->enable_flags), "EnableVideoInput");
if (!device.audio) { //TODO: figure out output from multiple streams
deckLinkInput->DisableAudioInput();
} else {
deckLinkInput->EnableAudioInput(
bmdAudioSampleRate48kHz,
s->audio.bps == 2 ? bmdAudioSampleType16bitInteger :
bmdAudioSampleType32bitInteger,
max(s->audio.ch_count, 2)); // BMD isn't able to grab single channel
}
//deckLinkInput->SetCallback(s->state[i].delegate);
deckLinkInput->FlushStreams();
deckLinkInput->StartStreams();
} }
//deckLinkInput->SetCallback(s->state[i].delegate);
deckLinkInput->FlushStreams();
deckLinkInput->StartStreams();
return S_OK; return S_OK;
} }