mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 17:50:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpjitterbuffer: Add "rtx-max-retries" property

Browse source 
This property allows to limit the maximum number of retransmission
for a specific packet.

https://bugzilla.gnome.org/show_bug.cgi?id=739868
This commit is contained in:
Miguel París Díaz 2014-11-06 12:08:03 +01:00 committed by Sebastian Dröge
parent 05bd708fc5
commit c4bb6a098b
1 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gst/rtpmanager/gstrtpjitterbuffer.c
View file

@ -134,6 +134,7 @@ enum
#define DEFAULT_RTX_RETRY_TIMEOUT -1 #define DEFAULT_RTX_RETRY_TIMEOUT -1
#define DEFAULT_RTX_MIN_RETRY_TIMEOUT -1 #define DEFAULT_RTX_MIN_RETRY_TIMEOUT -1
#define DEFAULT_RTX_RETRY_PERIOD -1 #define DEFAULT_RTX_RETRY_PERIOD -1
#define DEFAULT_RTX_MAX_RETRIES -1
#define DEFAULT_AUTO_RTX_DELAY (20 * GST_MSECOND) #define DEFAULT_AUTO_RTX_DELAY (20 * GST_MSECOND)
#define DEFAULT_AUTO_RTX_TIMEOUT (40 * GST_MSECOND) #define DEFAULT_AUTO_RTX_TIMEOUT (40 * GST_MSECOND)
@ -154,6 +155,7 @@ enum
PROP_RTX_RETRY_TIMEOUT, PROP_RTX_RETRY_TIMEOUT,
PROP_RTX_MIN_RETRY_TIMEOUT, PROP_RTX_MIN_RETRY_TIMEOUT,
PROP_RTX_RETRY_PERIOD, PROP_RTX_RETRY_PERIOD,
PROP_RTX_MAX_RETRIES,
PROP_STATS, PROP_STATS,
PROP_LAST PROP_LAST
}; };
@ -250,6 +252,7 @@ struct _GstRtpJitterBufferPrivate
gint rtx_retry_timeout; gint rtx_retry_timeout;
gint rtx_min_retry_timeout; gint rtx_min_retry_timeout;
gint rtx_retry_period; gint rtx_retry_period;
gint rtx_max_retries;
/* the last seqnum we pushed out */ /* the last seqnum we pushed out */
guint32 last_popped_seqnum; guint32 last_popped_seqnum;
@ -623,6 +626,21 @@ gst_rtp_jitter_buffer_class_init (GstRtpJitterBufferClass * klass)
"Try to get a retransmission for this many ms " "Try to get a retransmission for this many ms "
"(-1 automatic)", -1, G_MAXINT, DEFAULT_RTX_RETRY_PERIOD, "(-1 automatic)", -1, G_MAXINT, DEFAULT_RTX_RETRY_PERIOD,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* GstRtpJitterBuffer:rtx-max-retries:
*
* The maximum number of retries to request a retransmission.
*
* This implies that as maximum (rtx-max-retries + 1) retransmissions will be requested.
* When -1 is used, the number of retransmission request will not be limited.
*
* Since: 1.6
*/
g_object_class_install_property (gobject_class, PROP_RTX_MAX_RETRIES,
g_param_spec_int ("rtx-max-retries", "RTX Max Retries",
"The maximum number of retries to request a retransmission. "
"(-1 not limited)", -1, G_MAXINT, DEFAULT_RTX_MAX_RETRIES,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/** /**
* GstRtpJitterBuffer:stats: * GstRtpJitterBuffer:stats:
* *
@ -756,6 +774,7 @@ gst_rtp_jitter_buffer_init (GstRtpJitterBuffer * jitterbuffer)
priv->rtx_retry_timeout = DEFAULT_RTX_RETRY_TIMEOUT; priv->rtx_retry_timeout = DEFAULT_RTX_RETRY_TIMEOUT;
priv->rtx_min_retry_timeout = DEFAULT_RTX_MIN_RETRY_TIMEOUT; priv->rtx_min_retry_timeout = DEFAULT_RTX_MIN_RETRY_TIMEOUT;
priv->rtx_retry_period = DEFAULT_RTX_RETRY_PERIOD; priv->rtx_retry_period = DEFAULT_RTX_RETRY_PERIOD;
priv->rtx_max_retries = DEFAULT_RTX_MAX_RETRIES;
priv->last_dts = -1; priv->last_dts = -1;
priv->last_rtptime = -1; priv->last_rtptime = -1;
@ -2887,8 +2906,9 @@ do_expected_timeout (GstRtpJitterBuffer * jitterbuffer, TimerData * timer,
GST_TIME_FORMAT ", retry %" GST_TIME_FORMAT ", num_retry %u", 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), timer->num_rtx_retry); GST_TIME_ARGS (timer->rtx_retry), timer->num_rtx_retry);
if ((priv->rtx_max_retries != -1
if (timer->rtx_retry + timer->rtx_delay > rtx_retry_period) { && timer->num_rtx_retry >= priv->rtx_max_retries)
|| (timer->rtx_retry + timer->rtx_delay > rtx_retry_period)) {
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 */
@ -3618,6 +3638,11 @@ gst_rtp_jitter_buffer_set_property (GObject * object,
priv->rtx_retry_period = g_value_get_int (value); priv->rtx_retry_period = g_value_get_int (value);
JBUF_UNLOCK (priv); JBUF_UNLOCK (priv);
break; break;
case PROP_RTX_MAX_RETRIES:
JBUF_LOCK (priv);
priv->rtx_max_retries = g_value_get_int (value);
JBUF_UNLOCK (priv);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -3709,6 +3734,11 @@ gst_rtp_jitter_buffer_get_property (GObject * object,
g_value_set_int (value, priv->rtx_retry_period); g_value_set_int (value, priv->rtx_retry_period);
JBUF_UNLOCK (priv); JBUF_UNLOCK (priv);
break; break;
case PROP_RTX_MAX_RETRIES:
JBUF_LOCK (priv);
g_value_set_int (value, priv->rtx_max_retries);
JBUF_UNLOCK (priv);
break;
case PROP_STATS: case PROP_STATS:
g_value_take_boxed (value, g_value_take_boxed (value,
gst_rtp_jitter_buffer_create_stats (jitterbuffer)); gst_rtp_jitter_buffer_create_stats (jitterbuffer));