mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 04:31:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpsession: Delay the next regular RTCP packet after early RTCP

Browse source 
This is required to not exceed the short term average RTCP bitrate when
using early feedback as compared to without early feedback.
This commit is contained in:
Sebastian Dröge 2015-01-22 10:29:39 +01:00
parent bc9111a03d
commit b07b7736b3
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/rtpmanager/rtpsession.c
View file

@ -3791,7 +3791,7 @@ gboolean
rtp_session_request_early_rtcp (RTPSession * sess, GstClockTime current_time, rtp_session_request_early_rtcp (RTPSession * sess, GstClockTime current_time,
GstClockTime max_delay) GstClockTime max_delay)
{ {
GstClockTime T_dither_max; GstClockTime T_dither_max, T_rr;
gboolean ret; gboolean ret;
/* Implements the algorithm described in RFC 4585 section 3.5.2 */ /* Implements the algorithm described in RFC 4585 section 3.5.2 */
@ -3812,6 +3812,8 @@ 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;
/* 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 */
/* When there is one auxiliary stream the session can still do point /* When there is one auxiliary stream the session can still do point
@ -3821,7 +3823,7 @@ rtp_session_request_early_rtcp (RTPSession * sess, GstClockTime current_time,
T_dither_max = 0; T_dither_max = 0;
} else { } else {
/* Divide by 2 because l = 0.5 */ /* Divide by 2 because l = 0.5 */
T_dither_max = sess->next_rtcp_check_time - sess->last_rtcp_send_time; T_dither_max = T_rr;
T_dither_max /= 2; T_dither_max /= 2;
} }
@ -3861,8 +3863,11 @@ rtp_session_request_early_rtcp (RTPSession * sess, GstClockTime current_time,
/* RFC 4585 section 3.5.2 step 6 */ /* RFC 4585 section 3.5.2 step 6 */
sess->allow_early = FALSE; sess->allow_early = FALSE;
/* TODO(mparis): "R MUST recalculate tn = tp + 2*T_rr, /* Delay next regular RTCP packet to not exceed the short-term
* and MUST set tp to the previous tn" */ * RTCP bandwidth when using early feedback as compared to
* without */
sess->next_rtcp_check_time = sess->last_rtcp_send_time + 2 * T_rr;
sess->last_rtcp_send_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,
GST_TIME_ARGS (sess->next_early_rtcp_time)); GST_TIME_ARGS (sess->next_early_rtcp_time));