rtspconnection: calculate better timeout value

We want to send the keealive message a little earlier than the timeout value
specifies. Scale this based on the value of the timeout instead of just assuming
5 seconds.
This commit is contained in:
Wim Taymans 2010-10-29 14:17:44 +01:00 committed by Wim Taymans
parent 2e888cb784
commit ac06dd5d0e

View File

@ -2482,18 +2482,30 @@ gst_rtsp_connection_next_timeout (GstRTSPConnection * conn, GTimeVal * timeout)
gdouble elapsed; gdouble elapsed;
glong sec; glong sec;
gulong usec; gulong usec;
gint ctimeout;
g_return_val_if_fail (conn != NULL, GST_RTSP_EINVAL); g_return_val_if_fail (conn != NULL, GST_RTSP_EINVAL);
g_return_val_if_fail (timeout != NULL, GST_RTSP_EINVAL); g_return_val_if_fail (timeout != NULL, GST_RTSP_EINVAL);
/* Because we should act before the timeout we timeout 5 ctimeout = conn->timeout;
* seconds in advance. */ if (ctimeout >= 20) {
elapsed = g_timer_elapsed (conn->timer, &usec) + 5; /* Because we should act before the timeout we timeout 5
if (elapsed >= conn->timeout) { * seconds in advance. */
ctimeout -= 5;
} else if (ctimeout >= 5) {
/* else timeout 20% earlier */
ctimeout -= ctimeout / 5;
} else if (ctimeout >= 1) {
/* else timeout 1 second earlier */
ctimeout -= 1;
}
elapsed = g_timer_elapsed (conn->timer, &usec);
if (elapsed >= ctimeout) {
sec = 0; sec = 0;
usec = 0; usec = 0;
} else { } else {
sec = conn->timeout - elapsed; sec = ctimeout - elapsed;
if (usec <= G_USEC_PER_SEC) if (usec <= G_USEC_PER_SEC)
usec = G_USEC_PER_SEC - usec; usec = G_USEC_PER_SEC - usec;
else else