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

aja: Fix Kona1 simultaneous capture/output

master
Paul Hindt 2022-01-27 15:00:00 -08:00 committed by Colin Edwards
parent 3fbd5d9179
commit ba875377d0
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
plugins/aja/aja-card-manager.cpp
View File

@ -263,21 +263,21 @@ bool CardEntry::ReleaseChannel(NTV2Channel chan, NTV2Mode mode,
bool CardEntry::InputSelectionReady(IOSelection io, NTV2DeviceID id,
const std::string &owner) const
{
UNUSED_PARAMETER(id);
NTV2InputSourceSet inputSources;
aja::IOSelectionToInputSources(io, inputSources);
if (inputSources.size() > 0) {
size_t channelsReady = 0;
for (auto &&src : inputSources) {
auto channel = NTV2InputSourceToChannel(src);
if (ChannelReady(channel, owner))
channelsReady++;
if (id == DEVICE_ID_KONA1 && io == IOSelection::SDI1) {
return true;
} else {
NTV2InputSourceSet inputSources;
aja::IOSelectionToInputSources(io, inputSources);
if (inputSources.size() > 0) {
size_t channelsReady = 0;
for (auto &&src : inputSources) {
auto channel = NTV2InputSourceToChannel(src);
if (ChannelReady(channel, owner))
channelsReady++;
}
if (channelsReady == inputSources.size())
return true;
}
if (channelsReady == inputSources.size())
return true;
}
return false;
@ -299,19 +299,19 @@ bool CardEntry::OutputSelectionReady(IOSelection io, NTV2DeviceID id,
io == IOSelection::SDI5) {
NTV2Channel sdiMonChannel = NTV2_CHANNEL4;
return ChannelReady(sdiMonChannel, owner);
} else if (id == DEVICE_ID_KONA1 && io == IOSelection::SDI1) {
return true;
} else {
NTV2OutputDestinations outputDests;
aja::IOSelectionToOutputDests(io, outputDests);
if (outputDests.size() > 0) {
size_t channelsReady = 0;
for (auto &&dst : outputDests) {
auto channel =
NTV2OutputDestinationToChannel(dst);
if (ChannelReady(channel, owner))
channelsReady++;
}
if (channelsReady == outputDests.size())
return true;
}