From 10802cae7339ff1a3e35723159a122088c202933 Mon Sep 17 00:00:00 2001 From: Paul HENRYS Date: Wed, 13 Feb 2013 10:46:54 +0100 Subject: [PATCH] rtpsession: Fix wrong code organisation in case of collision change_ssrc field of RTPSession should be set before calling rtp_session_schedule_bye_locked () as this function will call reconsider function that will wake up rtcp_thread which will call rtp_session_on_timeout () that will check change_ssrc to change the ssrc. Fixes https://bugzilla.gnome.org/show_bug.cgi?id=694184 --- gst/rtpmanager/rtpsession.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gst/rtpmanager/rtpsession.c b/gst/rtpmanager/rtpsession.c index b41bb0d8d1..af35add437 100644 --- a/gst/rtpmanager/rtpsession.c +++ b/gst/rtpmanager/rtpsession.c @@ -1312,10 +1312,10 @@ check_collision (RTPSession * sess, RTPSource * source, GST_DEBUG ("Collision for SSRC %x", rtp_source_get_ssrc (source)); on_ssrc_collision (sess, source); + sess->change_ssrc = TRUE; + rtp_session_schedule_bye_locked (sess, "SSRC Collision", arrival->current_time); - - sess->change_ssrc = TRUE; } }