[farsight2/master] If we receive a pad for which we have no codec (a race condition), don't block the pad forever, instead use the pad probe to drop buffers until we get the right code (but this should never happen anyway)

Olivier Crête olivier.crete at collabora.co.uk
Tue Dec 23 15:20:53 PST 2008


---
 gst/fsrtpconference/fs-rtp-substream.c |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/gst/fsrtpconference/fs-rtp-substream.c b/gst/fsrtpconference/fs-rtp-substream.c
index 642daf7..a3b1d40 100644
--- a/gst/fsrtpconference/fs-rtp-substream.c
+++ b/gst/fsrtpconference/fs-rtp-substream.c
@@ -428,10 +428,6 @@ fs_rtp_sub_stream_get_property (GObject *object,
   }
 }
 
-static void
-_blocked_cb (GstPad *pad, gboolean blocked, gpointer user_data)
-{
-}
 
 /**
  * fs_rtp_session_add_codecbin_locked:
@@ -513,9 +509,6 @@ fs_rtp_sub_stream_add_codecbin_locked (FsRtpSubStream *substream,
   substream->priv->codecbin = codecbin;
   substream->priv->codec = codec;
 
-  gst_pad_set_blocked_async (substream->priv->rtpbin_pad, FALSE, _blocked_cb,
-    NULL);
-
   /* Announce the pad if it wasnt there already and this substream
    * has a stream
    */
@@ -532,11 +525,10 @@ fs_rtp_sub_stream_add_codecbin_locked (FsRtpSubStream *substream,
 
  error_no_remove:
 
-    gst_pad_set_blocked_async (substream->priv->rtpbin_pad, TRUE, _blocked_cb,
+    fs_rtp_sub_stream_invalidate_codec_locked (substream, substream->priv->pt,
         NULL);
 
     return FALSE;
-
 }
 
 /**
-- 
1.5.6.5




More information about the farsight-commits mailing list