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

webrtcbin: Allow locked mlines with no caps, as the last ones

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2439>
This commit is contained in:
Olivier Crête 2022-07-05 17:14:37 -04:00
parent 0930c467d4
commit 4b3b234f72
2 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3200,7 +3200,7 @@ sdp_media_from_transceiver (GstWebRTCBin * webrtc, GstSDPMedia * media,
const GstSDPMedia * last_media, GstWebRTCRTPTransceiver * trans,
guint media_idx, GString * bundled_mids, guint bundle_idx,
gchar * bundle_ufrag, gchar * bundle_pwd, GArray * media_mapping,
GHashTable * all_mids, GError ** error)
GHashTable * all_mids, gboolean * no_more_mlines, GError ** error)
{
/* TODO:
* rtp header extensions
@ -3258,11 +3258,11 @@ sdp_media_from_transceiver (GstWebRTCBin * webrtc, GstSDPMedia * media,
if (!caps) {
if (WEBRTC_TRANSCEIVER (trans)->mline_locked) {
g_set_error (error, GST_WEBRTC_ERROR,
GST_WEBRTC_ERROR_INTERNAL_FAILURE,
GST_WARNING_OBJECT (webrtc,
"Transceiver <%s> with mid %s has locked mline %u, but no caps. "
"Can't produce offer.", GST_OBJECT_NAME (trans), trans->mid,
trans->mline);
"Can't add more lines after this one.", GST_OBJECT_NAME (trans),
trans->mid, trans->mline);
*no_more_mlines = TRUE;
} else {
GST_WARNING_OBJECT (webrtc, "no caps available for transceiver %"
GST_PTR_FORMAT ", skipping", trans);
@ -3676,6 +3676,7 @@ _create_offer_task (GstWebRTCBin * webrtc, const GstStructure * options,
GList *seen_transceivers = NULL;
guint media_idx = 0;
int i;
gboolean no_more_mlines = FALSE;
gst_sdp_message_new (&ret);
@ -3780,7 +3781,7 @@ _create_offer_task (GstWebRTCBin * webrtc, const GstStructure * options,
gst_sdp_media_init (&media);
if (!sdp_media_from_transceiver (webrtc, &media, last_media, trans,
media_idx, bundled_mids, 0, bundle_ufrag, bundle_pwd,
media_mapping, all_mids, error)) {
media_mapping, all_mids, &no_more_mlines, error)) {
gst_sdp_media_uninit (&media);
if (!*error)
g_set_error_literal (error, GST_WEBRTC_ERROR,
@ -3856,9 +3857,11 @@ _create_offer_task (GstWebRTCBin * webrtc, const GstStructure * options,
trans = _find_transceiver_for_mline (webrtc, media_idx);
if (trans) {
/* We can't have seen it already, because it is locked to this line */
g_assert (!g_list_find (seen_transceivers, trans));
seen_transceivers = g_list_prepend (seen_transceivers, trans);
/* We can't have seen it already, because it is locked to this line,
* unless it's a no-more-mlines case
*/
if (!g_list_find (seen_transceivers, trans))
seen_transceivers = g_list_prepend (seen_transceivers, trans);
} else {
/* Otherwise find a free transceiver */
for (i = 0; i < webrtc->priv->transceivers->len; i++) {
@ -3898,6 +3901,15 @@ _create_offer_task (GstWebRTCBin * webrtc, const GstStructure * options,
gst_sdp_media_init (&media);
if (_add_data_channel_offer (webrtc, ret, &media, bundled_mids, 0,
bundle_ufrag, bundle_pwd, all_mids)) {
if (no_more_mlines) {
g_set_error (error, GST_WEBRTC_ERROR,
GST_WEBRTC_ERROR_INTERNAL_FAILURE,
"Trying to add data channel but there is a"
" transceiver locked to line %d which doesn't have caps",
media_idx);
gst_sdp_media_uninit (&media);
goto cancel_offer;
}
gst_sdp_message_add_media (ret, &media);
media_idx++;
continue;
@ -3928,6 +3940,15 @@ _create_offer_task (GstWebRTCBin * webrtc, const GstStructure * options,
}
}
if (no_more_mlines) {
g_set_error (error, GST_WEBRTC_ERROR,
GST_WEBRTC_ERROR_INTERNAL_FAILURE,
"Trying to add transceiver at line %u but there is a transceiver "
"with a locked mline for this line which doesn't have caps",
media_idx);
goto cancel_offer;
}
gst_sdp_media_init (&media);
if (webrtc->bundle_policy == GST_WEBRTC_BUNDLE_POLICY_NONE) {
@ -3940,7 +3961,7 @@ _create_offer_task (GstWebRTCBin * webrtc, const GstStructure * options,
if (sdp_media_from_transceiver (webrtc, &media, NULL, trans, media_idx,
bundled_mids, 0, bundle_ufrag, bundle_pwd, media_mapping, all_mids,
error)) {
&no_more_mlines, error)) {
/* as per JSEP, a=rtcp-mux-only is only added for new streams */
gst_sdp_media_add_attribute (&media, "rtcp-mux-only", "");
gst_sdp_message_add_media (ret, &media);

4
subprojects/gst-plugins-bad/tests/check/elements/webrtcbin.c
View file

@ -4087,8 +4087,8 @@ GST_START_TEST (test_reject_create_offer_mline_locked_no_caps)
fail_unless (g_error_matches (error, GST_WEBRTC_ERROR,
GST_WEBRTC_ERROR_INTERNAL_FAILURE));
fail_unless_equals_string (error->message,
"Transceiver <webrtctransceiver0> with mid (null) has locked mline 0,"
" but no caps. Can't produce offer.");
"Trying to add transceiver at line 0 but there is a transceiver with a"
" locked mline for this line which doesn't have caps");
g_clear_error (&error);
gst_promise_unref (promise);