gst-libs/gst/rtp/gstbasertpdepayload.*: Handle RTP sequence number rollover.

Original commit message from CVS:
Patch by: Marcel Moreaux <marcelm at luon dot net>
* gst-libs/gst/rtp/gstbasertpdepayload.c:
(gst_base_rtp_depayload_add_to_queue):
* gst-libs/gst/rtp/gstbasertpdepayload.h:
Handle RTP sequence number rollover.
Disable jitterbuffer by default.

diff --git a/ChangeLog b/ChangeLog
index c49f36727bc1b0aa8640e6da46bdc7c17d947673..47e3f10769c349ce60e1d7ef5bc4bfaf91e1d467 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-08-02  Wim Taymans  <wim@fluendo.com>
+
+       Patch by: Marcel Moreaux <marcelm at luon dot net>
+
+       * gst-libs/gst/rtp/gstbasertpdepayload.c:
+       (gst_base_rtp_depayload_add_to_queue):
+       * gst-libs/gst/rtp/gstbasertpdepayload.h:
+       Handle RTP sequence number rollover.
+       Disable jitterbuffer by default.
+
 2006-07-28  Jan Schmidt  <thaytan@mad.scientist.com>
 
        * gst/audioresample/gstaudioresample.c: (audioresample_stop),

diff --git a/gst-libs/gst/rtp/gstbasertpdepayload.c b/gst-libs/gst/rtp/gstbasertpdepayload.c
index df13a52c959e4d65a3dcfedffe0674447b622d4d..abb7e111e15970bf95ea88c21f0548b085abb4d6 100644 (file)
--- a/gst-libs/gst/rtp/gstbasertpdepayload.c
+++ b/gst-libs/gst/rtp/gstbasertpdepayload.c
@@ -300,7 +300,10 @@ gst_base_rtp_depayload_add_to_queue (GstBaseRTPDepayload * filter,
     /* look for right place to insert it */
     i = 0;
 
-    while (seqnum > queueseq) {
+    /* Check for seqnum wraparound.
+     * Seqnums in the lowest quadrant of the 0-65535 space are considered to
+     * be greater than seqnums in the highest quadrant of this space. */
+    while (seqnum > queueseq || (seqnum < 16384 && queueseq > 49150)) {
       gpointer data;
 
       i++;

diff --git a/gst-libs/gst/rtp/gstbasertpdepayload.h b/gst-libs/gst/rtp/gstbasertpdepayload.h
index f28aaaae75aed7b459173af4c4d63549c81259bc..15d7c50839d1400bbc8ca71fe9833d553109f7ab 100644 (file)
--- a/gst-libs/gst/rtp/gstbasertpdepayload.h
+++ b/gst-libs/gst/rtp/gstbasertpdepayload.h
@@ -42,7 +42,7 @@ G_BEGIN_DECLS
 #define GST_BASE_RTP_DEPAYLOAD_SRCPAD(depayload)  (GST_BASE_RTP_DEPAYLOAD (depayload)->srcpad)
 
 /* in milliseconds */
-#define RTP_QUEUE_DELAY 100;
+#define RTP_QUEUE_DELAY 0;
 
 #define QUEUE_LOCK_INIT(base)   (g_static_rec_mutex_init(&base->queuelock))
 #define QUEUE_LOCK_FREE(base)   (g_static_rec_mutex_free(&base->queuelock))