mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-19 00:01:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/rtpmanager/rtpsession.c: When reconsidering RTCP timeouts, set the next timeout against the last report time inst...

Browse source 
Original commit message from CVS:
* gst/rtpmanager/rtpsession.c: (rtp_session_next_timeout),
When reconsidering RTCP timeouts, set the next timeout against the last
report time instead of the current clock time so that we don't end up
reconsidering forever.
This commit is contained in:
Wim Taymans 2007-10-05 17:26:14 +00:00
parent 6e5d23b3d7
commit f4b32ca36d
2 changed files with 39 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2007-10-05 Wim Taymans <wim.taymans@gmail.com>
* gst/rtpmanager/rtpsession.c: (rtp_session_next_timeout),
When reconsidering RTCP timeouts, set the next timeout against the last
report time instead of the current clock time so that we don't end up
reconsidering forever.
2007-10-05 Wim Taymans <wim.taymans@gmail.com> 2007-10-05 Wim Taymans <wim.taymans@gmail.com>
* gst/rtpmanager/gstrtpjitterbuffer.c: * gst/rtpmanager/gstrtpjitterbuffer.c:

43
gst/rtpmanager/rtpsession.c
View file

@ -1569,19 +1569,35 @@ rtp_session_next_timeout (RTPSession * sess, GstClockTime time)
result = sess->next_rtcp_check_time; result = sess->next_rtcp_check_time;
GST_DEBUG ("current time: %" GST_TIME_FORMAT ", next :%" GST_TIME_FORMAT,
GST_TIME_ARGS (time), GST_TIME_ARGS (result));
if (result < time) {
GST_DEBUG ("take current time as base");
/* our previous check time expired, start counting from the current time
* again. */
result = time;
}
if (sess->source->received_bye) { if (sess->source->received_bye) {
if (sess->sent_bye) if (sess->sent_bye) {
GST_DEBUG ("we sent BYE already");
result = GST_CLOCK_TIME_NONE; result = GST_CLOCK_TIME_NONE;
else if (sess->stats.active_sources >= 50) } else if (sess->stats.active_sources >= 50) {
GST_DEBUG ("reconsider BYE, more than 50 sources");
/* reconsider BYE if members >= 50 */ /* reconsider BYE if members >= 50 */
result = time + calculate_rtcp_interval (sess, FALSE, TRUE); result += calculate_rtcp_interval (sess, FALSE, TRUE);
}
} else { } else {
if (sess->first_rtcp) if (sess->first_rtcp) {
GST_DEBUG ("first RTCP packet");
/* we are called for the first time */ /* we are called for the first time */
result = time + calculate_rtcp_interval (sess, FALSE, TRUE); result += calculate_rtcp_interval (sess, FALSE, TRUE);
else if (sess->next_rtcp_check_time < time) } else if (sess->next_rtcp_check_time < time) {
GST_DEBUG ("old check time expired, getting new timeout");
/* get a new timeout when we need to */ /* get a new timeout when we need to */
result = time + calculate_rtcp_interval (sess, FALSE, FALSE); result += calculate_rtcp_interval (sess, FALSE, FALSE);
}
} }
sess->next_rtcp_check_time = result; sess->next_rtcp_check_time = result;
@ -1784,20 +1800,25 @@ session_bye (RTPSession * sess, ReportData * data)
static gboolean static gboolean
is_rtcp_time (RTPSession * sess, GstClockTime time, ReportData * data) is_rtcp_time (RTPSession * sess, GstClockTime time, ReportData * data)
{ {
GstClockTime new_send_time; GstClockTime new_send_time, elapsed;
gboolean result; gboolean result;
/* no need to check yet */ /* no need to check yet */
if (sess->next_rtcp_check_time > time) { if (sess->next_rtcp_check_time > time) {
GST_DEBUG ("no check time yet"); GST_DEBUG ("no check time yet, next %" GST_TIME_FORMAT " > now %"
GST_TIME_FORMAT, GST_TIME_ARGS (sess->next_rtcp_check_time),
GST_TIME_ARGS (time));
return FALSE; return FALSE;
} }
/* get elapsed time since we last reported */
elapsed = time - sess->last_rtcp_send_time;
/* perform forward reconsideration */ /* perform forward reconsideration */
new_send_time = rtp_stats_add_rtcp_jitter (&sess->stats, data->interval); new_send_time = rtp_stats_add_rtcp_jitter (&sess->stats, data->interval);
GST_DEBUG ("forward reconsideration %" GST_TIME_FORMAT, GST_DEBUG ("forward reconsideration %" GST_TIME_FORMAT ", elapsed %"
GST_TIME_ARGS (new_send_time)); GST_TIME_FORMAT, GST_TIME_ARGS (new_send_time), GST_TIME_ARGS (elapsed));
new_send_time += sess->last_rtcp_send_time; new_send_time += sess->last_rtcp_send_time;