jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aja: Fix erroneous HDMI input selection for certain cards

Browse Source
This commit is contained in:
Paul Hindt 2022-01-14 19:37:12 -08:00 committed by Colin Edwards
parent 3e07c29ec3
commit 9c9efcd04d
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/aja/aja-common.cpp
View File

@ -418,7 +418,15 @@ bool CardCanDoSDIMonitorOutput(NTV2DeviceID id)
return (id == DEVICE_ID_IO4K || id == DEVICE_ID_IO4KPLUS);
}
// Cards with a dedicated HDMI Monitor Output tie it to "Framestore 4".
// Cards with a dedicated HDMI Monitor Input, tied to "Framestore 4".
bool CardCanDoHDMIMonitorInput(NTV2DeviceID id)
{
return (id == DEVICE_ID_IO4K || id == DEVICE_ID_IO4KUFC ||
id == DEVICE_ID_IO4KPLUS || id == DEVICE_ID_IOXT ||
id == DEVICE_ID_IOX3 || id == DEVICE_ID_KONALHI);
}
// Cards with a dedicated HDMI Monitor Output, tied to "Framestore 4".
bool CardCanDoHDMIMonitorOutput(NTV2DeviceID id)
{
return (id == DEVICE_ID_IO4K || id == DEVICE_ID_IO4KPLUS ||
@ -847,6 +855,11 @@ void IOSelectionToOutputDests(IOSelection io,
bool DeviceCanDoIOSelectionIn(NTV2DeviceID id, IOSelection io)
{
// Hide "HDMI1" list selection on devices which have a discrete "HDMI IN" port.
if (io == IOSelection::HDMI1 && CardCanDoHDMIMonitorInput(id)) {
return false;
}
NTV2InputSourceSet inputSources;
if (io != IOSelection::Invalid) {
IOSelectionToInputSources(io, inputSources);

1
plugins/aja/aja-common.hpp
View File

@ -69,6 +69,7 @@ HandleSpecialCaseFormats(IOSelection io, NTV2VideoFormat vf, NTV2DeviceID id);
extern uint32_t CardNumFramestores(NTV2DeviceID id);
extern uint32_t CardNumAudioSystems(NTV2DeviceID id);
extern bool CardCanDoSDIMonitorOutput(NTV2DeviceID id);
extern bool CardCanDoHDMIMonitorInput(NTV2DeviceID id);
extern bool CardCanDoHDMIMonitorOutput(NTV2DeviceID id);
extern bool CardCanDo1xSDI12G(NTV2DeviceID id);
extern bool Is3GLevelB(CNTV2Card *card, NTV2Channel channel);