mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpjitterbuffer: dynamically recalculate RTX parameters

Browse source 
Use the round-trip-time and average jitter to dynamically calculate the
retransmission interval and expected packet arrival time.

Based on patches from Torrie Fischer <torrie.fischer@collabora.co.uk>

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=711412
This commit is contained in:
Wim Taymans 2013-12-27 16:51:32 +01:00
parent 416bd9a2c3
commit f48bbabafc
1 changed files with 49 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
gst/rtpmanager/gstrtpjitterbuffer.c
View file

@ -130,10 +130,13 @@ enum
#define DEFAULT_MODE RTP_JITTER_BUFFER_MODE_SLAVE #define DEFAULT_MODE RTP_JITTER_BUFFER_MODE_SLAVE
#define DEFAULT_PERCENT 0 #define DEFAULT_PERCENT 0
#define DEFAULT_DO_RETRANSMISSION FALSE #define DEFAULT_DO_RETRANSMISSION FALSE
#define DEFAULT_RTX_DELAY 20 #define DEFAULT_RTX_DELAY -1
#define DEFAULT_RTX_DELAY_REORDER 3 #define DEFAULT_RTX_DELAY_REORDER 3
#define DEFAULT_RTX_RETRY_TIMEOUT 40 #define DEFAULT_RTX_RETRY_TIMEOUT -1
#define DEFAULT_RTX_RETRY_PERIOD 160 #define DEFAULT_RTX_RETRY_PERIOD -1
#define DEFAULT_AUTO_RTX_DELAY (20 * GST_MSECOND)
#define DEFAULT_AUTO_RTX_TIMEOUT (40 * GST_MSECOND)
enum enum
{ {
@ -1803,7 +1806,16 @@ update_timers (GstRtpJitterBuffer * jitterbuffer, guint16 seqnum,
/* calculate expected arrival time of the next seqnum */ /* calculate expected arrival time of the next seqnum */
expected = dts + priv->packet_spacing; expected = dts + priv->packet_spacing;
delay = priv->rtx_delay * GST_MSECOND;
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 */ /* and update/install timer for next seqnum */
if (timer) if (timer)
@ -2558,9 +2570,35 @@ do_expected_timeout (GstRtpJitterBuffer * jitterbuffer, TimerData * timer,
GstRtpJitterBufferPrivate *priv = jitterbuffer->priv; GstRtpJitterBufferPrivate *priv = jitterbuffer->priv;
GstEvent *event; GstEvent *event;
guint delay; guint delay;
GstClockTime rtx_retry_period;
GstClockTime rtx_retry_timeout;
GstClock *clock; GstClock *clock;
GST_DEBUG_OBJECT (jitterbuffer, "expected %d didn't arrive", timer->seqnum); GST_DEBUG_OBJECT (jitterbuffer, "expected %d didn't arrive, now %"
GST_TIME_FORMAT, timer->seqnum, GST_TIME_ARGS (now));
if (priv->rtx_retry_timeout == -1) {
if (priv->avg_rtx_rtt == 0)
rtx_retry_timeout = DEFAULT_AUTO_RTX_TIMEOUT;
else
/* we want to ask for a retransmission after we waited for a
* complete RTT and the additional jitter */
rtx_retry_timeout = priv->avg_rtx_rtt + priv->avg_jitter * 2;
} else {
rtx_retry_timeout = priv->rtx_retry_timeout * GST_MSECOND;
}
if (priv->rtx_retry_period == -1) {
/* we retry up to the configured jitterbuffer size but leaving some
* room for the retransmission to arrive in time */
rtx_retry_period = priv->latency_ns - rtx_retry_timeout;
} else {
rtx_retry_period = priv->rtx_retry_period * GST_MSECOND;
}
GST_DEBUG_OBJECT (jitterbuffer, "timeout %" GST_TIME_FORMAT ", period %"
GST_TIME_FORMAT, GST_TIME_ARGS (rtx_retry_timeout),
GST_TIME_ARGS (rtx_retry_period));
delay = timer->rtx_delay + timer->rtx_retry; delay = timer->rtx_delay + timer->rtx_retry;
event = gst_event_new_custom (GST_EVENT_CUSTOM_UPSTREAM, event = gst_event_new_custom (GST_EVENT_CUSTOM_UPSTREAM,
@ -2569,8 +2607,8 @@ do_expected_timeout (GstRtpJitterBuffer * jitterbuffer, TimerData * timer,
"running-time", G_TYPE_UINT64, timer->rtx_base, "running-time", G_TYPE_UINT64, timer->rtx_base,
"delay", G_TYPE_UINT, GST_TIME_AS_MSECONDS (delay), "delay", G_TYPE_UINT, GST_TIME_AS_MSECONDS (delay),
"retry", G_TYPE_UINT, timer->num_rtx_retry, "retry", G_TYPE_UINT, timer->num_rtx_retry,
"frequency", G_TYPE_UINT, priv->rtx_retry_timeout, "frequency", G_TYPE_UINT, GST_TIME_AS_MSECONDS (rtx_retry_timeout),
"period", G_TYPE_UINT, priv->rtx_retry_period, "period", G_TYPE_UINT, GST_TIME_AS_MSECONDS (rtx_retry_period),
"deadline", G_TYPE_UINT, priv->latency_ms, "deadline", G_TYPE_UINT, priv->latency_ms,
"packet-spacing", G_TYPE_UINT64, priv->packet_spacing, "packet-spacing", G_TYPE_UINT64, priv->packet_spacing,
"avg-rtt", G_TYPE_UINT, GST_TIME_AS_MSECONDS (priv->avg_rtx_rtt), "avg-rtt", G_TYPE_UINT, GST_TIME_AS_MSECONDS (priv->avg_rtx_rtt),
@ -2589,14 +2627,13 @@ do_expected_timeout (GstRtpJitterBuffer * jitterbuffer, TimerData * timer,
GST_OBJECT_UNLOCK (jitterbuffer); GST_OBJECT_UNLOCK (jitterbuffer);
/* calculate the timeout for the next retransmission attempt */ /* calculate the timeout for the next retransmission attempt */
timer->rtx_retry += (priv->rtx_retry_timeout * GST_MSECOND); timer->rtx_retry += rtx_retry_timeout;
GST_DEBUG_OBJECT (jitterbuffer, "base %" GST_TIME_FORMAT ", delay %" GST_DEBUG_OBJECT (jitterbuffer, "base %" GST_TIME_FORMAT ", delay %"
GST_TIME_FORMAT ", retry %" GST_TIME_FORMAT, GST_TIME_FORMAT ", retry %" GST_TIME_FORMAT ", num_retry %u",
GST_TIME_ARGS (timer->rtx_base), GST_TIME_ARGS (timer->rtx_delay), GST_TIME_ARGS (timer->rtx_base), GST_TIME_ARGS (timer->rtx_delay),
GST_TIME_ARGS (timer->rtx_retry)); GST_TIME_ARGS (timer->rtx_retry), timer->num_rtx_retry);
if (timer->rtx_retry + timer->rtx_delay > if (timer->rtx_retry + timer->rtx_delay > rtx_retry_period) {
(priv->rtx_retry_period * GST_MSECOND)) {
GST_DEBUG_OBJECT (jitterbuffer, "reschedule as LOST timer"); GST_DEBUG_OBJECT (jitterbuffer, "reschedule as LOST timer");
/* too many retransmission request, we now convert the timer /* too many retransmission request, we now convert the timer
* to a lost timer, leave the num_rtx_retry as it is for stats */ * to a lost timer, leave the num_rtx_retry as it is for stats */