Browse Source

aja: Fix signal routing for 4xSDI UHD/4K RGB 3Gb

Crosspoint indices were wrong for the UHD4K_ST425_Quad_3Gb_Squares_RGB_Capture preset and VPID was not being set for the selected 3G-Level B transport mode.
Paul Hindt 3 years ago
parent
commit
9728345bf4
2 changed files with 12 additions and 4 deletions
  1. 8 0
      plugins/aja/aja-common.cpp
  2. 4 4
      plugins/aja/aja-presets.cpp

+ 8 - 0
plugins/aja/aja-common.cpp

@@ -1125,6 +1125,14 @@ VPIDStandard DetermineVPIDStandard(NTV2DeviceID id, IOSelection io,
 			}
 			}
 		} else if (aja::IsSDIFourWireIOSelection(io)) {
 		} else if (aja::IsSDIFourWireIOSelection(io)) {
 			if (is_rgb) {
 			if (is_rgb) {
+				if (t4k == SDITransport4K::Squares) {
+					if (trx == SDITransport::SDI3Ga) {
+						vpid = VPIDStandard_1080_3Ga;
+					} else if (trx ==
+						   SDITransport::SDI3Gb) {
+						vpid = VPIDStandard_1080_DualLink_3Gb;
+					}
+				}
 			} else {
 			} else {
 				// YCbCr
 				// YCbCr
 				if (t4k == SDITransport4K::Squares) {
 				if (t4k == SDITransport4K::Squares) {

+ 4 - 4
plugins/aja/aja-presets.cpp

@@ -318,10 +318,10 @@ void RoutingConfigurator::build_preset_table()
 		  "sdi[{ch3}][1]->dli[{ch3}][1];"
 		  "sdi[{ch3}][1]->dli[{ch3}][1];"
 		  "sdi[{ch4}][0]->dli[{ch4}][0];"
 		  "sdi[{ch4}][0]->dli[{ch4}][0];"
 		  "sdi[{ch4}][1]->dli[{ch4}][1];" // Dual-Links -> Framestores
 		  "sdi[{ch4}][1]->dli[{ch4}][1];" // Dual-Links -> Framestores
-		  "dli[{ch1}][0]->fb[{ch1}][2];"
-		  "dli[{ch2}][0]->fb[{ch2}][2];"
-		  "dli[{ch3}][0]->fb[{ch3}][2];"
-		  "dli[{ch4}][0]->fb[{ch4}][2];",
+		  "dli[{ch1}][0]->fb[{ch1}][0];"
+		  "dli[{ch2}][0]->fb[{ch2}][0];"
+		  "dli[{ch3}][0]->fb[{ch3}][0];"
+		  "dli[{ch4}][0]->fb[{ch4}][0];",
 		  {},
 		  {},
 		  true,
 		  true,
 		  false}},
 		  false}},