Commit 88bdf0a
[GStreamer][WebRTC] Simplified pipeline for incoming tracks
https://bugs.webkit.org/show_bug.cgi?id=276989
Reviewed by Xabier Rodriguez-Calvar.
The incoming track processor now feeds a single sink, no tee or dynamic pipeline manipulations
involved anymore. This brings back a timeout in webrtc/h265.html, but it will be fixed once we have
track events dispatching fixed (bug #275685).
* LayoutTests/platform/glib/TestExpectations:
* Source/WebCore/Modules/mediastream/gstreamer/GStreamerMediaEndpoint.cpp:
(WebCore::GStreamerMediaEndpoint::setConfiguration):
(WebCore::GStreamerMediaEndpoint::connectIncomingTrack):
(WebCore::GStreamerMediaEndpoint::connectPad):
* Source/WebCore/platform/mediastream/gstreamer/GStreamerIncomingTrackProcessor.cpp:
(WebCore::GStreamerIncomingTrackProcessor::configure):
(WebCore::GStreamerIncomingTrackProcessor::incomingTrackProcessor):
(WebCore::GStreamerIncomingTrackProcessor::createParser):
(WebCore::GStreamerIncomingTrackProcessor::stats):
* Source/WebCore/platform/mediastream/gstreamer/GStreamerIncomingTrackProcessor.h:
* Source/WebCore/platform/mediastream/gstreamer/GStreamerMediaStreamSource.cpp:
* Source/WebCore/platform/mediastream/gstreamer/GStreamerWebRTCCommon.h:
* Source/WebCore/platform/mediastream/gstreamer/RealtimeIncomingAudioSourceGStreamer.cpp:
* Source/WebCore/platform/mediastream/gstreamer/RealtimeIncomingSourceGStreamer.cpp:
(WebCore::RealtimeIncomingSourceGStreamer::RealtimeIncomingSourceGStreamer):
(WebCore::RealtimeIncomingSourceGStreamer::setBin):
(WebCore::RealtimeIncomingSourceGStreamer::registerClient):
(WebCore::RealtimeIncomingSourceGStreamer::unregisterClient):
(WebCore::RealtimeIncomingSourceGStreamer::unregisterClientLocked):
(WebCore::RealtimeIncomingSourceGStreamer::forEachClient):
(WebCore::RealtimeIncomingSourceGStreamer::handleUpstreamEvent):
(WebCore::RealtimeIncomingSourceGStreamer::handleUpstreamQuery):
(WebCore::RealtimeIncomingSourceGStreamer::handleDownstreamEvent):
(WebCore::RealtimeIncomingSourceGStreamer::setUpstreamBin): Deleted.
(WebCore::RealtimeIncomingSourceGStreamer::startProducingData): Deleted.
(WebCore::RealtimeIncomingSourceGStreamer::stopProducingData): Deleted.
(WebCore::RealtimeIncomingSourceGStreamer::configureAppSink): Deleted.
(WebCore::RealtimeIncomingSourceGStreamer::configureFakeVideoSink): Deleted.
* Source/WebCore/platform/mediastream/gstreamer/RealtimeIncomingSourceGStreamer.h:
(WebCore::RealtimeIncomingSourceGStreamer::bin const):
(WebCore::RealtimeIncomingSourceGStreamer::bin): Deleted.
(WebCore::RealtimeIncomingSourceGStreamer::setIsUpstreamDecoding): Deleted.
(WebCore::RealtimeIncomingSourceGStreamer::dispatchSample): Deleted.
* Source/WebCore/platform/mediastream/gstreamer/RealtimeIncomingVideoSourceGStreamer.cpp:
(WebCore::RealtimeIncomingVideoSourceGStreamer::setBin):
(WebCore::RealtimeIncomingVideoSourceGStreamer::dispatchSample):
(WebCore::RealtimeIncomingVideoSourceGStreamer::setUpstreamBin): Deleted.
* Source/WebCore/platform/mediastream/gstreamer/RealtimeIncomingVideoSourceGStreamer.h:
Canonical link: https://commits.webkit.org/281394@main1 parent bd22872 commit 88bdf0a
File tree
11 files changed
+175
-267
lines changed- LayoutTests/platform/glib
- Source/WebCore
- Modules/mediastream/gstreamer
- platform/mediastream/gstreamer
11 files changed
+175
-267
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1474 | 1474 | | |
1475 | 1475 | | |
1476 | 1476 | | |
| 1477 | + | |
| 1478 | + | |
1477 | 1479 | | |
1478 | 1480 | | |
1479 | 1481 | | |
| |||
Lines changed: 7 additions & 14 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
282 | 282 | | |
283 | 283 | | |
284 | 284 | | |
285 | | - | |
286 | | - | |
287 | 285 | | |
| 286 | + | |
288 | 287 | | |
289 | 288 | | |
290 | 289 | | |
| |||
998 | 997 | | |
999 | 998 | | |
1000 | 999 | | |
1001 | | - | |
1002 | | - | |
1003 | 1000 | | |
1004 | 1001 | | |
1005 | 1002 | | |
1006 | 1003 | | |
1007 | | - | |
1008 | | - | |
1009 | | - | |
| 1004 | + | |
| 1005 | + | |
1010 | 1006 | | |
1011 | 1007 | | |
1012 | | - | |
1013 | | - | |
1014 | | - | |
| 1008 | + | |
| 1009 | + | |
1015 | 1010 | | |
1016 | | - | |
1017 | | - | |
1018 | | - | |
1019 | 1011 | | |
1020 | 1012 | | |
1021 | 1013 | | |
| |||
1033 | 1025 | | |
1034 | 1026 | | |
1035 | 1027 | | |
| 1028 | + | |
1036 | 1029 | | |
1037 | 1030 | | |
1038 | 1031 | | |
| |||
1048 | 1041 | | |
1049 | 1042 | | |
1050 | 1043 | | |
1051 | | - | |
| 1044 | + | |
1052 | 1045 | | |
1053 | 1046 | | |
1054 | 1047 | | |
| |||
Lines changed: 38 additions & 23 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
44 | | - | |
45 | | - | |
46 | 44 | | |
47 | 45 | | |
48 | 46 | | |
49 | 47 | | |
50 | 48 | | |
51 | | - | |
52 | | - | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
53 | 57 | | |
54 | 58 | | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
55 | 63 | | |
56 | 64 | | |
57 | 65 | | |
| |||
72 | 80 | | |
73 | 81 | | |
74 | 82 | | |
75 | | - | |
76 | | - | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
77 | 86 | | |
78 | 87 | | |
79 | | - | |
80 | 88 | | |
81 | | - | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
82 | 92 | | |
83 | 93 | | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
84 | 107 | | |
85 | 108 | | |
86 | 109 | | |
| |||
166 | 189 | | |
167 | 190 | | |
168 | 191 | | |
169 | | - | |
170 | | - | |
171 | | - | |
172 | | - | |
173 | | - | |
174 | | - | |
175 | 192 | | |
176 | 193 | | |
177 | 194 | | |
| |||
207 | 224 | | |
208 | 225 | | |
209 | 226 | | |
210 | | - | |
| 227 | + | |
| 228 | + | |
211 | 229 | | |
212 | | - | |
213 | | - | |
214 | | - | |
215 | | - | |
216 | | - | |
217 | 230 | | |
218 | 231 | | |
219 | 232 | | |
| |||
232 | 245 | | |
233 | 246 | | |
234 | 247 | | |
235 | | - | |
| 248 | + | |
| 249 | + | |
236 | 250 | | |
237 | | - | |
238 | 251 | | |
239 | 252 | | |
240 | 253 | | |
| |||
265 | 278 | | |
266 | 279 | | |
267 | 280 | | |
268 | | - | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
269 | 284 | | |
270 | 285 | | |
271 | 286 | | |
| |||
Lines changed: 1 addition & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
64 | | - | |
65 | 64 | | |
66 | 65 | | |
67 | 66 | | |
68 | 67 | | |
69 | 68 | | |
70 | 69 | | |
71 | 70 | | |
72 | | - | |
73 | | - | |
| 71 | + | |
74 | 72 | | |
75 | 73 | | |
76 | 74 | | |
| |||
Lines changed: 17 additions & 31 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
124 | 124 | | |
125 | 125 | | |
126 | 126 | | |
127 | | - | |
128 | | - | |
129 | | - | |
130 | | - | |
131 | | - | |
132 | | - | |
133 | | - | |
134 | | - | |
135 | 127 | | |
136 | 128 | | |
137 | 129 | | |
| |||
200 | 192 | | |
201 | 193 | | |
202 | 194 | | |
203 | | - | |
| 195 | + | |
204 | 196 | | |
205 | 197 | | |
206 | 198 | | |
| |||
219 | 211 | | |
220 | 212 | | |
221 | 213 | | |
222 | | - | |
223 | | - | |
224 | | - | |
225 | | - | |
226 | | - | |
227 | | - | |
228 | | - | |
229 | | - | |
230 | | - | |
231 | | - | |
| 214 | + | |
232 | 215 | | |
| 216 | + | |
233 | 217 | | |
234 | 218 | | |
235 | | - | |
236 | | - | |
| 219 | + | |
| 220 | + | |
237 | 221 | | |
238 | | - | |
| 222 | + | |
239 | 223 | | |
240 | 224 | | |
241 | 225 | | |
| |||
248 | 232 | | |
249 | 233 | | |
250 | 234 | | |
251 | | - | |
252 | | - | |
| 235 | + | |
| 236 | + | |
253 | 237 | | |
254 | | - | |
255 | | - | |
| 238 | + | |
| 239 | + | |
256 | 240 | | |
257 | | - | |
258 | | - | |
| 241 | + | |
| 242 | + | |
259 | 243 | | |
260 | | - | |
261 | | - | |
| 244 | + | |
| 245 | + | |
262 | 246 | | |
263 | 247 | | |
264 | 248 | | |
265 | | - | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
266 | 252 | | |
267 | 253 | | |
268 | 254 | | |
| |||
Lines changed: 0 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
31 | 30 | | |
32 | 31 | | |
33 | 32 | | |
| |||
Lines changed: 0 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | 40 | | |
44 | 41 | | |
45 | 42 | | |
| |||
0 commit comments