summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2007-11-22 09:08:27 +0000
committerWim Taymans <wim.taymans@gmail.com>2007-11-22 09:08:27 +0000
commitf219caaf015cf4bec440519008cba304e2270199 (patch)
tree43868d793e8f96c99f49a4ec0c5f595fb3fa6642
parent82cde22e4ddcc42043b353f62304ba642ab2d4b7 (diff)
downloadgst-plugins-bad-f219caaf015cf4bec440519008cba304e2270199.tar.gz
gst-plugins-bad-f219caaf015cf4bec440519008cba304e2270199.tar.bz2
gst-plugins-bad-f219caaf015cf4bec440519008cba304e2270199.zip
gst/rtpmanager/gstrtpjitterbuffer.c: jitterbuffer can buffer an unlimited amount of time and thus has no max_latency ...
Original commit message from CVS: * gst/rtpmanager/gstrtpjitterbuffer.c: (gst_rtp_jitter_buffer_query): jitterbuffer can buffer an unlimited amount of time and thus has no max_latency requirements.
-rw-r--r--ChangeLog7
-rw-r--r--gst/rtpmanager/gstrtpjitterbuffer.c6
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index a6f3ad99..c2e83bbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-22 Wim Taymans <wim.taymans@gmail.com>
+
+ * gst/rtpmanager/gstrtpjitterbuffer.c:
+ (gst_rtp_jitter_buffer_query):
+ jitterbuffer can buffer an unlimited amount of time and thus has no
+ max_latency requirements.
+
2007-11-21 Sebastian Dröge <slomo@circular-chaos.org>
* gst/speexresample/README:
diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c
index 84e0a6dd..76226229 100644
--- a/gst/rtpmanager/gstrtpjitterbuffer.c
+++ b/gst/rtpmanager/gstrtpjitterbuffer.c
@@ -1209,11 +1209,9 @@ gst_rtp_jitter_buffer_query (GstPad * pad, GstQuery * query)
GST_DEBUG_OBJECT (jitterbuffer, "Our latency: %" GST_TIME_FORMAT,
GST_TIME_ARGS (our_latency));
+ /* we add some latency but can buffer an infinite amount of time */
min_latency += our_latency;
- /* max_latency can be -1, meaning there is no upper limit for the
- * latency. */
- if (max_latency != -1)
- max_latency += our_latency;
+ max_latency = -1;
GST_DEBUG_OBJECT (jitterbuffer, "Calculated total latency : min %"
GST_TIME_FORMAT " max %" GST_TIME_FORMAT,