mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-02 14:36:41 +00:00
rtpssrcdemux: iterate pad function is only valid for src pads
The iterate function is only used for src pads, so mark it as such and remove dead code. https://bugzilla.gnome.org/show_bug.cgi?id=649617
This commit is contained in:
parent
1bf94a92b0
commit
23b6c8febc
1 changed files with 10 additions and 11 deletions
|
@ -121,7 +121,8 @@ 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 GstIterator *gst_rtp_ssrc_demux_iterate_internal_links (GstPad * pad);
|
static GstIterator *gst_rtp_ssrc_demux_iterate_internal_links_src (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 };
|
||||||
|
@ -203,12 +204,12 @@ find_or_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_iterate_internal_links_function (rtp_pad,
|
gst_pad_set_iterate_internal_links_function (rtp_pad,
|
||||||
gst_rtp_ssrc_demux_iterate_internal_links);
|
gst_rtp_ssrc_demux_iterate_internal_links_src);
|
||||||
gst_pad_set_active (rtp_pad, TRUE);
|
gst_pad_set_active (rtp_pad, TRUE);
|
||||||
|
|
||||||
gst_pad_set_event_function (rtcp_pad, gst_rtp_ssrc_demux_src_event);
|
gst_pad_set_event_function (rtcp_pad, gst_rtp_ssrc_demux_src_event);
|
||||||
gst_pad_set_iterate_internal_links_function (rtcp_pad,
|
gst_pad_set_iterate_internal_links_function (rtcp_pad,
|
||||||
gst_rtp_ssrc_demux_iterate_internal_links);
|
gst_rtp_ssrc_demux_iterate_internal_links_src);
|
||||||
gst_pad_set_active (rtcp_pad, TRUE);
|
gst_pad_set_active (rtcp_pad, TRUE);
|
||||||
|
|
||||||
GST_OBJECT_UNLOCK (demux);
|
GST_OBJECT_UNLOCK (demux);
|
||||||
|
@ -652,25 +653,23 @@ gst_rtp_ssrc_demux_src_event (GstPad * pad, GstEvent * event)
|
||||||
}
|
}
|
||||||
|
|
||||||
static GstIterator *
|
static GstIterator *
|
||||||
gst_rtp_ssrc_demux_iterate_internal_links (GstPad * pad)
|
gst_rtp_ssrc_demux_iterate_internal_links_src (GstPad * pad)
|
||||||
{
|
{
|
||||||
GstRtpSsrcDemux *demux;
|
GstRtpSsrcDemux *demux;
|
||||||
GstPad *otherpad = NULL;
|
GstPad *otherpad = NULL;
|
||||||
GstIterator *it;
|
GstIterator *it = NULL;
|
||||||
GSList *current;
|
GSList *current;
|
||||||
|
|
||||||
demux = GST_RTP_SSRC_DEMUX (gst_pad_get_parent (pad));
|
demux = GST_RTP_SSRC_DEMUX (gst_pad_get_parent (pad));
|
||||||
|
|
||||||
|
if (!demux)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
GST_PAD_LOCK (demux);
|
GST_PAD_LOCK (demux);
|
||||||
for (current = demux->srcpads; current; current = g_slist_next (current)) {
|
for (current = demux->srcpads; current; current = g_slist_next (current)) {
|
||||||
GstRtpSsrcDemuxPad *dpad = (GstRtpSsrcDemuxPad *) current->data;
|
GstRtpSsrcDemuxPad *dpad = (GstRtpSsrcDemuxPad *) current->data;
|
||||||
|
|
||||||
if (pad == demux->rtp_sink) {
|
if (pad == dpad->rtp_pad) {
|
||||||
otherpad = dpad->rtp_pad;
|
|
||||||
break;
|
|
||||||
} else if (pad == demux->rtcp_sink) {
|
|
||||||
otherpad = dpad->rtcp_pad;
|
|
||||||
} else if (pad == dpad->rtp_pad) {
|
|
||||||
otherpad = demux->rtp_sink;
|
otherpad = demux->rtp_sink;
|
||||||
break;
|
break;
|
||||||
} else if (pad == dpad->rtcp_pad) {
|
} else if (pad == dpad->rtcp_pad) {
|
||||||
|
|
Loading…
Reference in a new issue