mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-11 16:55:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp-client: Session filter in unwatch session

Browse source 
Call session filter with filter_session_media as paramer in
client_unwatch_session if using drop_backlog = FALSE.

In client_unwatch_session its allowed to grow the watchs backlog.
If using drop_backlog = FALSE and the backlog is full it will cause
a deadlock when setting session media state to NULL
if the backlog is not allowed to grow.

https://bugzilla.gnome.org/show_bug.cgi?id=771983
This commit is contained in:
Göran Jönsson 2016-09-26 11:16:04 +02:00 committed by Sebastian Dröge
parent 34ed1d0bea
commit dbf91ab231
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst/rtsp-server/rtsp-client.c
View file

@ -416,6 +416,11 @@ client_unwatch_session (GstRTSPClient * client, GstRTSPSession * session,
priv->session_removed_id = 0; priv->session_removed_id = 0;
} }
if (!priv->drop_backlog) {
/* unlink all media managed in this session */
gst_rtsp_session_filter (session, filter_session_media, client);
}
/* remove the session */ /* remove the session */
g_object_unref (session); g_object_unref (session);
} }
@ -425,10 +430,13 @@ cleanup_session (GstRTSPClient * client, GstRTSPSession * sess,
gpointer user_data) gpointer user_data)
{ {
gboolean *closed = user_data; gboolean *closed = user_data;
GstRTSPClientPrivate *priv = client->priv;
/* unlink all media managed in this session. This needs to happen if (priv->drop_backlog) {
* without the client lock, so we really want to do it here. */ /* unlink all media managed in this session. This needs to happen
gst_rtsp_session_filter (sess, filter_session_media, user_data); * without the client lock, so we really want to do it here. */
gst_rtsp_session_filter (sess, filter_session_media, user_data);
}
if (*closed) if (*closed)
return GST_RTSP_FILTER_REMOVE; return GST_RTSP_FILTER_REMOVE;