mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-29 23:32:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

client: refactor cleanup of cached media

Browse source
This commit is contained in:
Wim Taymans 2014-11-07 12:48:53 +01:00
parent 1a004c5d46
commit bd8b2d3fb9
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -361,6 +361,23 @@ cleanup_session (GstRTSPClient * client, GstRTSPSession * sess,
return GST_RTSP_FILTER_REMOVE;
}
static void
clean_cached_media (GstRTSPClient * client, gboolean unprepare)
{
GstRTSPClientPrivate *priv = client->priv;
if (priv->path) {
g_free (priv->path);
priv->path = NULL;
}
if (priv->media) {
if (unprepare)
gst_rtsp_media_unprepare (priv->media);
g_object_unref (priv->media);
priv->media = NULL;
}
}
/* A client is finalized when the connection is broken */
static void
gst_rtsp_client_finalize (GObject * obj)
@ -400,12 +417,7 @@ gst_rtsp_client_finalize (GObject * obj)
if (priv->thread_pool)
g_object_unref (priv->thread_pool);
if (priv->path)
g_free (priv->path);
if (priv->media) {
gst_rtsp_media_unprepare (priv->media);
g_object_unref (priv->media);
}
clean_cached_media (client, TRUE);
g_free (priv->server_ip);
g_mutex_clear (&priv->lock);
@ -595,14 +607,7 @@ find_media (GstRTSPClient * client, GstRTSPContext * ctx, gchar * path,
/* remove any previously cached values before we try to construct a new
* media for uri */
if (priv->path)
g_free (priv->path);
priv->path = NULL;
if (priv->media) {
gst_rtsp_media_unprepare (priv->media);
g_object_unref (priv->media);
}
priv->media = NULL;
clean_cached_media (client, TRUE);
/* prepare the media and add it to the pipeline */
if (!(media = gst_rtsp_media_factory_construct (factory, ctx->uri)))
@ -1825,12 +1830,7 @@ handle_setup_request (GstRTSPClient * client, GstRTSPContext * ctx)
goto sessmedia_unavailable;
/* don't cache media anymore */
if (priv->path)
g_free (priv->path);
priv->path = NULL;
if (priv->media)
g_object_unref (priv->media);
priv->media = NULL;
clean_cached_media (client, FALSE);
} else {
g_object_unref (media);
}