[farsight2/master] Drop all buffers until we have codecs that the codecbin can accept

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


---
 gst/fsrtpconference/fs-rtp-substream.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gst/fsrtpconference/fs-rtp-substream.c b/gst/fsrtpconference/fs-rtp-substream.c
index b93c22a..69d1529 100644
--- a/gst/fsrtpconference/fs-rtp-substream.c
+++ b/gst/fsrtpconference/fs-rtp-substream.c
@@ -879,6 +879,9 @@ fs_rtp_sub_stream_set_codecbin (FsRtpSubStream *substream,
     ret = TRUE;
     gst_object_unref (pad);
     gst_caps_unref (caps);
+
+    /* We call this to drop all buffers until something comes up */
+    fs_rtp_sub_stream_verify_codec_locked (substream, NULL);
     goto error;
   }
 
@@ -1107,8 +1110,7 @@ void
 fs_rtp_sub_stream_verify_codec_locked (FsRtpSubStream *substream,
     const FsCodec *codec)
 {
-  if (substream->priv->codec &&
-      !substream->priv->blocking_id &&
+  if (!substream->priv->blocking_id &&
       (!codec || !fs_codec_are_equal (substream->priv->codec, codec)))
     substream->priv->blocking_id = gst_pad_add_data_probe (
         substream->priv->rtpbin_pad,
-- 
1.5.6.5




More information about the farsight-commits mailing list