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: Make request-pad validation an early return

Browse source 
This reduces the indendation.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2104>
This commit is contained in:
Olivier Crête 2021-03-26 15:02:50 -04:00
parent 0f758a1730
commit 0e2d128bec
1 changed files with 52 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
ext/webrtc/gstwebrtcbin.c
View file

@ -6194,66 +6194,66 @@ gst_webrtc_bin_request_new_pad (GstElement * element, GstPadTemplate * templ,
const gchar * name, const GstCaps * caps) const gchar * name, const GstCaps * caps)
{ {
GstWebRTCBin *webrtc = GST_WEBRTC_BIN (element); GstWebRTCBin *webrtc = GST_WEBRTC_BIN (element);
GstWebRTCRTPTransceiver *trans;
GstWebRTCBinPad *pad = NULL; GstWebRTCBinPad *pad = NULL;
GstWebRTCBinPad *pad2;
guint serial; guint serial;
if (!_have_nice_elements (webrtc) || !_have_dtls_elements (webrtc)) if (!_have_nice_elements (webrtc) || !_have_dtls_elements (webrtc))
return NULL; return NULL;
if (templ->direction == GST_PAD_SINK || if (templ->direction != GST_PAD_SINK ||
g_strcmp0 (templ->name_template, "sink_%u") == 0) { g_strcmp0 (templ->name_template, "sink_%u") != 0) {
GstWebRTCRTPTransceiver *trans; GST_ERROR_OBJECT (element, "Requested pad that shouldn't be requestable");
GstWebRTCBinPad *pad2; return NULL;
GST_OBJECT_LOCK (webrtc);
if (name == NULL || strlen (name) < 6 || !g_str_has_prefix (name, "sink_")) {
/* no name given when requesting the pad, use next available int */
serial = webrtc->priv->max_sink_pad_serial++;
} else {
/* parse serial number from requested padname */
serial = g_ascii_strtoull (&name[5], NULL, 10);
if (serial > webrtc->priv->max_sink_pad_serial)
webrtc->priv->max_sink_pad_serial = serial;
}
GST_OBJECT_UNLOCK (webrtc);
trans = _find_transceiver_for_mline (webrtc, serial);
/* Ignore transceivers that already have a pad allocated */
pad2 = _find_pad_for_transceiver (webrtc, GST_PAD_SINK, trans);
if (pad2) {
serial = -1;
trans = NULL;
gst_object_unref (pad2);
}
if (!trans) {
trans =
GST_WEBRTC_RTP_TRANSCEIVER (_create_webrtc_transceiver (webrtc,
GST_WEBRTC_RTP_TRANSCEIVER_DIRECTION_SENDRECV, -1));
GST_LOG_OBJECT (webrtc, "Created new transceiver %" GST_PTR_FORMAT,
trans);
} else {
GST_LOG_OBJECT (webrtc, "Using existing transceiver %" GST_PTR_FORMAT
" for mline %u", trans, serial);
}
pad = _create_pad_for_sdp_media (webrtc, GST_PAD_SINK, trans, serial);
if (caps && name && !_update_transceiver_kind_from_caps (trans, caps))
GST_WARNING_OBJECT (webrtc,
"Trying to create pad %s with caps %" GST_PTR_FORMAT
" but transceiver %d already exists with a different"
" media type", name, caps, serial);
pad->block_id = gst_pad_add_probe (GST_PAD (pad), GST_PAD_PROBE_TYPE_BLOCK |
GST_PAD_PROBE_TYPE_BUFFER | GST_PAD_PROBE_TYPE_BUFFER_LIST,
(GstPadProbeCallback) sink_pad_block, NULL, NULL);
webrtc->priv->pending_sink_transceivers =
g_list_append (webrtc->priv->pending_sink_transceivers,
gst_object_ref (pad));
_add_pad (webrtc, pad);
} }
GST_OBJECT_LOCK (webrtc);
if (name == NULL || strlen (name) < 6 || !g_str_has_prefix (name, "sink_")) {
/* no name given when requesting the pad, use next available int */
serial = webrtc->priv->max_sink_pad_serial++;
} else {
/* parse serial number from requested padname */
serial = g_ascii_strtoull (&name[5], NULL, 10);
if (serial > webrtc->priv->max_sink_pad_serial)
webrtc->priv->max_sink_pad_serial = serial;
}
GST_OBJECT_UNLOCK (webrtc);
trans = _find_transceiver_for_mline (webrtc, serial);
/* Ignore transceivers that already have a pad allocated */
pad2 = _find_pad_for_transceiver (webrtc, GST_PAD_SINK, trans);
if (pad2) {
serial = -1;
trans = NULL;
gst_object_unref (pad2);
}
if (!trans) {
trans = GST_WEBRTC_RTP_TRANSCEIVER (_create_webrtc_transceiver (webrtc,
GST_WEBRTC_RTP_TRANSCEIVER_DIRECTION_SENDRECV, -1));
GST_LOG_OBJECT (webrtc, "Created new transceiver %" GST_PTR_FORMAT, trans);
} else {
GST_LOG_OBJECT (webrtc, "Using existing transceiver %" GST_PTR_FORMAT
" for mline %u", trans, serial);
}
pad = _create_pad_for_sdp_media (webrtc, GST_PAD_SINK, trans, serial);
if (caps && name && !_update_transceiver_kind_from_caps (trans, caps))
GST_WARNING_OBJECT (webrtc,
"Trying to create pad %s with caps %" GST_PTR_FORMAT
" but transceiver %d already exists with a different"
" media type", name, caps, serial);
pad->block_id = gst_pad_add_probe (GST_PAD (pad), GST_PAD_PROBE_TYPE_BLOCK |
GST_PAD_PROBE_TYPE_BUFFER | GST_PAD_PROBE_TYPE_BUFFER_LIST,
(GstPadProbeCallback) sink_pad_block, NULL, NULL);
webrtc->priv->pending_sink_transceivers =
g_list_append (webrtc->priv->pending_sink_transceivers,
gst_object_ref (pad));
_add_pad (webrtc, pad);
return GST_PAD (pad); return GST_PAD (pad);
} }