mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-27 22:32:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpjitterbuffer: handle expected packet being an RTX packet

Browse source 
If the expected packet (do_next_seqnum is TRUE) is the one we requested
for retranmission earlier, do the logic to update the retransmission
statistics as well before setting up the timers for the next expected
packet.
Also reset the retransmission counter if the timer is reused for another
seqnum.
This commit is contained in:
Wim Taymans 2014-01-21 17:52:44 +01:00
parent ddb0b9c422
commit 204bd715d2
1 changed files with 39 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
gst/rtpmanager/gstrtpjitterbuffer.c
View file

@ -1706,6 +1706,8 @@ reschedule_timer (GstRtpJitterBuffer * jitterbuffer, TimerData * timer,
timer->rtx_delay = delay;
timer->rtx_retry = 0;
}
if (seqchange)
timer->num_rtx_retry = 0;
if (priv->clock_id) {
/* we changed the seqnum and there is a timer currently waiting with this
@ -1801,31 +1803,10 @@ update_timers (GstRtpJitterBuffer * jitterbuffer, guint16 seqnum,
}
}
if (priv->packet_spacing > 0 && do_next_seqnum && priv->do_retransmission) {
GstClockTime expected, delay;
/* calculate expected arrival time of the next seqnum */
expected = dts + priv->packet_spacing;
if (priv->rtx_delay == -1) {
if (priv->avg_jitter == 0)
delay = DEFAULT_AUTO_RTX_DELAY;
else
/* jitter is in nanoseconds, 2x jitter is a good margin */
delay = priv->avg_jitter * 2;
} else {
delay = priv->rtx_delay * GST_MSECOND;
}
/* and update/install timer for next seqnum */
if (timer)
reschedule_timer (jitterbuffer, timer, priv->next_in_seqnum, expected,
delay, TRUE);
else
add_timer (jitterbuffer, TIMER_TYPE_EXPECTED, priv->next_in_seqnum, 0,
expected, delay, priv->packet_spacing);
} else if (timer && timer->type != TIMER_TYPE_DEADLINE) {
do_next_seqnum = do_next_seqnum && priv->packet_spacing > 0
&& priv->do_retransmission;
if (timer && timer->type != TIMER_TYPE_DEADLINE) {
if (timer->num_rtx_retry > 0) {
GstClockTime rtx_last, delay;
@ -1859,14 +1840,45 @@ update_timers (GstRtpJitterBuffer * jitterbuffer, guint16 seqnum,
priv->num_rtx_success, priv->num_rtx_failed, priv->num_rtx_requests,
priv->num_duplicates, priv->avg_rtx_num, GST_TIME_ARGS (delay),
GST_TIME_ARGS (priv->avg_rtx_rtt));
/* don't try to estimate the next seqnum because this is a retransmitted
* packet and it probably did not arrive with the expected packet
* spacing. */
do_next_seqnum = FALSE;
}
/* if we had a timer, remove it, we don't know when to expect the next
* packet. */
remove_timer (jitterbuffer, timer);
/* we signal the _loop function because this new packet could be the one
* it was waiting for */
JBUF_SIGNAL_EVENT (priv);
}
if (do_next_seqnum) {
GstClockTime expected, delay;
/* calculate expected arrival time of the next seqnum */
expected = dts + priv->packet_spacing;
if (priv->rtx_delay == -1) {
if (priv->avg_jitter == 0)
delay = DEFAULT_AUTO_RTX_DELAY;
else
/* jitter is in nanoseconds, 2x jitter is a good margin */
delay = priv->avg_jitter * 2;
} else {
delay = priv->rtx_delay * GST_MSECOND;
}
/* and update/install timer for next seqnum */
if (timer)
reschedule_timer (jitterbuffer, timer, priv->next_in_seqnum, expected,
delay, TRUE);
else
add_timer (jitterbuffer, TIMER_TYPE_EXPECTED, priv->next_in_seqnum, 0,
expected, delay, priv->packet_spacing);
} else if (timer && timer->type != TIMER_TYPE_DEADLINE) {
/* if we had a timer, remove it, we don't know when to expect the next
* packet. */
remove_timer (jitterbuffer, timer);
}
}
static void