mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 04:01:08 +00:00
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:
parent
2e888cb784
commit
ac06dd5d0e
1 changed files with 17 additions and 5 deletions
|
@ -2482,18 +2482,30 @@ gst_rtsp_connection_next_timeout (GstRTSPConnection * conn, GTimeVal * timeout)
|
|||
gdouble elapsed;
|
||||
glong sec;
|
||||
gulong usec;
|
||||
gint ctimeout;
|
||||
|
||||
g_return_val_if_fail (conn != NULL, GST_RTSP_EINVAL);
|
||||
g_return_val_if_fail (timeout != NULL, GST_RTSP_EINVAL);
|
||||
|
||||
/* Because we should act before the timeout we timeout 5
|
||||
* seconds in advance. */
|
||||
elapsed = g_timer_elapsed (conn->timer, &usec) + 5;
|
||||
if (elapsed >= conn->timeout) {
|
||||
ctimeout = conn->timeout;
|
||||
if (ctimeout >= 20) {
|
||||
/* Because we should act before the timeout we timeout 5
|
||||
* 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;
|
||||
usec = 0;
|
||||
} else {
|
||||
sec = conn->timeout - elapsed;
|
||||
sec = ctimeout - elapsed;
|
||||
if (usec <= G_USEC_PER_SEC)
|
||||
usec = G_USEC_PER_SEC - usec;
|
||||
else
|
||||
|
|
Loading…
Reference in a new issue