diff options
author | Wim Taymans <wim.taymans@collabora.co.uk> | 2013-02-07 15:06:40 +0100 |
---|---|---|
committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2013-02-07 15:06:40 +0100 |
commit | 2971ed44eeef9d910333122c393b3ecb6e281916 (patch) | |
tree | 3e41f10f94cc4c05211cbe8fdad99a49e341e843 | |
parent | 0e91c949d8105b3650dac499f3e8ed0ba4243d48 (diff) |
rtpsession: remove dead code
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=668355
-rw-r--r-- | gst/rtpmanager/rtpsession.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/gst/rtpmanager/rtpsession.c b/gst/rtpmanager/rtpsession.c index 8f9cc9637..b41bb0d8d 100644 --- a/gst/rtpmanager/rtpsession.c +++ b/gst/rtpmanager/rtpsession.c @@ -1225,9 +1225,7 @@ check_collision (RTPSession * sess, RTPSource * source, GSocketAddress *from; /* This is not our local source, but lets check if two remote - * source collide - */ - + * source collide */ if (rtp) { from = source->rtp_from; } else { @@ -1296,25 +1294,6 @@ check_collision (RTPSession * sess, RTPSource * source, * Maybe should be done in upper layer, only the SDES can tell us * if its a collision or a loop */ - - /* If the source has been inactive for some time, we assume that it has - * simply changed its transport source address. Hence, there is no true - * third-party collision - only a simulated one. */ - if (arrival->current_time > source->last_activity) { - GstClockTime inactivity_period = - arrival->current_time - source->last_activity; - if (inactivity_period > 1 * GST_SECOND) { - /* Use new network address */ - if (rtp) { - g_assert (source->rtp_from); - rtp_source_set_rtp_from (source, arrival->address); - } else { - g_assert (source->rtcp_from); - rtp_source_set_rtcp_from (source, arrival->address); - } - return FALSE; - } - } } else { /* This is sending with our ssrc, is it an address we already know */ |