mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-06 10:42:22 +00:00
Code Issues 1 Projects Releases Wiki Activity

uridownloader: properly unref the urisrc between downloads

Browse source 
This prevents leaking the element. Also sets the bus to flushing
to completely reset the downloader state
This commit is contained in:
Thiago Santos 2013-02-07 00:28:15 -03:00
parent f72869816c
commit 99efe87b5d
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst-libs/gst/uridownloader/gsturidownloader.c
View file

@ -248,7 +248,8 @@ gst_uri_downloader_stop (GstUriDownloader * downloader)
{ {
GstPad *pad; GstPad *pad;
GST_DEBUG_OBJECT (downloader, "Stopping source element"); GST_DEBUG_OBJECT (downloader, "Stopping source element %s",
GST_ELEMENT_NAME (downloader->priv->urisrc));
/* remove the bus' sync handler */ /* remove the bus' sync handler */
gst_bus_set_sync_handler (downloader->priv->bus, NULL, NULL, NULL); gst_bus_set_sync_handler (downloader->priv->bus, NULL, NULL, NULL);
@ -262,6 +263,11 @@ gst_uri_downloader_stop (GstUriDownloader * downloader)
gst_element_set_state (downloader->priv->urisrc, GST_STATE_NULL); gst_element_set_state (downloader->priv->urisrc, GST_STATE_NULL);
gst_element_get_state (downloader->priv->urisrc, NULL, NULL, gst_element_get_state (downloader->priv->urisrc, NULL, NULL,
GST_CLOCK_TIME_NONE); GST_CLOCK_TIME_NONE);
gst_element_set_bus (downloader->priv->urisrc, NULL);
gst_object_unref (downloader->priv->urisrc);
downloader->priv->urisrc = NULL;
gst_bus_set_flushing (downloader->priv->bus, TRUE);
} }
void void
@ -308,6 +314,8 @@ gst_uri_downloader_set_uri (GstUriDownloader * downloader, const gchar * uri)
if (!gst_uri_is_valid (uri)) if (!gst_uri_is_valid (uri))
return FALSE; return FALSE;
g_assert (downloader->priv->urisrc == NULL);
GST_DEBUG_OBJECT (downloader, "Creating source element for the URI:%s", uri); GST_DEBUG_OBJECT (downloader, "Creating source element for the URI:%s", uri);
downloader->priv->urisrc = downloader->priv->urisrc =
gst_element_make_from_uri (GST_URI_SRC, uri, NULL, NULL); gst_element_make_from_uri (GST_URI_SRC, uri, NULL, NULL);
@ -346,6 +354,7 @@ gst_uri_downloader_fetch_uri (GstUriDownloader * downloader, const gchar * uri)
downloader->priv->download = gst_fragment_new (); downloader->priv->download = gst_fragment_new ();
gst_bus_set_flushing (downloader->priv->bus, FALSE);
ret = gst_element_set_state (downloader->priv->urisrc, GST_STATE_PLAYING); ret = gst_element_set_state (downloader->priv->urisrc, GST_STATE_PLAYING);
if (ret == GST_STATE_CHANGE_FAILURE) { if (ret == GST_STATE_CHANGE_FAILURE) {
g_object_unref (downloader->priv->download); g_object_unref (downloader->priv->download);