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

rtsp-session: Timeout in header.

Browse source 
Adding the possbilty to always have timout in header.
This is configurabe with setting "timeout-always-visible".

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=728264
This commit is contained in:
Göran Jönsson 2014-05-27 12:36:52 +02:00 committed by Wim Taymans
parent 35a6c8cbcc
commit aaf921cac4
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gst/rtsp-server/rtsp-session.c
View file

@ -56,6 +56,7 @@ struct _GstRTSPSessionPrivate
gchar *sessionid; gchar *sessionid;
guint timeout; guint timeout;
gboolean timeout_always_visible;
GTimeVal create_time; /* immutable */ GTimeVal create_time; /* immutable */
GTimeVal last_access; GTimeVal last_access;
gint expire_count; gint expire_count;
@ -65,13 +66,15 @@ struct _GstRTSPSessionPrivate
#undef DEBUG #undef DEBUG
#define DEFAULT_TIMEOUT 60 #define DEFAULT_TIMEOUT 60
#define DEFAULT_ALWAYS_VISIBLE FALSE
enum enum
{ {
PROP_0, PROP_0,
PROP_SESSIONID, PROP_SESSIONID,
PROP_TIMEOUT, PROP_TIMEOUT,
PROP_TIMEOUT_ALWAYS_VISIBLE,
PROP_LAST PROP_LAST
}; };
@ -109,6 +112,11 @@ gst_rtsp_session_class_init (GstRTSPSessionClass * klass)
"the timeout of the session (0 = never)", 0, G_MAXUINT, "the timeout of the session (0 = never)", 0, G_MAXUINT,
DEFAULT_TIMEOUT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); DEFAULT_TIMEOUT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_TIMEOUT_ALWAYS_VISIBLE,
g_param_spec_boolean ("timeout-always-visible", "Timeout Always Visible ",
"timeout always visible in header",
DEFAULT_ALWAYS_VISIBLE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
GST_DEBUG_CATEGORY_INIT (rtsp_session_debug, "rtspsession", 0, GST_DEBUG_CATEGORY_INIT (rtsp_session_debug, "rtspsession", 0,
"GstRTSPSession"); "GstRTSPSession");
} }
@ -161,6 +169,9 @@ gst_rtsp_session_get_property (GObject * object, guint propid,
case PROP_TIMEOUT: case PROP_TIMEOUT:
g_value_set_uint (value, gst_rtsp_session_get_timeout (session)); g_value_set_uint (value, gst_rtsp_session_get_timeout (session));
break; break;
case PROP_TIMEOUT_ALWAYS_VISIBLE:
g_value_set_boolean (value, priv->timeout_always_visible);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, propid, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, propid, pspec);
} }
@ -181,6 +192,11 @@ gst_rtsp_session_set_property (GObject * object, guint propid,
case PROP_TIMEOUT: case PROP_TIMEOUT:
gst_rtsp_session_set_timeout (session, g_value_get_uint (value)); gst_rtsp_session_set_timeout (session, g_value_get_uint (value));
break; break;
case PROP_TIMEOUT_ALWAYS_VISIBLE:
g_mutex_lock (&priv->lock);
priv->timeout_always_visible = g_value_get_boolean (value);
g_mutex_unlock (&priv->lock);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, propid, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, propid, pspec);
} }
@ -433,8 +449,9 @@ gst_rtsp_session_get_header (GstRTSPSession * session)
priv = session->priv; priv = session->priv;
g_mutex_lock (&priv->lock); g_mutex_lock (&priv->lock);
if (priv->timeout != 60) if (priv->timeout_always_visible || priv->timeout != 60)
result = g_strdup_printf ("%s; timeout=%d", priv->sessionid, priv->timeout); result = g_strdup_printf ("%s; timeout=%d", priv->sessionid, priv->timeout);
else else
result = g_strdup (priv->sessionid); result = g_strdup (priv->sessionid);