rtpsession: Wait longer to timeout SSRC collision

Using the current RTCP interval to timeout SSRC collision can lead to
collisions being timed out immediately if a BYE packet is sent because
it is sent immediately, so the interval is 0. This is not what we
want. So just set a static 10 times the default RTCP interval, it
should be enough

https://bugzilla.gnome.org/show_bug.cgi?id=648642
This commit is contained in:
Olivier Crête 2011-04-25 16:13:38 -04:00 committed by Mark Nauwelaerts
parent 9764b57b0a
commit 4d48109f9d

View file

@ -3047,7 +3047,8 @@ rtp_session_on_timeout (RTPSession * sess, GstClockTime current_time,
/* check for outdated collisions */ /* check for outdated collisions */
GST_DEBUG ("Timing out collisions"); GST_DEBUG ("Timing out collisions");
rtp_source_timeout (sess->source, current_time, rtp_source_timeout (sess->source, current_time,
data.interval * RTCP_INTERVAL_COLLISION_TIMEOUT, /* "a relatively long time" -- RFC 3550 section 8.2 */
RTP_STATS_MIN_INTERVAL * GST_SECOND * 10,
running_time - sess->rtcp_feedback_retention_window); running_time - sess->rtcp_feedback_retention_window);
if (sess->change_ssrc) { if (sess->change_ssrc) {