mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "rtpjitterbuffer: Fix expected_dts calc in calculate_expected"

Browse source 
This reverts commit 05bd708fc5.

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.
This commit is contained in:
Stian Selnes 2015-06-30 11:21:31 +02:00 committed by Sebastian Dröge
parent ee7ddf6c67
commit 40524e5a49
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/rtpmanager/gstrtpjitterbuffer.c
View file

@ -2100,7 +2100,6 @@ calculate_expected (GstRtpJitterBuffer * jitterbuffer, guint32 expected,
GstRtpJitterBufferPrivate *priv = jitterbuffer->priv; GstRtpJitterBufferPrivate *priv = jitterbuffer->priv;
GstClockTime total_duration, duration, expected_dts; GstClockTime total_duration, duration, expected_dts;
TimerType type; TimerType type;
guint lost_packets = 0;
GST_DEBUG_OBJECT (jitterbuffer, GST_DEBUG_OBJECT (jitterbuffer,
"dts %" GST_TIME_FORMAT ", last %" GST_TIME_FORMAT, "dts %" GST_TIME_FORMAT ", last %" GST_TIME_FORMAT,
@ -2127,6 +2126,7 @@ calculate_expected (GstRtpJitterBuffer * jitterbuffer, guint32 expected,
if (total_duration > priv->latency_ns) { if (total_duration > priv->latency_ns) {
GstClockTime gap_time; GstClockTime gap_time;
guint lost_packets;
gap_time = total_duration - priv->latency_ns; gap_time = total_duration - priv->latency_ns;
@ -2153,7 +2153,7 @@ calculate_expected (GstRtpJitterBuffer * jitterbuffer, guint32 expected,
priv->last_in_dts += gap_time; 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) { if (priv->do_retransmission) {
TimerData *timer; TimerData *timer;