mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 04:56:14 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpsrc: Cleanup on BYE, timeout or when pad is reused

Browse source 
In this patch, we enabled 'autoremove' feature of rtpbin and also call
'clear-ssrc' on the rtpssrcdemux element when a pad is being reused. This
ensure that the jitterbuffer is removed and no threads accumulates.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1575>
This commit is contained in:
Nicolas Dufresne 2020-09-23 16:43:30 -04:00 committed by GStreamer Merge Bot
parent 2fcbb4386b
commit dcb3044478
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gst/rtp/gstrtpsrc.c
View file

@ -45,6 +45,8 @@
#include <config.h> #include <config.h>
#endif #endif
#include <stdio.h>
#include <gst/net/net.h> #include <gst/net/net.h>
#include <gst/rtp/gstrtppayloads.h> #include <gst/rtp/gstrtppayloads.h>
@ -420,6 +422,26 @@ gst_rtp_src_class_init (GstRtpSrcClass * klass)
"Simple RTP src", "Marc Leeman <marc.leeman@gmail.com>"); "Simple RTP src", "Marc Leeman <marc.leeman@gmail.com>");
} }
static void
clear_ssrc (GstElement * rtpbin, GstPad * gpad)
{
GstPad *pad;
gint pt;
guint ssrc;
pad = gst_ghost_pad_get_target (GST_GHOST_PAD (gpad));
if (!pad)
return;
if (sscanf (GST_PAD_NAME (pad), "recv_rtp_src_0_%u_%d", &ssrc, &pt) != 2) {
gst_object_unref (pad);
return;
}
gst_object_unref (pad);
g_signal_emit_by_name (rtpbin, "clear-ssrc", 0, ssrc);
}
static void static void
gst_rtp_src_rtpbin_pad_added_cb (GstElement * element, GstPad * pad, gst_rtp_src_rtpbin_pad_added_cb (GstElement * element, GstPad * pad,
gpointer data) gpointer data)
@ -477,6 +499,7 @@ gst_rtp_src_rtpbin_pad_added_cb (GstElement * element, GstPad * pad,
gst_element_add_pad (GST_ELEMENT (self), upad); gst_element_add_pad (GST_ELEMENT (self), upad);
} else { } else {
GST_DEBUG_OBJECT (self, "Re-using existing pad: %s", GST_PAD_NAME (upad)); GST_DEBUG_OBJECT (self, "Re-using existing pad: %s", GST_PAD_NAME (upad));
clear_ssrc (element, upad);
gst_ghost_pad_set_target (GST_GHOST_PAD (upad), pad); gst_ghost_pad_set_target (GST_GHOST_PAD (upad), pad);
gst_object_unref (upad); gst_object_unref (upad);
} }
@ -752,6 +775,7 @@ gst_rtp_src_init (GstRtpSrc * self)
missing_plugin = "rtpmanager"; missing_plugin = "rtpmanager";
goto missing_plugin; goto missing_plugin;
} }
g_object_set (self->rtpbin, "autoremove", TRUE, NULL);
gst_bin_add (GST_BIN (self), self->rtpbin); gst_bin_add (GST_BIN (self), self->rtpbin);