diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gst/rtpmanager/gstrtpbin.c | 18 |
2 files changed, 19 insertions, 6 deletions
@@ -1,3 +1,10 @@ +2008-11-21 Wim Taymans <wim.taymans@collabora.co.uk> + + Patch by: Olivier Crete <tester at tester dot ca> + + * gst/rtpmanager/gstrtpbin.c: (gst_rtp_bin_release_pad): + Release the right pads on rtpbin. Fixes #561752. + 2008-11-21 Sebastian Dröge <sebastian.droege@collabora.co.uk> * gst/speexresample/gstspeexresample.c: diff --git a/gst/rtpmanager/gstrtpbin.c b/gst/rtpmanager/gstrtpbin.c index 11d14d51..13402ea3 100644 --- a/gst/rtpmanager/gstrtpbin.c +++ b/gst/rtpmanager/gstrtpbin.c @@ -2429,28 +2429,34 @@ gst_rtp_bin_release_pad (GstElement * element, GstPad * pad) { GstRtpBinSession *session; GstRtpBin *rtpbin; + GstPad *target = NULL; - g_return_if_fail (GST_IS_PAD (pad)); + g_return_if_fail (GST_IS_GHOST_PAD (pad)); g_return_if_fail (GST_IS_RTP_BIN (element)); rtpbin = GST_RTP_BIN (element); + target = gst_ghost_pad_get_target (GST_GHOST_PAD (pad)); + g_return_if_fail (target); + GST_RTP_BIN_LOCK (rtpbin); - if (!(session = find_session_by_pad (rtpbin, pad))) + if (!(session = find_session_by_pad (rtpbin, target))) goto unknown_pad; - if (session->recv_rtp_sink == pad) { + if (session->recv_rtp_sink == target) { remove_recv_rtp (rtpbin, session, pad); - } else if (session->recv_rtcp_sink == pad) { + } else if (session->recv_rtcp_sink == target) { remove_recv_rtcp (rtpbin, session, pad); - } else if (session->send_rtp_sink == pad) { + } else if (session->send_rtp_sink == target) { remove_send_rtp (rtpbin, session, pad); - } else if (session->send_rtcp_src == pad) { + } else if (session->send_rtcp_src == target) { remove_rtcp (rtpbin, session, pad); } GST_RTP_BIN_UNLOCK (rtpbin); + gst_object_unref (target); + return; /* ERROR */ |