mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-04 07:09:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpjitterbuffer: limit the retry frequency

Browse source 
When the RTT and jitter are very low (such as on a local network), the
calculated retransmission timeout is very small. Set some sensible lower
boundary to the timeout by adding a new property. We use the packet
spacing as a lower boundary by default.
This commit is contained in:
Wim Taymans 2014-10-22 15:04:24 +02:00
parent 4b5243c43d
commit bd09dc96e9
1 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gst/rtpmanager/gstrtpjitterbuffer.c
View file

@ -132,6 +132,7 @@ enum
#define DEFAULT_RTX_MIN_DELAY 0
#define DEFAULT_RTX_DELAY_REORDER 3
#define DEFAULT_RTX_RETRY_TIMEOUT -1
#define DEFAULT_RTX_MIN_RETRY_TIMEOUT -1
#define DEFAULT_RTX_RETRY_PERIOD -1
#define DEFAULT_AUTO_RTX_DELAY (20 * GST_MSECOND)
@ -151,6 +152,7 @@ enum
PROP_RTX_MIN_DELAY,
PROP_RTX_DELAY_REORDER,
PROP_RTX_RETRY_TIMEOUT,
PROP_RTX_MIN_RETRY_TIMEOUT,
PROP_RTX_RETRY_PERIOD,
PROP_STATS,
PROP_LAST
@ -246,6 +248,7 @@ struct _GstRtpJitterBufferPrivate
guint rtx_min_delay;
gint rtx_delay_reorder;
gint rtx_retry_timeout;
gint rtx_min_retry_timeout;
gint rtx_retry_period;
/* the last seqnum we pushed out */
@ -586,6 +589,23 @@ gst_rtp_jitter_buffer_class_init (GstRtpJitterBufferClass * klass)
"Retry sending a transmission event after this timeout in "
"ms (-1 automatic)", -1, G_MAXINT, DEFAULT_RTX_RETRY_TIMEOUT,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* GstRtpJitterBuffer::rtx-min-retry-timeout:
*
* The minimum amount of time between retry timeouts. When
* GstRtpJitterBuffer::rtx-retry-timeout is -1, this value ensures a
* minimum interval between retry timeouts.
*
* When -1 is used, the value will be estimated based on the
* packet spacing.
*
* Since: 1.6
*/
g_object_class_install_property (gobject_class, PROP_RTX_MIN_RETRY_TIMEOUT,
g_param_spec_int ("rtx-min-retry-timeout", "RTX Min Retry Timeout",
"Minimum timeout between sending a transmission event in "
"ms (-1 automatic)", -1, G_MAXINT, DEFAULT_RTX_MIN_RETRY_TIMEOUT,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* GstRtpJitterBuffer:rtx-retry-period:
*
@ -732,6 +752,7 @@ gst_rtp_jitter_buffer_init (GstRtpJitterBuffer * jitterbuffer)
priv->rtx_min_delay = DEFAULT_RTX_MIN_DELAY;
priv->rtx_delay_reorder = DEFAULT_RTX_DELAY_REORDER;
priv->rtx_retry_timeout = DEFAULT_RTX_RETRY_TIMEOUT;
priv->rtx_min_retry_timeout = DEFAULT_RTX_MIN_RETRY_TIMEOUT;
priv->rtx_retry_period = DEFAULT_RTX_RETRY_PERIOD;
priv->last_dts = -1;
@ -2689,6 +2710,7 @@ static GstClockTime
get_rtx_retry_timeout (GstRtpJitterBufferPrivate * priv)
{
GstClockTime rtx_retry_timeout;
GstClockTime rtx_min_retry_timeout;
if (priv->rtx_retry_timeout == -1) {
if (priv->avg_rtx_rtt == 0)
@ -2700,6 +2722,15 @@ get_rtx_retry_timeout (GstRtpJitterBufferPrivate * priv)
} else {
rtx_retry_timeout = priv->rtx_retry_timeout * GST_MSECOND;
}
/* make sure we don't retry too often. On very low latency networks,
* the RTT and jitter can be very low. */
if (priv->rtx_min_retry_timeout == -1) {
rtx_min_retry_timeout = priv->packet_spacing;
} else {
rtx_min_retry_timeout = priv->rtx_min_retry_timeout * GST_MSECOND;
}
rtx_retry_timeout = MAX (rtx_retry_timeout, rtx_min_retry_timeout);
return rtx_retry_timeout;
}