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

rtpsession: remove dead code

Browse source 
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=668355
This commit is contained in:
Wim Taymans 2013-02-07 15:06:40 +01:00
parent 0e91c949d8
commit 2971ed44ee
1 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gst/rtpmanager/rtpsession.c
View file

@ -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 */