From 4d48109f9d5da9106130485d37841bbf3423cd6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= Date: Mon, 25 Apr 2011 16:13:38 -0400 Subject: [PATCH] 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 --- gst/rtpmanager/rtpsession.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gst/rtpmanager/rtpsession.c b/gst/rtpmanager/rtpsession.c index bdd261f65f..541a3aebc4 100644 --- a/gst/rtpmanager/rtpsession.c +++ b/gst/rtpmanager/rtpsession.c @@ -3047,7 +3047,8 @@ rtp_session_on_timeout (RTPSession * sess, GstClockTime current_time, /* check for outdated collisions */ GST_DEBUG ("Timing out collisions"); 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); if (sess->change_ssrc) {