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

rtpsession: relax third-party collision detection

Browse source 
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.

Fixes #630447
This commit is contained in:
Havard Graff 2009-08-31 18:37:40 +02:00 committed by Wim Taymans
parent ce007b244e
commit 062568a9f5
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gst/rtpmanager/rtpsession.c
View file

@ -1096,6 +1096,25 @@ check_collision (RTPSession * sess, RTPSource * source,
* Maybe should be done in upper layer, only the SDES can tell us * Maybe should be done in upper layer, only the SDES can tell us
* if its a collision or a loop * 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->time > source->last_activity) {
GstClockTime inactivity_period = arrival->time - source->last_activity;
if (inactivity_period > 1*GST_SECOND) {
/* Use new network address */
if (rtp) {
g_assert (source->have_rtp_from);
rtp_source_set_rtp_from (source, &arrival->address);
}
else {
g_assert (source->have_rtcp_from);
rtp_source_set_rtcp_from (source, &arrival->address);
}
return FALSE;
}
}
} else { } else {
/* This is sending with our ssrc, is it an address we already know */ /* This is sending with our ssrc, is it an address we already know */