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

rtpssrcdemux: Use iterate internal links instead of deprecated get internal links

Browse source
This commit is contained in:
Sebastian Dröge 2009-08-19 16:37:11 +02:00
parent a04bd15571
commit 97cb7bdb6c
1 changed files with 83 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
gst/rtpmanager/gstrtpssrcdemux.c
View file

@ -128,7 +128,7 @@ static gboolean gst_rtp_ssrc_demux_rtcp_sink_event (GstPad * pad,
/* srcpad stuff */ /* srcpad stuff */
static gboolean gst_rtp_ssrc_demux_src_event (GstPad * pad, GstEvent * event); static gboolean gst_rtp_ssrc_demux_src_event (GstPad * pad, GstEvent * event);
static GList *gst_rtp_ssrc_demux_internal_links (GstPad * pad); static GstIterator *gst_rtp_ssrc_demux_iterate_internal_links (GstPad * pad);
static gboolean gst_rtp_ssrc_demux_src_query (GstPad * pad, GstQuery * query); static gboolean gst_rtp_ssrc_demux_src_query (GstPad * pad, GstQuery * query);
static guint gst_rtp_ssrc_demux_signals[LAST_SIGNAL] = { 0 }; static guint gst_rtp_ssrc_demux_signals[LAST_SIGNAL] = { 0 };
@ -211,12 +211,12 @@ create_demux_pad_for_ssrc (GstRtpSsrcDemux * demux, guint32 ssrc,
gst_pad_set_event_function (rtp_pad, gst_rtp_ssrc_demux_src_event); gst_pad_set_event_function (rtp_pad, gst_rtp_ssrc_demux_src_event);
gst_pad_set_query_function (rtp_pad, gst_rtp_ssrc_demux_src_query); gst_pad_set_query_function (rtp_pad, gst_rtp_ssrc_demux_src_query);
gst_pad_set_internal_link_function (rtp_pad, gst_pad_set_iterate_internal_links_function (rtp_pad,
gst_rtp_ssrc_demux_internal_links); gst_rtp_ssrc_demux_iterate_internal_links);
gst_pad_set_active (rtp_pad, TRUE); gst_pad_set_active (rtp_pad, TRUE);
gst_pad_set_internal_link_function (rtcp_pad, gst_pad_set_iterate_internal_links_function (rtcp_pad,
gst_rtp_ssrc_demux_internal_links); gst_rtp_ssrc_demux_iterate_internal_links);
gst_pad_set_active (rtcp_pad, TRUE); gst_pad_set_active (rtcp_pad, TRUE);
gst_element_add_pad (GST_ELEMENT_CAST (demux), rtp_pad); gst_element_add_pad (GST_ELEMENT_CAST (demux), rtp_pad);
@ -619,35 +619,95 @@ gst_rtp_ssrc_demux_src_event (GstPad * pad, GstEvent * event)
return res; return res;
} }
static GList * typedef struct
gst_rtp_ssrc_demux_internal_links (GstPad * pad)
{ {
GstIterator parent;
GstRtpSsrcDemux *demux; GstRtpSsrcDemux *demux;
GList *res = NULL; GstPad *pad;
GSList *walk; GSList *current;
} GstRtpSsrcDemuxIterator;
demux = GST_RTP_SSRC_DEMUX (gst_pad_get_parent (pad)); static void
_iterate_free (GstIterator * it)
{
GstRtpSsrcDemuxIterator *dit = (GstRtpSsrcDemuxIterator *) it;
GST_PAD_LOCK (demux); g_object_unref (dit->demux);
for (walk = demux->srcpads; walk; walk = g_slist_next (walk)) { g_object_unref (dit->pad);
GstRtpSsrcDemuxPad *dpad = (GstRtpSsrcDemuxPad *) walk->data;
if (pad == demux->rtp_sink) { g_free (it);
res = g_list_prepend (res, dpad->rtp_pad); }
} else if (pad == demux->rtcp_sink) {
res = g_list_prepend (res, dpad->rtcp_pad); static GstIteratorResult
} else if (pad == dpad->rtp_pad) { _iterate_next (GstIterator * it, gpointer * result)
res = g_list_prepend (res, demux->rtp_sink); {
GstRtpSsrcDemuxIterator *dit = (GstRtpSsrcDemuxIterator *) it;
GSList *current;
GstPad *res = NULL;
for (current = dit->current; current; current = g_slist_next (current)) {
GstRtpSsrcDemuxPad *dpad = (GstRtpSsrcDemuxPad *) current->data;
if (dit->pad == dit->demux->rtp_sink) {
res = dpad->rtp_pad;
break; break;
} else if (pad == dpad->rtcp_pad) { } else if (dit->pad == dit->demux->rtcp_sink) {
res = g_list_prepend (res, demux->rtcp_sink); res = dpad->rtcp_pad;
} else if (dit->pad == dpad->rtp_pad) {
res = dit->demux->rtp_sink;
break;
} else if (dit->pad == dpad->rtcp_pad) {
res = dit->demux->rtcp_sink;
break; break;
} }
} }
GST_PAD_UNLOCK (demux);
*result = res;
dit->current = current;
return res ? GST_ITERATOR_OK : GST_ITERATOR_DONE;
}
static GstIteratorItem
_iterate_item (GstIterator * it, gpointer item)
{
GstPad *pad = (GstPad *) item;
gst_object_ref (pad);
return GST_ITERATOR_ITEM_PASS;
}
static void
_iterate_resync (GstIterator * it)
{
GstRtpSsrcDemuxIterator *dit = (GstRtpSsrcDemuxIterator *) it;
dit->current = dit->demux->srcpads;
}
static GstIterator *
gst_rtp_ssrc_demux_iterate_internal_links (GstPad * pad)
{
GstRtpSsrcDemux *demux;
GstRtpSsrcDemuxIterator *it;
demux = GST_RTP_SSRC_DEMUX (gst_pad_get_parent (pad));
it = (GstRtpSsrcDemuxIterator *)
gst_iterator_new (sizeof (GstRtpSsrcDemuxIterator),
GST_TYPE_PAD,
demux->padlock,
&GST_ELEMENT_CAST (demux)->pads_cookie,
_iterate_next, _iterate_item, _iterate_resync, _iterate_free);
it->demux = gst_object_ref (demux);
it->pad = gst_object_ref (pad);
it->current = demux->srcpads;
gst_object_unref (demux); gst_object_unref (demux);
return res; return (GstIterator *) it;
} }
static gboolean static gboolean