mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpssrcdemux: do not hold custom PAD_LOCK when pushing downstream

Browse source
This commit is contained in:
Mark Nauwelaerts 2010-12-02 16:11:01 +01:00
parent 0f2373cbd1
commit 46c91476eb
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gst/rtpmanager/gstrtpssrcdemux.c
View file

@ -427,16 +427,28 @@ gst_rtp_ssrc_demux_sink_event (GstPad * pad, GstEvent * event)
default: default:
{ {
GSList *walk; GSList *walk;
GSList *pads = NULL;
res = TRUE; res = TRUE;
/* need local snapshot of pads;
* should not push downstream while holding lock as that might deadlock
* with stuff traveling upstream tyring to get this lock while holding
* other (stream)lock */
GST_PAD_LOCK (demux); GST_PAD_LOCK (demux);
for (walk = demux->srcpads; walk; walk = g_slist_next (walk)) { for (walk = demux->srcpads; walk; walk = g_slist_next (walk)) {
GstRtpSsrcDemuxPad *pad = (GstRtpSsrcDemuxPad *) walk->data; GstRtpSsrcDemuxPad *pad = (GstRtpSsrcDemuxPad *) walk->data;
gst_event_ref (event); pads = g_slist_prepend (pads, gst_object_ref (pad->rtp_pad));
res &= gst_pad_push_event (pad->rtp_pad, event);
} }
GST_PAD_UNLOCK (demux); GST_PAD_UNLOCK (demux);
for (walk = pads; walk; walk = g_slist_next (walk)) {
GstPad *pad = (GstPad *) walk->data;
gst_event_ref (event);
res &= gst_pad_push_event (pad, event);
gst_object_unref (pad);
}
g_slist_free (pads);
gst_event_unref (event); gst_event_unref (event);
break; break;
} }
@ -459,16 +471,24 @@ gst_rtp_ssrc_demux_rtcp_sink_event (GstPad * pad, GstEvent * event)
default: default:
{ {
GSList *walk; GSList *walk;
GSList *pads = NULL;
res = TRUE; res = TRUE;
GST_PAD_LOCK (demux); GST_PAD_LOCK (demux);
for (walk = demux->srcpads; walk; walk = g_slist_next (walk)) { for (walk = demux->srcpads; walk; walk = g_slist_next (walk)) {
GstRtpSsrcDemuxPad *pad = (GstRtpSsrcDemuxPad *) walk->data; GstRtpSsrcDemuxPad *pad = (GstRtpSsrcDemuxPad *) walk->data;
gst_event_ref (event); pads = g_slist_prepend (pads, gst_object_ref (pad->rtcp_pad));
res &= gst_pad_push_event (pad->rtcp_pad, event);
} }
GST_PAD_UNLOCK (demux); GST_PAD_UNLOCK (demux);
for (walk = pads; walk; walk = g_slist_next (walk)) {
GstPad *pad = (GstPad *) walk->data;
gst_event_ref (event);
res &= gst_pad_push_event (pad, event);
gst_object_unref (pad);
}
g_slist_free (pads);
gst_event_unref (event); gst_event_unref (event);
break; break;
} }