rtpsession: Fix wrong code organisation in case of collision
authorPaul HENRYS <visechelle@gmail.com>
Wed, 13 Feb 2013 09:46:54 +0000 (10:46 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 22 Feb 2013 07:28:07 +0000 (09:28 +0200)
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

index b41bb0d..af35add 100644 (file)
@@ -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;
     }
   }