[farsight2/master] Revert "rtp: Release the request pads from gstrtpbin, require gst-p-bad 0.10.13 to match"

Olivier Crête olivier.crete at collabora.co.uk
Wed Jul 29 13:29:57 PDT 2009


This reverts commit f5c228f61018b75d908e1c1ca586fdb00a587500.

The session dispose then tries to remove the recv part of the gstrtpbin, which
tries to stop the jitterbuffer stream. The session dispose could be called
from a streaming thread (if it is disposed during a src-pad-added signal for example). We need to stop it from another thread in this case.
---
 README                               |    2 +-
 gst/fsrtpconference/fs-rtp-session.c |    8 ++++++++
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/README b/README
index 31941e6..f736b5c 100644
--- a/README
+++ b/README
@@ -32,7 +32,7 @@ For the python module:
 Run time for the RTP plugin:
  All of the build time requirements (except gtk-doc) plus
  - gst-plugins-good 0.10.7
- - gst-plugins-bad 0.10.13
+ - gst-plugins-bad 0.10.12
 
 For the GUI example:
  - PyGTK 2.10
diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index 6a23542..8541488 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -600,36 +600,44 @@ fs_rtp_session_dispose (GObject *object)
 
   if (self->priv->rtpbin_send_rtcp_src)
   {
+    /* Release pad generates a g_warning as of Nov 11 2008
     gst_pad_set_active (self->priv->rtpbin_send_rtcp_src, FALSE);
     gst_element_release_request_pad (self->priv->conference->gstrtpbin,
       self->priv->rtpbin_send_rtcp_src);
+    */
     gst_object_unref (self->priv->rtpbin_send_rtcp_src);
     self->priv->rtpbin_send_rtcp_src = NULL;
   }
 
   if (self->priv->rtpbin_send_rtp_sink)
   {
+    /* Release pad generates a g_warning as of Nov 11 2008
     gst_pad_set_active (self->priv->rtpbin_send_rtp_sink, FALSE);
     gst_element_release_request_pad (self->priv->conference->gstrtpbin,
       self->priv->rtpbin_send_rtp_sink);
+    */
     gst_object_unref (self->priv->rtpbin_send_rtp_sink);
     self->priv->rtpbin_send_rtp_sink = NULL;
   }
 
   if (self->priv->rtpbin_recv_rtp_sink)
   {
+    /* Release pad generates a g_warning as of Nov 11 2008
     gst_pad_set_active (self->priv->rtpbin_recv_rtp_sink, FALSE);
     gst_element_release_request_pad (self->priv->conference->gstrtpbin,
       self->priv->rtpbin_recv_rtp_sink);
+    */
     gst_object_unref (self->priv->rtpbin_recv_rtp_sink);
     self->priv->rtpbin_recv_rtp_sink = NULL;
   }
 
   if (self->priv->rtpbin_recv_rtcp_sink)
   {
+    /* Release pad generates a g_warning as of Nov 11 2008
     gst_pad_set_active (self->priv->rtpbin_recv_rtcp_sink, FALSE);
     gst_element_release_request_pad (self->priv->conference->gstrtpbin,
       self->priv->rtpbin_recv_rtcp_sink);
+    */
     gst_object_unref (self->priv->rtpbin_recv_rtcp_sink);
     self->priv->rtpbin_recv_rtcp_sink = NULL;
   }
-- 
1.5.6.5




More information about the farsight-commits mailing list