aja: Refactor, clean-up and fix bugs in the signal routing system, and add SDITransport UI option to assist signal routing.

This commit is contained in:
Paul Hindt
2022-01-07 18:45:08 -08:00
committed by Colin Edwards
parent d78971b4db
commit f09137a2e0
32 changed files with 2806 additions and 3297 deletions

View File

@@ -42,15 +42,22 @@ void AJAOutputUI::SetupPropertiesView()
obs_data_apply(settings, data);
} else {
// apply default settings
obs_data_set_int(settings, kUIPropOutput.id,
static_cast<long long>(IOSelection::Invalid));
obs_data_set_int(settings, kUIPropVideoFormatSelect.id,
static_cast<long long>(NTV2_FORMAT_720p_5994));
obs_data_set_int(settings, kUIPropPixelFormatSelect.id,
static_cast<long long>(NTV2_FBF_8BIT_YCBCR));
obs_data_set_int(settings, kUIPropSDI4KTransport.id,
static_cast<long long>(
SDI4KTransport::TwoSampleInterleave));
obs_data_set_default_int(
settings, kUIPropOutput.id,
static_cast<long long>(IOSelection::Invalid));
obs_data_set_default_int(
settings, kUIPropVideoFormatSelect.id,
static_cast<long long>(NTV2_FORMAT_720p_5994));
obs_data_set_default_int(
settings, kUIPropPixelFormatSelect.id,
static_cast<long long>(NTV2_FBF_8BIT_YCBCR));
obs_data_set_default_int(
settings, kUIPropSDITransport.id,
static_cast<long long>(SDITransport::SingleLink));
obs_data_set_default_int(
settings, kUIPropSDITransport4K.id,
static_cast<long long>(
SDITransport4K::TwoSampleInterleave));
}
// Assign an ID to the program output plugin instance for channel usage tracking
@@ -93,15 +100,22 @@ void AJAOutputUI::SetupPreviewPropertiesView()
obs_data_apply(settings, data);
} else {
// apply default settings
obs_data_set_int(settings, kUIPropOutput.id,
static_cast<long long>(IOSelection::Invalid));
obs_data_set_int(settings, kUIPropVideoFormatSelect.id,
static_cast<long long>(NTV2_FORMAT_720p_5994));
obs_data_set_int(settings, kUIPropPixelFormatSelect.id,
static_cast<long long>(NTV2_FBF_8BIT_YCBCR));
obs_data_set_int(settings, kUIPropSDI4KTransport.id,
static_cast<long long>(
SDI4KTransport::TwoSampleInterleave));
obs_data_set_default_int(
settings, kUIPropOutput.id,
static_cast<long long>(IOSelection::Invalid));
obs_data_set_default_int(
settings, kUIPropVideoFormatSelect.id,
static_cast<long long>(NTV2_FORMAT_720p_5994));
obs_data_set_default_int(
settings, kUIPropPixelFormatSelect.id,
static_cast<long long>(NTV2_FBF_8BIT_YCBCR));
obs_data_set_default_int(
settings, kUIPropSDITransport.id,
static_cast<long long>(SDITransport::SingleLink));
obs_data_set_default_int(
settings, kUIPropSDITransport4K.id,
static_cast<long long>(
SDITransport4K::TwoSampleInterleave));
}
// Assign an ID to the program output plugin instance for channel usage tracking