Issue sw/ntv2/top#1004: fixed ccgrabber burn to also use 6g/12g SDIOut

aja-video · Nov 26, 2024 · bf5649f · bf5649f
1 parent 8d7e7a0
commit bf5649f
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/demos/ntv2ccgrabber/ntv2ccgrabber.cpp b/demos/ntv2ccgrabber/ntv2ccgrabber.cpp
@@ -382,6 +382,9 @@ static const NTV2WidgetID	gSDIOutputs[]	= {	NTV2_WgtSDIOut1,	NTV2_WgtSDIOut2,	NT
 static const NTV2WidgetID	g3GSDIOutputs[]	= {	NTV2_Wgt3GSDIOut1,	NTV2_Wgt3GSDIOut2,	NTV2_Wgt3GSDIOut3,	NTV2_Wgt3GSDIOut4,
 												NTV2_Wgt3GSDIOut5,	NTV2_Wgt3GSDIOut6,	NTV2_Wgt3GSDIOut7,	NTV2_Wgt3GSDIOut8	};
 
+static const NTV2WidgetID	g12GSDIOutputs[]= {	NTV2_Wgt12GSDIOut1,	NTV2_Wgt12GSDIOut2,	NTV2_Wgt12GSDIOut3,	NTV2_Wgt12GSDIOut4,
+												NTV2_WIDGET_INVALID, NTV2_WIDGET_INVALID, NTV2_WIDGET_INVALID, NTV2_WIDGET_INVALID	};
+
 
 bool NTV2CCGrabber::RouteInputSignal (const NTV2VideoFormat inVideoFormat)
 {
@@ -1325,7 +1328,9 @@ bool NTV2CCGrabber::RouteOutputSignal (const NTV2VideoFormat inVideoFormat)
 		//	Multiformat --- route the one SDI output to the mixer's YUV output, and set its output standard...
 		if (mDevice.features().HasBiDirectionalSDI())
 			mDevice.SetSDITransmitEnable (mOutputChannel, true);
-		if (mDevice.features().CanDoWidget(g3GSDIOutputs[mOutputChannel]) || mDevice.features().CanDoWidget(gSDIOutputs[mOutputChannel]))
+		if (mDevice.features().CanDoWidget(g12GSDIOutputs[mOutputChannel])
+			|| mDevice.features().CanDoWidget(g3GSDIOutputs[mOutputChannel])
+			|| mDevice.features().CanDoWidget(gSDIOutputs[mOutputChannel]))
 		{
 			if (!mDevice.Connect (::GetSDIOutputInputXpt(mOutputChannel), mixerOutputYUV, canVerify)) connectFailures++;
 			mDevice.SetSDIOutputStandard (mOutputChannel, outputStandard);
@@ -1349,7 +1354,9 @@ bool NTV2CCGrabber::RouteOutputSignal (const NTV2VideoFormat inVideoFormat)
 					continue;	//	Skip the input
 				mDevice.SetSDITransmitEnable (chan, true);
 			}
-			if (mDevice.features().CanDoWidget(g3GSDIOutputs[chan]) || mDevice.features().CanDoWidget(gSDIOutputs[chan]))
+			if (mDevice.features().CanDoWidget(g12GSDIOutputs[chan])
+				|| mDevice.features().CanDoWidget(g3GSDIOutputs[chan])
+				|| mDevice.features().CanDoWidget(gSDIOutputs[chan]))
 			{
 				if (!mDevice.Connect (::GetSDIOutputInputXpt(chan), mixerOutputYUV, canVerify)) connectFailures++;
 				mDevice.SetSDIOutputStandard (chan, outputStandard);