summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Waters <matthew@centricular.com>2021-07-27 17:44:02 +1000
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>2021-07-28 04:16:58 +0000
commit32170aa6c2c46aed1a5795f62c6e458d448f65bb (patch)
tree3f8066f01a3a285d29892c694a665f9fb9f01a91
parent17cb6836158cc7e496c466482221d04a54db392e (diff)
downloadgstreamer-plugins-base-32170aa6c2c46aed1a5795f62c6e458d448f65bb.tar.gz
rtpbasedepayload: remove object locking an extension
Doing that is fraught with danger of deadlocks and is not conceptually part of the API contract. The object lock is generally intended for internal-object-use only. If another lock is needed, that should be added separately. This lock was erronously added as part of: https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1118 Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1233>
-rw-r--r--gst-libs/gst/rtp/gstrtpbasedepayload.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/gst-libs/gst/rtp/gstrtpbasedepayload.c b/gst-libs/gst/rtp/gstrtpbasedepayload.c
index cd2fd7618..811d4e607 100644
--- a/gst-libs/gst/rtp/gstrtpbasedepayload.c
+++ b/gst-libs/gst/rtp/gstrtpbasedepayload.c
@@ -1233,12 +1233,10 @@ read_rtp_header_extensions (GstRTPBaseDepayload * depayload,
}
if (ext) {
- GST_OBJECT_LOCK (ext);
if (!gst_rtp_header_extension_read (ext, ext_flags, &pdata[offset],
read_len, output)) {
GST_WARNING_OBJECT (depayload, "RTP header extension (%s) could "
"not read payloaded data", GST_OBJECT_NAME (ext));
- GST_OBJECT_UNLOCK (ext);
gst_object_unref (ext);
goto out;
}
@@ -1247,7 +1245,6 @@ read_rtp_header_extensions (GstRTPBaseDepayload * depayload,
needs_src_caps_update = TRUE;
}
- GST_OBJECT_UNLOCK (ext);
gst_object_unref (ext);
}
GST_OBJECT_UNLOCK (depayload);