diff options
| author | Stian Selnes <stian@pexip.com> | 2015-06-30 11:21:31 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2015-07-08 23:18:48 +0300 |
| commit | 40524e5a493702fa9ff67fde43f94a9da2f16233 (patch) | |
| tree | cf9eb65b2ab340f061e9476fd1faff4f7603b2af /gst/rtpmanager/gstrtpjitterbuffer.c | |
| parent | ee7ddf6c678afb24f5f7419311c9ea461322c9b3 (diff) | |
Revert "rtpjitterbuffer: Fix expected_dts calc in calculate_expected"
This reverts commit 05bd708fc5e881390fe839803b53144393d95ab0.
The reverted patch is wrong and introduces a regression because there
may still be time to receive some of the packets included in the gap
if they are reordered.
Diffstat (limited to 'gst/rtpmanager/gstrtpjitterbuffer.c')
| -rw-r--r-- | gst/rtpmanager/gstrtpjitterbuffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c index 6a5a59f5d..b1198f0bc 100644 --- a/gst/rtpmanager/gstrtpjitterbuffer.c +++ b/gst/rtpmanager/gstrtpjitterbuffer.c @@ -2100,7 +2100,6 @@ calculate_expected (GstRtpJitterBuffer * jitterbuffer, guint32 expected, GstRtpJitterBufferPrivate *priv = jitterbuffer->priv; GstClockTime total_duration, duration, expected_dts; TimerType type; - guint lost_packets = 0; GST_DEBUG_OBJECT (jitterbuffer, "dts %" GST_TIME_FORMAT ", last %" GST_TIME_FORMAT, @@ -2127,6 +2126,7 @@ calculate_expected (GstRtpJitterBuffer * jitterbuffer, guint32 expected, if (total_duration > priv->latency_ns) { GstClockTime gap_time; + guint lost_packets; gap_time = total_duration - priv->latency_ns; @@ -2153,7 +2153,7 @@ calculate_expected (GstRtpJitterBuffer * jitterbuffer, guint32 expected, priv->last_in_dts += gap_time; } - expected_dts = priv->last_in_dts + (lost_packets + 1) * duration; + expected_dts = priv->last_in_dts + duration; if (priv->do_retransmission) { TimerData *timer; |