From e4bc81d7d2ea86150cb179658f4673e42fa6ad04 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 11 Nov 2013 15:27:18 +0100 Subject: [PATCH] rtpsession: remove collision reconfigure event Remove bogus reconfigure event on collision, we don't want to send the event on the receiving RTP pad and the collision event is now handling this case. See https://bugzilla.gnome.org/show_bug.cgi?id=711560 --- gst/rtpmanager/gstrtpsession.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/gst/rtpmanager/gstrtpsession.c b/gst/rtpmanager/gstrtpsession.c index 4a33f6967e..bb9ea5695d 100644 --- a/gst/rtpmanager/gstrtpsession.c +++ b/gst/rtpmanager/gstrtpsession.c @@ -317,24 +317,16 @@ on_new_ssrc (RTPSession * session, RTPSource * src, GstRtpSession * sess) static void on_ssrc_collision (RTPSession * session, RTPSource * src, GstRtpSession * sess) { - GstPad *recv_rtp_sink; GstPad *send_rtp_sink; g_signal_emit (sess, gst_rtp_session_signals[SIGNAL_ON_SSRC_COLLISION], 0, src->ssrc); GST_RTP_SESSION_LOCK (sess); - if ((recv_rtp_sink = sess->recv_rtp_sink)) - gst_object_ref (recv_rtp_sink); if ((send_rtp_sink = sess->send_rtp_sink)) gst_object_ref (send_rtp_sink); GST_RTP_SESSION_UNLOCK (sess); - if (recv_rtp_sink) { - gst_pad_push_event (recv_rtp_sink, gst_event_new_reconfigure ()); - gst_object_unref (recv_rtp_sink); - } - if (send_rtp_sink) { GstEvent *event = gst_event_new_custom (GST_EVENT_CUSTOM_UPSTREAM, gst_structure_new ("GstRTPCollision", "ssrc", G_TYPE_UINT,