]>
Commit | Line | Data |
---|---|---|
0b0f7f17 JB |
1 | --- gst-plugins-bad-1.24.0/sys/aja/gstajasrc.cpp.orig 2024-03-05 00:51:42.000000000 +0100 |
2 | +++ gst-plugins-bad-1.24.0/sys/aja/gstajasrc.cpp 2024-03-21 06:03:23.822345459 +0100 | |
3 | @@ -1058,9 +1058,9 @@ static gboolean gst_aja_src_configure(Gs | |
4 | // their framebuffers/muxers, and muxers from their framebuffers | |
5 | for (auto iter = connections.begin(); iter != connections.end(); iter++) { | |
6 | if (iter->first == NTV2_XptFrameBuffer1Input || | |
7 | - iter->first == NTV2_XptFrameBuffer1BInput || | |
8 | + iter->first == NTV2_XptFrameBuffer1DS2Input || | |
9 | iter->first == NTV2_XptFrameBuffer2Input || | |
10 | - iter->first == NTV2_XptFrameBuffer2BInput || | |
11 | + iter->first == NTV2_XptFrameBuffer2DS2Input || | |
12 | iter->second == NTV2_Xpt425Mux1AYUV || | |
13 | iter->second == NTV2_Xpt425Mux1BYUV || | |
14 | iter->second == NTV2_Xpt425Mux2AYUV || | |
15 | @@ -1078,10 +1078,8 @@ static gboolean gst_aja_src_configure(Gs | |
16 | } else if (self->channel == NTV2_CHANNEL1) { | |
17 | for (auto iter = connections.begin(); iter != connections.end(); iter++) { | |
18 | if (iter->first == NTV2_XptFrameBuffer1Input || | |
19 | - iter->first == NTV2_XptFrameBuffer1BInput || | |
20 | iter->first == NTV2_XptFrameBuffer1DS2Input || | |
21 | iter->first == NTV2_XptFrameBuffer2Input || | |
22 | - iter->first == NTV2_XptFrameBuffer2BInput || | |
23 | iter->first == NTV2_XptFrameBuffer2DS2Input || | |
24 | iter->second == NTV2_Xpt425Mux1AYUV || | |
25 | iter->second == NTV2_Xpt425Mux1BYUV || | |
26 | @@ -1104,10 +1102,8 @@ static gboolean gst_aja_src_configure(Gs | |
27 | } else if (self->channel == NTV2_CHANNEL5) { | |
28 | for (auto iter = connections.begin(); iter != connections.end(); iter++) { | |
29 | if (iter->first == NTV2_XptFrameBuffer5Input || | |
30 | - iter->first == NTV2_XptFrameBuffer5BInput || | |
31 | iter->first == NTV2_XptFrameBuffer5DS2Input || | |
32 | iter->first == NTV2_XptFrameBuffer6Input || | |
33 | - iter->first == NTV2_XptFrameBuffer6BInput || | |
34 | iter->first == NTV2_XptFrameBuffer6DS2Input || | |
35 | iter->second == NTV2_Xpt425Mux3AYUV || | |
36 | iter->second == NTV2_Xpt425Mux3BYUV || | |
37 | @@ -1208,9 +1204,9 @@ static gboolean gst_aja_src_configure(Gs | |
38 | if (self->quad_mode) { | |
39 | if (self->input_source >= GST_AJA_INPUT_SOURCE_HDMI1 && | |
40 | self->input_source <= GST_AJA_INPUT_SOURCE_HDMI4) { | |
41 | - router.AddConnection(NTV2_XptFrameBuffer1BInput, NTV2_Xpt425Mux1BYUV); | |
42 | + router.AddConnection(NTV2_XptFrameBuffer1DS2Input, NTV2_Xpt425Mux1BYUV); | |
43 | router.AddConnection(NTV2_XptFrameBuffer2Input, NTV2_Xpt425Mux2AYUV); | |
44 | - router.AddConnection(NTV2_XptFrameBuffer2BInput, NTV2_Xpt425Mux2BYUV); | |
45 | + router.AddConnection(NTV2_XptFrameBuffer2DS2Input, NTV2_Xpt425Mux2BYUV); | |
46 | ||
47 | router.AddConnection(NTV2_Xpt425Mux1AInput, NTV2_XptHDMIIn1); | |
48 | router.AddConnection(NTV2_Xpt425Mux1BInput, NTV2_XptHDMIIn1Q2); | |
49 | @@ -1250,11 +1246,11 @@ static gboolean gst_aja_src_configure(Gs | |
50 | // TSI? | |
51 | } else { | |
52 | if (self->channel == NTV2_CHANNEL1) { | |
53 | - router.AddConnection(NTV2_XptFrameBuffer1BInput, | |
54 | + router.AddConnection(NTV2_XptFrameBuffer1DS2Input, | |
55 | NTV2_Xpt425Mux1BYUV); | |
56 | router.AddConnection(NTV2_XptFrameBuffer2Input, | |
57 | NTV2_Xpt425Mux2AYUV); | |
58 | - router.AddConnection(NTV2_XptFrameBuffer2BInput, | |
59 | + router.AddConnection(NTV2_XptFrameBuffer2DS2Input, | |
60 | NTV2_Xpt425Mux2BYUV); | |
61 | ||
62 | router.AddConnection(NTV2_Xpt425Mux1AInput, NTV2_XptSDIIn1); | |
63 | @@ -1262,11 +1258,11 @@ static gboolean gst_aja_src_configure(Gs | |
64 | router.AddConnection(NTV2_Xpt425Mux2AInput, NTV2_XptSDIIn3); | |
65 | router.AddConnection(NTV2_Xpt425Mux2BInput, NTV2_XptSDIIn4); | |
66 | } else if (self->channel == NTV2_CHANNEL5) { | |
67 | - router.AddConnection(NTV2_XptFrameBuffer5BInput, | |
68 | + router.AddConnection(NTV2_XptFrameBuffer5DS2Input, | |
69 | NTV2_Xpt425Mux3BYUV); | |
70 | router.AddConnection(NTV2_XptFrameBuffer6Input, | |
71 | NTV2_Xpt425Mux4AYUV); | |
72 | - router.AddConnection(NTV2_XptFrameBuffer6BInput, | |
73 | + router.AddConnection(NTV2_XptFrameBuffer6DS2Input, | |
74 | NTV2_Xpt425Mux4BYUV); | |
75 | ||
76 | router.AddConnection(NTV2_Xpt425Mux3AInput, NTV2_XptSDIIn5); |