mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-02 12:45:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

webrtcbin: Check data channel transport for notifying 'ice-gathering-state'

Browse source 
Previously, it did not care about data channel's. It is fixed by adding
some conditions.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1957>
This commit is contained in:
Sangchul Lee 2022-03-10 19:22:52 +09:00 committed by GStreamer Marge Bot
parent 1ae7ea508d
commit 2f7c843f2b
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcbin.c
View file

@ -1102,7 +1102,11 @@ _collate_ice_gathering_states (GstWebRTCBin * webrtc)
{
#define STATE(val) GST_WEBRTC_ICE_GATHERING_STATE_ ## val
GstWebRTCICEGatheringState any_state = 0;
gboolean all_completed = webrtc->priv->transceivers->len > 0;
GstWebRTCICEGatheringState ice_state;
GstWebRTCDTLSTransport *dtls_transport;
GstWebRTCICETransport *transport;
gboolean all_completed = webrtc->priv->transceivers->len > 0 ||
webrtc->priv->data_channel_transport;
int i;
for (i = 0; i < webrtc->priv->transceivers->len; i++) {
@ -1110,9 +1114,6 @@ _collate_ice_gathering_states (GstWebRTCBin * webrtc)
g_ptr_array_index (webrtc->priv->transceivers, i);
WebRTCTransceiver *trans = WEBRTC_TRANSCEIVER (rtp_trans);
TransportStream *stream = trans->stream;
GstWebRTCDTLSTransport *dtls_transport;
GstWebRTCICETransport *transport;
GstWebRTCICEGatheringState ice_state;
if (rtp_trans->stopped || stream == NULL) {
GST_TRACE_OBJECT (webrtc, "transceiver %p stopped or unassociated",
@ -1143,6 +1144,20 @@ _collate_ice_gathering_states (GstWebRTCBin * webrtc)
all_completed = FALSE;
}
/* check data channel transport gathering state */
if (all_completed && webrtc->priv->data_channel_transport) {
if ((dtls_transport = webrtc->priv->data_channel_transport->transport)) {
transport = dtls_transport->transport;
g_object_get (transport, "gathering-state", &ice_state, NULL);
GST_TRACE_OBJECT (webrtc,
"data channel transport %p gathering state: 0x%x", dtls_transport,
ice_state);
any_state |= (1 << ice_state);
if (ice_state != STATE (COMPLETE))
all_completed = FALSE;
}
}
GST_TRACE_OBJECT (webrtc, "ICE gathering state: 0x%x", any_state);
/* Any of the RTCIceTransport s are in the gathering state. */