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

rtpsession: Keep track of tp/tn and t_rr_last separately

Browse source 
Otherwise we can't properly schedule RTCP in feedback profiles as we need to
distinguish the time when we last checked for sending RTCP (tp) but might have
suppressed it, and the time when we last actually sent a non-early RTCP
packet.

This together with the other changes should now properly implement RTCP
scheduling according to RFC4585, and especially allow us to send feedback
packets a lot if needed but only send regular RTCP packets every once in a
while.

https://bugzilla.gnome.org/show_bug.cgi?id=746543
This commit is contained in:
Sebastian Dröge 2015-05-04 13:51:50 +02:00
parent 3122ef4ae3
commit 6f830e5bd5
2 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gst/rtpmanager/rtpsession.c
View file

@ -572,6 +572,7 @@ rtp_session_init (RTPSession * sess)
sess->first_rtcp = TRUE; sess->first_rtcp = TRUE;
sess->next_rtcp_check_time = GST_CLOCK_TIME_NONE; sess->next_rtcp_check_time = GST_CLOCK_TIME_NONE;
sess->last_rtcp_check_time = GST_CLOCK_TIME_NONE;
sess->last_rtcp_send_time = GST_CLOCK_TIME_NONE; sess->last_rtcp_send_time = GST_CLOCK_TIME_NONE;
sess->allow_early = TRUE; sess->allow_early = TRUE;
@ -2908,6 +2909,7 @@ rtp_session_schedule_bye_locked (RTPSession * sess, GstClockTime current_time)
/* reschedule transmission */ /* reschedule transmission */
sess->last_rtcp_send_time = current_time; sess->last_rtcp_send_time = current_time;
sess->last_rtcp_check_time = current_time;
interval = calculate_rtcp_interval (sess, FALSE, TRUE); interval = calculate_rtcp_interval (sess, FALSE, TRUE);
if (interval != GST_CLOCK_TIME_NONE) if (interval != GST_CLOCK_TIME_NONE)
@ -3553,19 +3555,19 @@ early:
if (interval != GST_CLOCK_TIME_NONE) if (interval != GST_CLOCK_TIME_NONE)
interval = rtp_stats_add_rtcp_jitter (stats, interval); interval = rtp_stats_add_rtcp_jitter (stats, interval);
if (sess->last_rtcp_send_time != GST_CLOCK_TIME_NONE) { if (sess->last_rtcp_check_time != GST_CLOCK_TIME_NONE) {
/* perform forward reconsideration */ /* perform forward reconsideration */
if (interval != GST_CLOCK_TIME_NONE) { if (interval != GST_CLOCK_TIME_NONE) {
GstClockTime elapsed; GstClockTime elapsed;
/* get elapsed time since we last reported */ /* get elapsed time since we last reported */
elapsed = current_time - sess->last_rtcp_send_time; elapsed = current_time - sess->last_rtcp_check_time;
GST_DEBUG ("forward reconsideration %" GST_TIME_FORMAT ", elapsed %" GST_DEBUG ("forward reconsideration %" GST_TIME_FORMAT ", elapsed %"
GST_TIME_FORMAT, GST_TIME_ARGS (interval), GST_TIME_ARGS (elapsed)); GST_TIME_FORMAT, GST_TIME_ARGS (interval), GST_TIME_ARGS (elapsed));
new_send_time = interval + sess->last_rtcp_send_time; new_send_time = interval + sess->last_rtcp_check_time;
} else { } else {
new_send_time = sess->last_rtcp_send_time; new_send_time = sess->last_rtcp_check_time;
} }
} else { } else {
/* If this is the first RTCP packet, we can reconsider anything based /* If this is the first RTCP packet, we can reconsider anything based
@ -3586,11 +3588,13 @@ early:
return FALSE; return FALSE;
} }
sess->next_rtcp_check_time = current_time + interval; sess->next_rtcp_check_time = current_time + interval;
} else if (interval != GST_CLOCK_TIME_NONE) { }
if ((sess->rtp_profile == GST_RTP_PROFILE_AVPF
|| sess->rtp_profile == GST_RTP_PROFILE_SAVPF)
&& interval != GST_CLOCK_TIME_NONE) {
/* Apply the rules from RFC 4585 section 3.5.3 */ /* Apply the rules from RFC 4585 section 3.5.3 */
if ((sess->rtp_profile == GST_RTP_PROFILE_AVPF if (stats->min_interval != 0 && !sess->first_rtcp) {
|| sess->rtp_profile == GST_RTP_PROFILE_SAVPF)
&& stats->min_interval != 0 && !sess->first_rtcp) {
GstClockTime T_rr_current_interval = GstClockTime T_rr_current_interval =
g_random_double_range (0.5, 1.5) * stats->min_interval * GST_SECOND; g_random_double_range (0.5, 1.5) * stats->min_interval * GST_SECOND;
@ -3813,6 +3817,7 @@ rtp_session_on_timeout (RTPSession * sess, GstClockTime current_time,
* receivers or senders */ * receivers or senders */
if (!data.is_early && !data.may_suppress) if (!data.is_early && !data.may_suppress)
sess->last_rtcp_send_time = data.current_time; sess->last_rtcp_send_time = data.current_time;
sess->last_rtcp_check_time = data.current_time;
sess->first_rtcp = FALSE; sess->first_rtcp = FALSE;
sess->next_early_rtcp_time = GST_CLOCK_TIME_NONE; sess->next_early_rtcp_time = GST_CLOCK_TIME_NONE;
sess->scheduled_bye = FALSE; sess->scheduled_bye = FALSE;
@ -3925,7 +3930,7 @@ rtp_session_request_early_rtcp (RTPSession * sess, GstClockTime current_time,
goto end; goto end;
} }
T_rr = sess->next_rtcp_check_time - sess->last_rtcp_send_time; T_rr = sess->next_rtcp_check_time - sess->last_rtcp_check_time;
/* RFC 4585 section 3.5.2 step 2b */ /* RFC 4585 section 3.5.2 step 2b */
/* If the total sources is <=2, then there is only us and one peer */ /* If the total sources is <=2, then there is only us and one peer */
@ -3987,8 +3992,8 @@ rtp_session_request_early_rtcp (RTPSession * sess, GstClockTime current_time,
/* Delay next regular RTCP packet to not exceed the short-term /* Delay next regular RTCP packet to not exceed the short-term
* RTCP bandwidth when using early feedback as compared to * RTCP bandwidth when using early feedback as compared to
* without */ * without */
sess->next_rtcp_check_time = sess->last_rtcp_send_time + 2 * T_rr; sess->next_rtcp_check_time = sess->last_rtcp_check_time + 2 * T_rr;
sess->last_rtcp_send_time += T_rr; sess->last_rtcp_check_time += T_rr;
GST_LOG_OBJECT (sess, "next early RTCP time %" GST_TIME_FORMAT GST_LOG_OBJECT (sess, "next early RTCP time %" GST_TIME_FORMAT
", next regular RTCP time %" GST_TIME_FORMAT, ", next regular RTCP time %" GST_TIME_FORMAT,

5
gst/rtpmanager/rtpsession.h
View file

@ -239,8 +239,9 @@ struct _RTPSession {
guint total_sources; guint total_sources;
guint16 generation; guint16 generation;
GstClockTime next_rtcp_check_time; GstClockTime next_rtcp_check_time; /* tn */
GstClockTime last_rtcp_send_time; GstClockTime last_rtcp_check_time; /* tp */
GstClockTime last_rtcp_send_time; /* t_rr_last */
GstClockTime start_time; GstClockTime start_time;
gboolean first_rtcp; gboolean first_rtcp;
gboolean allow_early; gboolean allow_early;