mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-16 19:38:35 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpssrcdemux: refactor destruction of GstRtpSsrcDemuxPads

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/992>
This commit is contained in:
Havard Graff 2021-05-21 18:45:17 +02:00 committed by GStreamer Marge Bot
parent c721c6fe72
commit de3a3882e9
1 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
gst/rtpmanager/gstrtpssrcdemux.c
View file

@ -515,22 +515,23 @@ gst_rtp_ssrc_demux_init (GstRtpSsrcDemux * demux)
g_rec_mutex_init (&demux->padlock);
}
static void
gst_rtp_ssrc_demux_pads_free (GstRtpSsrcDemuxPads * dpads)
{
gst_pad_set_active (dpads->rtp_pad, FALSE);
gst_pad_set_active (dpads->rtcp_pad, FALSE);
gst_element_remove_pad (GST_PAD_PARENT (dpads->rtp_pad), dpads->rtp_pad);
gst_element_remove_pad (GST_PAD_PARENT (dpads->rtcp_pad), dpads->rtcp_pad);
g_free (dpads);
}
static void
gst_rtp_ssrc_demux_reset (GstRtpSsrcDemux * demux)
{
GSList *walk;
for (walk = demux->srcpads; walk; walk = g_slist_next (walk)) {
GstRtpSsrcDemuxPads *dpads = (GstRtpSsrcDemuxPads *) walk->data;
gst_pad_set_active (dpads->rtp_pad, FALSE);
gst_pad_set_active (dpads->rtcp_pad, FALSE);
gst_element_remove_pad (GST_ELEMENT_CAST (demux), dpads->rtp_pad);
gst_element_remove_pad (GST_ELEMENT_CAST (demux), dpads->rtcp_pad);
g_free (dpads);
}
g_slist_free (demux->srcpads);
g_slist_free_full (demux->srcpads,
(GDestroyNotify) gst_rtp_ssrc_demux_pads_free);
demux->srcpads = NULL;
}
@ -574,17 +575,11 @@ gst_rtp_ssrc_demux_clear_ssrc (GstRtpSsrcDemux * demux, guint32 ssrc)
demux->srcpads = g_slist_remove (demux->srcpads, dpads);
GST_OBJECT_UNLOCK (demux);
gst_pad_set_active (dpads->rtp_pad, FALSE);
gst_pad_set_active (dpads->rtcp_pad, FALSE);
g_signal_emit (G_OBJECT (demux),
gst_rtp_ssrc_demux_signals[SIGNAL_REMOVED_SSRC_PAD], 0, ssrc,
dpads->rtp_pad);
gst_element_remove_pad (GST_ELEMENT_CAST (demux), dpads->rtp_pad);
gst_element_remove_pad (GST_ELEMENT_CAST (demux), dpads->rtcp_pad);
g_free (dpads);
gst_rtp_ssrc_demux_pads_free (dpads);
return;