mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-13 01:46:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

webrtcbin: fix bundle none case with remote offer bundling

Browse source 
If the remote is bundling, but we are not and remote is offering.
we cannot put the remote media sections into a bundled transport as that
is not how we are going to respond.

This specific failure case was that the remote ICE credentials were
never set on the ice stream and so ice connectivity would fail.

Technically, this whole bunde-policy=none handling should be removed
eventually when we implement bundle-policy=balanced.  Until such time,
we have this workaround.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1231>
This commit is contained in:
Matthew Waters 2020-05-01 00:47:53 +10:00 committed by GStreamer Merge Bot
parent 2510052d12
commit ce9b41f5d4
3 changed files with 35 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
ext/webrtc/gstwebrtcbin.c
View file

@ -4105,8 +4105,9 @@ _update_transceivers_from_sdp (GstWebRTCBin * webrtc, SDPSource source,
/* FIXME: With some peers, it's possible we could have
* multiple bundles to deal with, although I've never seen one yet */
if (!_parse_bundle (sdp->sdp, &bundled))
goto done;
if (webrtc->bundle_policy != GST_WEBRTC_BUNDLE_POLICY_NONE)
if (!_parse_bundle (sdp->sdp, &bundled))
goto done;
if (bundled) {
@ -4255,8 +4256,9 @@ _set_description_task (GstWebRTCBin * webrtc, struct set_description *sd)
goto out;
}
if (!_parse_bundle (sd->sdp->sdp, &bundled))
goto out;
if (webrtc->bundle_policy != GST_WEBRTC_BUNDLE_POLICY_NONE)
if (!_parse_bundle (sd->sdp->sdp, &bundled))
goto out;
if (bundled) {
if (!_get_bundle_index (sd->sdp->sdp, bundled, &bundle_idx)) {
@ -4412,6 +4414,7 @@ _set_description_task (GstWebRTCBin * webrtc, struct set_description *sd)
}
for (i = 0; i < gst_sdp_message_medias_len (sd->sdp->sdp); i++) {
const GstSDPMedia *media = gst_sdp_message_get_media (sd->sdp->sdp, i);
gchar *ufrag, *pwd;
TransportStream *item;
@ -4420,7 +4423,6 @@ _set_description_task (GstWebRTCBin * webrtc, struct set_description *sd)
_message_media_is_datachannel (sd->sdp->sdp, bundled ? bundle_idx : i));
if (sd->source == SDP_REMOTE) {
const GstSDPMedia *media = gst_sdp_message_get_media (sd->sdp->sdp, i);
guint j;
for (j = 0; j < gst_sdp_media_attributes_len (media); j++) {
@ -4443,20 +4445,21 @@ _set_description_task (GstWebRTCBin * webrtc, struct set_description *sd)
}
}
if (bundled && bundle_idx != i)
continue;
if (sd->source == SDP_LOCAL && (!bundled || bundle_idx == i)) {
_get_ice_credentials_from_sdp_media (sd->sdp->sdp, i, &ufrag, &pwd);
_get_ice_credentials_from_sdp_media (sd->sdp->sdp, i, &ufrag, &pwd);
if (sd->source == SDP_LOCAL) {
gst_webrtc_ice_set_local_credentials (webrtc->priv->ice,
item->stream, ufrag, pwd);
} else {
g_free (ufrag);
g_free (pwd);
} else if (sd->source == SDP_REMOTE && !_media_is_bundle_only (media)) {
_get_ice_credentials_from_sdp_media (sd->sdp->sdp, i, &ufrag, &pwd);
gst_webrtc_ice_set_remote_credentials (webrtc->priv->ice,
item->stream, ufrag, pwd);
g_free (ufrag);
g_free (pwd);
}
g_free (ufrag);
g_free (pwd);
}
if (sd->source == SDP_LOCAL) {

16
ext/webrtc/webrtcsdp.c
View file

@ -919,3 +919,19 @@ _get_bundle_index (GstSDPMessage * sdp, GStrv bundled, guint * idx)
return ret;
}
gboolean
_media_is_bundle_only (const GstSDPMedia * media)
{
int i;
for (i = 0; i < gst_sdp_media_attributes_len (media); i++) {
const GstSDPAttribute *attr = gst_sdp_media_get_attribute (media, i);
if (g_strcmp0 (attr->key, "bundle-only") == 0) {
return TRUE;
}
}
return FALSE;
}

3
ext/webrtc/webrtcsdp.h
View file

@ -107,4 +107,7 @@ G_GNUC_INTERNAL
const gchar * _media_get_ice_ufrag (const GstSDPMessage * msg,
guint media_idx);
G_GNUC_INTERNAL
gboolean _media_is_bundle_only (const GstSDPMedia * sdp);
#endif /* __WEBRTC_UTILS_H__ */