OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 09:39:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

aja: Fix capturing UHD/4K YUV on Kona HDMI.

Browse source 
Added missing routing preset for KonaHDMI UHD/4K.

Calculate framebuffer index based on framestore index.
This commit is contained in:
Paul Hindt 2022-10-21 03:48:52 -07:00 committed by Jim
parent 03612ab873
commit d851f1d916
3 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
plugins/aja/aja-presets.cpp
View file

@ -187,6 +187,27 @@ void RoutingConfigurator::build_preset_table()
{DEVICE_ID_IO4KPLUS},
false,
false}},
{"HDMI_UHD_4K_YCbCr_Capture",
{"HDMI_UHD_4K_YCbCr_Capture",
ConnectionKind::HDMI,
NTV2_MODE_CAPTURE,
RasterDefinition::UHD_4K,
HDMIWireFormat::UHD_4K_YCBCR,
VPIDStandard_Unknown,
1,
2,
kEnable4KTSI,
"hdmi[{ch1}][0]->tsi[{ch1}][0];"
"hdmi[{ch1}][1]->tsi[{ch1}][1];"
"hdmi[{ch1}][2]->tsi[{ch2}][0];"
"hdmi[{ch1}][3]->tsi[{ch2}][1];"
"tsi[{ch1}][0]->fb[{ch1}][0];"
"tsi[{ch1}][1]->fb[{ch1}][1];"
"tsi[{ch2}][0]->fb[{ch2}][0];"
"tsi[{ch2}][1]->fb[{ch2}][1];",
{},
false,
false}},
/*
* HDMI YCbCr Display
*/

2
plugins/aja/aja-props.cpp
View file

@ -155,7 +155,7 @@ NTV2Channel SourceProps::Framestore() const
NTV2_IS_4K_VIDEO_FORMAT(videoFormat)) {
return NTV2_CHANNEL3;
}
return NTV2InputSourceToChannel(InitialInputSource());
return Channel();
}
NTV2AudioSystem SourceProps::AudioSystem() const

7
plugins/aja/aja-source.cpp
View file

@ -269,6 +269,7 @@ void AJASource::CaptureThread(AJAThread *thread, void *data)
sourceProps.pixelFormat);
auto inputSource = sourceProps.InitialInputSource();
auto channel = sourceProps.Channel();
auto framestore = sourceProps.Framestore();
auto audioSystem = sourceProps.AudioSystem();
// Current "on-air" frame on the card. The capture thread "Ping-pongs" between
// two frames, starting at an index corresponding to the framestore channel.
@ -278,12 +279,12 @@ void AJASource::CaptureThread(AJAThread *thread, void *data)
// Channel 3 (index 2) = frames 4/5
// Channel 4 (index 3) = frames 6/7
// etc...
ULWord currentCardFrame = (uint32_t)channel * 2;
ULWord currentCardFrame = GetIndexForNTV2Channel(framestore) * 2;
card->WaitForInputFieldID(NTV2_FIELD0, channel);
currentCardFrame ^= 1;
card->SetInputFrame(channel, currentCardFrame);
card->SetInputFrame(framestore, currentCardFrame);
AudioOffsets offsets;
ResetAudioBufferOffsets(card, audioSystem, offsets);
@ -388,7 +389,7 @@ void AJASource::CaptureThread(AJAThread *thread, void *data)
obs_source_output_video2(ajaSource->mSource, &obsFrame);
card->SetInputFrame(channel, currentCardFrame);
card->SetInputFrame(framestore, currentCardFrame);
}
blog(LOG_INFO, "AJASource::Capturethread: Thread loop stopped");