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: Don't require fixed caps when querying caps for a transceiver pad to match it with a media

Browse source 
Upstream caps might for example be
  application/x-rtp,media=audio,encoding-name={OPUS, X-GST-OPUS-DRAFT-SPITTKA-00, multiopus}
and while that is not fixed caps it is enough to match it with a media.

Only caps structures that have the correct structure name and that have
the media and encoding-name field are preserved, but if both are present
then these caps are used as "codec preferences".

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1291>
This commit is contained in:
Sebastian Dröge 2021-11-02 11:21:34 +02:00 committed by GStreamer Marge Bot
parent a46ab2ced2
commit d628ccf0e5
1 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1663,17 +1663,46 @@ _query_pad_caps (GstWebRTCBin * webrtc, GstWebRTCRTPTransceiver * rtp_trans,
GstWebRTCBinPad * pad, GstCaps * filter, GError ** error)
{
GstCaps *caps;
guint i, n;
caps = gst_pad_peer_query_caps (GST_PAD (pad), filter);
GST_LOG_OBJECT (webrtc, "Using peer query caps: %" GST_PTR_FORMAT, caps);
/* Only return an error if actual empty caps were returned from the query. */
if (gst_caps_is_empty (caps)) {
g_set_error (error, GST_WEBRTC_BIN_ERROR,
GST_WEBRTC_BIN_ERROR_CAPS_NEGOTIATION_FAILED,
"Caps negotiation on pad %s failed", GST_PAD_NAME (pad));
gst_clear_caps (&caps);
} else if (!gst_caps_is_fixed (caps) || gst_caps_is_equal (caps, filter)
|| gst_caps_is_empty (caps) || gst_caps_is_any (caps)) {
gst_caps_unref (filter);
return NULL;
}
n = gst_caps_get_size (caps);
if (n > 0) {
/* Make sure the caps are complete enough to figure out the media type and
* encoding-name, otherwise they would match with basically any media. */
caps = gst_caps_make_writable (caps);
for (i = n; i > 0; i--) {
const GstStructure *s = gst_caps_get_structure (caps, i - 1);
if (!gst_structure_has_name (s, "application/x-rtp") ||
!gst_structure_has_field (s, "media") ||
!gst_structure_has_field (s, "encoding-name")) {
gst_caps_remove_structure (caps, i - 1);
}
}
}
/* If the filtering above resulted in empty caps, or the caps were ANY to
* begin with, then don't report and error but just NULL.
*
* This would be the case if negotiation would not fail but the peer does
* not have any specific enough preferred caps that would allow us to
* use them further.
*/
if (gst_caps_is_any (caps) || gst_caps_is_empty (caps)) {
GST_DEBUG_OBJECT (webrtc, "Peer caps not specific enough");
gst_clear_caps (&caps);
}