[Pkg-telepathy-commits] ./packages/unstable/gst-plugins-farsight r25: * debian/patches/04_jitterbuffer_no_eos_on_queue_if_disabled.patch

[Sjoerd Simons]

------------------------------------------------------------
revno: 25
committer: Sjoerd Simons <sjoerd at luon.net>
branch nick: gst-plugins-farsight
timestamp: Sun 2008-02-17 16:03:49 +0100
message:
  * debian/patches/04_jitterbuffer_no_eos_on_queue_if_disabled.patch
    - Added. Don't push EOS events onto the internal queue if it is disabled.
      Fixes a potential crash inside the jitterbuffer element
added:
  patches/04_jitterbuffer_no_eos_on_queue_if_disabled.patch
modified:
  changelog
-------------- next part --------------
=== modified file 'changelog'
--- a/changelog	2008-02-17 14:59:51 +0000
+++ b/changelog	2008-02-17 15:03:49 +0000
@@ -7,8 +7,11 @@
   * debian/patches/03_dtmfsrc_set_correct_endianess.patch
     - Added. Set the native endianess on the src pad of the dtmfsrc element.
       Fixes problems on big-endian architectures.
+  * debian/patches/04_jitterbuffer_no_eos_on_queue_if_disabled.patch
+    - Added. Don't push EOS events onto the internal queue if it is disabled.
+      Fixes a potential crash inside the jitterbuffer element
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sun, 17 Feb 2008 15:55:49 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 17 Feb 2008 16:02:20 +0100
 
 gst-plugins-farsight (0.12.5-2) unstable; urgency=low
 

=== added file 'patches/04_jitterbuffer_no_eos_on_queue_if_disabled.patch'
--- a/patches/04_jitterbuffer_no_eos_on_queue_if_disabled.patch	1970-01-01 00:00:00 +0000
+++ b/patches/04_jitterbuffer_no_eos_on_queue_if_disabled.patch	2008-02-17 15:03:49 +0000
@@ -0,0 +1,21 @@
+Fri Oct 12 18:15:58 CEST 2007  Olivier Crete <olivier.crete at collabora.co.uk>
+  * Don't push EOS events onto the queue if its disabled, ie latency==0
+diff -rN -u old-gst-plugins-farsight/gst/rtpjitterbuffer/gstrtpjitterbuffer.c new-gst-plugins-farsight/gst/rtpjitterbuffer/gstrtpjitterbuffer.c
+--- old-gst-plugins-farsight/gst/rtpjitterbuffer/gstrtpjitterbuffer.c	2008-02-17 16:02:06.000000000 +0100
++++ new-gst-plugins-farsight/gst/rtpjitterbuffer/gstrtpjitterbuffer.c	2008-02-17 16:02:06.000000000 +0100
+@@ -801,8 +801,12 @@
+       /* check for flushing, we need to discard the event and return FALSE when
+        * we are flushing */
+       ret = priv->srcresult == GST_FLOW_OK;
+-      if (ret)
+-        async_jitter_queue_push_unlocked (priv->queue, event);
++      if (ret) {
++        if (priv->latency_ms == 0)
++          gst_pad_push_event (priv->srcpad, event);
++        else
++          async_jitter_queue_push_unlocked (priv->queue, event);
++      }
+       else
+         gst_event_unref (event);
+       async_jitter_queue_unlock (priv->queue);
+