mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

webrtcbin: Intersect answer with codec prefs & capabilities

Browse source 
In case the local capabilities changed since the last negotiaton,
we need to re-intersect and see if the result would be different.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2183>
This commit is contained in:
Olivier Crête 2021-05-06 17:58:15 -04:00
parent 3065ac49fb
commit f34be8a3bd
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ext/webrtc/gstwebrtcbin.c
View file

@ -3618,18 +3618,33 @@ _create_answer_task (GstWebRTCBin * webrtc, const GstStructure * options,
gst_sdp_message_get_media (last_answer, i); gst_sdp_message_get_media (last_answer, i);
const gchar *last_mid = const gchar *last_mid =
gst_sdp_media_get_attribute_val (last_media, "mid"); gst_sdp_media_get_attribute_val (last_media, "mid");
GstCaps *current_caps;
/* FIXME: assumes no shenanigans with recycling transceivers */ /* FIXME: assumes no shenanigans with recycling transceivers */
g_assert (g_strcmp0 (mid, last_mid) == 0); g_assert (g_strcmp0 (mid, last_mid) == 0);
if (!answer_caps) current_caps = _find_codec_preferences (webrtc, rtp_trans, i, error);
answer_caps = _find_codec_preferences (webrtc, rtp_trans, i, error);
if (*error) { if (*error) {
gst_caps_unref (offer_caps); gst_caps_unref (offer_caps);
goto rejected; goto rejected;
} }
if (!answer_caps) if (!current_caps)
answer_caps = _rtp_caps_from_media (last_media); current_caps = _rtp_caps_from_media (last_media);
if (current_caps) {
answer_caps = gst_caps_intersect (offer_caps, current_caps);
if (gst_caps_is_empty (answer_caps)) {
GST_WARNING_OBJECT (webrtc, "Caps from offer for m-line %d (%"
GST_PTR_FORMAT ") don't intersect with caps from codec"
" preferences and transceiver %" GST_PTR_FORMAT, i, offer_caps,
current_caps);
gst_caps_unref (current_caps);
gst_caps_unref (answer_caps);
gst_caps_unref (offer_caps);
goto rejected;
}
gst_caps_unref (current_caps);
}
/* XXX: In theory we're meant to use the sendrecv formats for the /* XXX: In theory we're meant to use the sendrecv formats for the
* inactive direction however we don't know what that may be and would * inactive direction however we don't know what that may be and would