From de5cd0995bfa9fe7852532573e0b7cab9498725a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 29 Jun 2015 10:36:58 +0200 Subject: [PATCH] Revert "rtpjitterbuffer: If we have an immediate timeout, don't try to find an earlier timeout" This reverts commit 0c21cd7177ea883c710999147ddcedb19004d182. If we have multiple immediate timers, we want to first handle the one with the lowest sequence number... which would be broken now. Instead of this we should just use a GSequence for the timers, and have them sorted first by timestamp, and for equal timestamps by sequence number. Then we would always only have to take the very first timer from the list and never have to look at any others. --- gst/rtpmanager/gstrtpjitterbuffer.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c index 306f04a68f..8f9c51f060 100644 --- a/gst/rtpmanager/gstrtpjitterbuffer.c +++ b/gst/rtpmanager/gstrtpjitterbuffer.c @@ -3315,10 +3315,6 @@ wait_next_timeout (GstRtpJitterBuffer * jitterbuffer) GST_DEBUG_OBJECT (jitterbuffer, "new best %d", i); timer = test; timer_timeout = test_timeout; - - /* Immediate timeout */ - if (test_timeout == -1) - break; } } if (timer && !priv->blocked) {