FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

webrtcbin: Fix transitions for the connection state

Browse Source 
They're now mapping exactly to what
  https://www.w3.org/TR/webrtc/#dom-rtciceconnectionstate
actually specifies.

Related to https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/758
This commit is contained in:
Sebastian Dröge 2020-01-09 18:55:56 +02:00 committed by GStreamer Merge Bot
parent b2e7739364
commit 41175f4ebe
1 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
ext/webrtc/gstwebrtcbin.c
View File

@ -785,7 +785,9 @@ _collate_ice_connection_states (GstWebRTCBin * webrtc)
{ {
#define STATE(val) GST_WEBRTC_ICE_CONNECTION_STATE_ ## val #define STATE(val) GST_WEBRTC_ICE_CONNECTION_STATE_ ## val
GstWebRTCICEConnectionState any_state = 0; GstWebRTCICEConnectionState any_state = 0;
gboolean all_closed = TRUE; gboolean all_new_or_closed = TRUE;
gboolean all_completed_or_closed = TRUE;
gboolean all_connected_completed_or_closed = TRUE;
int i; int i;
for (i = 0; i < webrtc->priv->transceivers->len; i++) { for (i = 0; i < webrtc->priv->transceivers->len; i++) {
@ -817,8 +819,14 @@ _collate_ice_connection_states (GstWebRTCBin * webrtc)
GST_TRACE_OBJECT (webrtc, "transceiver %p state 0x%x", rtp_trans, GST_TRACE_OBJECT (webrtc, "transceiver %p state 0x%x", rtp_trans,
ice_state); ice_state);
any_state |= (1 << ice_state); any_state |= (1 << ice_state);
if (ice_state != STATE (CLOSED))
all_closed = FALSE; if (ice_state != STATE (NEW) && ice_state != STATE (CLOSED))
all_new_or_closed = FALSE;
if (ice_state != STATE (COMPLETED) && ice_state != STATE (CLOSED))
all_completed_or_closed = FALSE;
if (ice_state != STATE (CONNECTED) && ice_state != STATE (COMPLETED)
&& ice_state != STATE (CLOSED))
all_connected_completed_or_closed = FALSE;
rtcp_transport = rtcp_transport =
webrtc_transceiver_get_rtcp_dtls_transport (rtp_trans)->transport; webrtc_transceiver_get_rtcp_dtls_transport (rtp_trans)->transport;
@ -828,8 +836,14 @@ _collate_ice_connection_states (GstWebRTCBin * webrtc)
GST_TRACE_OBJECT (webrtc, "transceiver %p RTCP state 0x%x", rtp_trans, GST_TRACE_OBJECT (webrtc, "transceiver %p RTCP state 0x%x", rtp_trans,
ice_state); ice_state);
any_state |= (1 << ice_state); any_state |= (1 << ice_state);
if (ice_state != STATE (CLOSED))
all_closed = FALSE; if (ice_state != STATE (NEW) && ice_state != STATE (CLOSED))
all_new_or_closed = FALSE;
if (ice_state != STATE (COMPLETED) && ice_state != STATE (CLOSED))
all_completed_or_closed = FALSE;
if (ice_state != STATE (CONNECTED) && ice_state != STATE (COMPLETED)
&& ice_state != STATE (CLOSED))
all_connected_completed_or_closed = FALSE;
} }
} }
@ -839,41 +853,34 @@ _collate_ice_connection_states (GstWebRTCBin * webrtc)
GST_TRACE_OBJECT (webrtc, "returning closed"); GST_TRACE_OBJECT (webrtc, "returning closed");
return STATE (CLOSED); return STATE (CLOSED);
} }
/* Any of the RTCIceTransport s are in the failed state. */ /* Any of the RTCIceTransports are in the failed state. */
if (any_state & (1 << STATE (FAILED))) { if (any_state & (1 << STATE (FAILED))) {
GST_TRACE_OBJECT (webrtc, "returning failed"); GST_TRACE_OBJECT (webrtc, "returning failed");
return STATE (FAILED); return STATE (FAILED);
} }
/* Any of the RTCIceTransport s are in the disconnected state and /* Any of the RTCIceTransports are in the disconnected state. */
* none of them are in the failed state. */
if (any_state & (1 << STATE (DISCONNECTED))) { if (any_state & (1 << STATE (DISCONNECTED))) {
GST_TRACE_OBJECT (webrtc, "returning disconnected"); GST_TRACE_OBJECT (webrtc, "returning disconnected");
return STATE (DISCONNECTED); return STATE (DISCONNECTED);
} }
/* Any of the RTCIceTransport's are in the checking state and none of them /* All of the RTCIceTransports are in the new or closed state, or there are
* are in the failed or disconnected state. */ * no transports. */
if (any_state & (1 << STATE (CHECKING))) { if (all_new_or_closed || webrtc->priv->transceivers->len == 0) {
GST_TRACE_OBJECT (webrtc, "returning checking");
return STATE (CHECKING);
}
/* Any of the RTCIceTransport s are in the new state and none of them are
* in the checking, failed or disconnected state, or all RTCIceTransport's
* are in the closed state. */
if ((any_state & (1 << STATE (NEW))) || all_closed) {
GST_TRACE_OBJECT (webrtc, "returning new"); GST_TRACE_OBJECT (webrtc, "returning new");
return STATE (NEW); return STATE (NEW);
} }
/* All RTCIceTransport s are in the connected, completed or closed state /* Any of the RTCIceTransports are in the checking or new state. */
* and at least one of them is in the connected state. */ if ((any_state & (1 << STATE (CHECKING))) || (any_state & (1 << STATE (NEW)))) {
if (any_state & (1 << STATE (CONNECTED) | 1 << STATE (COMPLETED) | 1 << GST_TRACE_OBJECT (webrtc, "returning checking");
STATE (CLOSED)) && any_state & (1 << STATE (CONNECTED))) { return STATE (CHECKING);
GST_TRACE_OBJECT (webrtc, "returning connected");
return STATE (CONNECTED);
} }
/* All RTCIceTransport s are in the completed or closed state and at least /* All RTCIceTransports are in the completed or closed state. */
* one of them is in the completed state. */ if (all_completed_or_closed) {
if (any_state & (1 << STATE (COMPLETED) | 1 << STATE (CLOSED)) GST_TRACE_OBJECT (webrtc, "returning completed");
&& any_state & (1 << STATE (COMPLETED))) { return STATE (COMPLETED);
}
/* All RTCIceTransports are in the connected, completed or closed state. */
if (all_connected_completed_or_closed) {
GST_TRACE_OBJECT (webrtc, "returning connected"); GST_TRACE_OBJECT (webrtc, "returning connected");
return STATE (CONNECTED); return STATE (CONNECTED);
} }