From ab73603031ba60e69dac892439220f9171f751f8 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Mon, 12 Oct 2009 11:54:07 +0200
Subject: [PATCH] jitterbuffer: add ts-offset to timestamp

Add the ts-offset to the buffer timestamp to get the final output timestamp of
the buffer.
---
 gst/rtpmanager/gstrtpjitterbuffer.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c
index ed87762380..75af1c390b 100644
--- a/gst/rtpmanager/gstrtpjitterbuffer.c
+++ b/gst/rtpmanager/gstrtpjitterbuffer.c
@@ -674,9 +674,12 @@ gst_rtp_jitter_buffer_set_active (GstRtpJitterBuffer * jbuf, gboolean active,
     JBUF_SIGNAL (priv);
   }
   if ((head = rtp_jitter_buffer_peek (priv->jbuf))) {
-    last_out = GST_BUFFER_TIMESTAMP (head);
-  } else
+    /* head buffer timestamp and offset gives our output time */
+    last_out = GST_BUFFER_TIMESTAMP (head) + priv->ts_offset;
+  } else {
+    /* use last known time when the buffer is empty */
     last_out = priv->last_out_time;
+  }
   JBUF_UNLOCK (priv);
 
   return last_out;