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

uridownloader: make cancelled state 'permanent' until a reset

Browse source 
When downloading and cancelling quickly the uridownloader object and the
element using it could miss the cancelled window and the uridownloader
would fetch the wrong URI and block on subsequent fetches.

This was also problematic when stopping elements, while one task would
call the cancel, another element thread could issue a new fetch_uri. As
the cancel state isn't 'permanent' this fetch_uri would block and
prevent the whole element from stopping and going to NULL.

This patch makes the 'cancelled' state permanent until a
gst_uri_downloader_reset is called. This way the element knows the
window where the uridownloader isn't active and only reactivate it when
ready.
This commit is contained in:
Andre Moreira Magalhaes (andrunko) 2013-04-16 17:23:02 -03:00 committed by Thiago Santos
parent 859635ca01
commit f72869816c
2 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,6 +41,7 @@ struct _GstUriDownloaderPrivate
GstFragment *download;
GMutex lock;
GCond cond;
gboolean cancelled;
};
static void gst_uri_downloader_finalize (GObject * object);
@ -263,6 +264,16 @@ gst_uri_downloader_stop (GstUriDownloader * downloader)
GST_CLOCK_TIME_NONE);
}
void
gst_uri_downloader_reset (GstUriDownloader * downloader)
{
g_return_if_fail (downloader != NULL);
GST_OBJECT_LOCK (downloader);
downloader->priv->cancelled = FALSE;
GST_OBJECT_UNLOCK (downloader);
}
void
gst_uri_downloader_cancel (GstUriDownloader * downloader)
{
@ -271,13 +282,19 @@ gst_uri_downloader_cancel (GstUriDownloader * downloader)
GST_DEBUG_OBJECT (downloader, "Cancelling download");
g_object_unref (downloader->priv->download);
downloader->priv->download = NULL;
downloader->priv->cancelled = TRUE;
GST_OBJECT_UNLOCK (downloader);
GST_DEBUG_OBJECT (downloader, "Signaling chain funtion");
g_mutex_lock (&downloader->priv->lock);
g_cond_signal (&downloader->priv->cond);
g_mutex_unlock (&downloader->priv->lock);
} else {
gboolean cancelled;
cancelled = downloader->priv->cancelled;
downloader->priv->cancelled = TRUE;
GST_OBJECT_UNLOCK (downloader);
if (cancelled)
GST_DEBUG_OBJECT (downloader,
"Trying to cancell a download that was alredy cancelled");
}
@ -319,6 +336,10 @@ gst_uri_downloader_fetch_uri (GstUriDownloader * downloader, const gchar * uri)
g_mutex_lock (&downloader->priv->lock);
if (downloader->priv->cancelled) {
goto quit;
}
if (!gst_uri_downloader_set_uri (downloader, uri)) {
goto quit;
}
@ -337,9 +358,17 @@ gst_uri_downloader_fetch_uri (GstUriDownloader * downloader, const gchar * uri)
* - the download failed (Error message on the fetcher bus)
* - the download was canceled
*/
GST_DEBUG_OBJECT (downloader, "Waiting to fetch the URI");
GST_DEBUG_OBJECT (downloader, "Waiting to fetch the URI %s", uri);
g_cond_wait (&downloader->priv->cond, &downloader->priv->lock);
if (downloader->priv->cancelled) {
if (downloader->priv->download) {
g_object_unref (downloader->priv->download);
downloader->priv->download = NULL;
}
goto quit;
}
GST_OBJECT_LOCK (downloader);
download = downloader->priv->download;
downloader->priv->download = NULL;

1
gst-libs/gst/uridownloader/gsturidownloader.h
View file

@ -57,6 +57,7 @@ GType gst_uri_downloader_get_type (void);
GstUriDownloader * gst_uri_downloader_new (void);
GstFragment * gst_uri_downloader_fetch_uri (GstUriDownloader * downloader, const gchar * uri);
void gst_uri_downloader_reset (GstUriDownloader *downloader);
void gst_uri_downloader_cancel (GstUriDownloader *downloader);
void gst_uri_downloader_free (GstUriDownloader *downloader);