FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

uridownloader: do not set cancelled unless explicitly called by user

Browse Source 
Cancelled is a 'permanent' state of the uridownloader and is only
removed by a call to _reset. When a download fails we just want to
return NULL on the fetch function and leave the downloader ready
for another fetch, otherwise the user has to call _reset after
failed downloader, even when it didn't call _cancel.
This commit is contained in:
Thiago Santos 2013-07-08 22:00:48 -03:00
parent f3d53fcd97
commit 9e313eb0a7
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gst-libs/gst/uridownloader/gsturidownloader.c
View File

@ -203,7 +203,16 @@ gst_uri_downloader_bus_handler (GstBus * bus,
/* remove the sync handler to avoid duplicated messages */ /* remove the sync handler to avoid duplicated messages */
gst_bus_set_sync_handler (downloader->priv->bus, NULL, NULL, NULL); gst_bus_set_sync_handler (downloader->priv->bus, NULL, NULL, NULL);
gst_uri_downloader_cancel (downloader);
/* stop the download */
GST_OBJECT_LOCK (downloader);
if (downloader->priv->download != NULL) {
GST_DEBUG_OBJECT (downloader, "Stopping download");
g_object_unref (downloader->priv->download);
downloader->priv->download = NULL;
g_cond_signal (&downloader->priv->cond);
}
GST_OBJECT_UNLOCK (downloader);
} }
gst_message_unref (message); gst_message_unref (message);
@ -303,7 +312,7 @@ gst_uri_downloader_cancel (GstUriDownloader * downloader)
downloader->priv->cancelled = TRUE; downloader->priv->cancelled = TRUE;
if (cancelled) if (cancelled)
GST_DEBUG_OBJECT (downloader, GST_DEBUG_OBJECT (downloader,
"Trying to cancell a download that was alredy cancelled"); "Trying to cancel a download that was alredy cancelled");
} }
GST_OBJECT_UNLOCK (downloader); GST_OBJECT_UNLOCK (downloader);
} }
@ -378,10 +387,13 @@ gst_uri_downloader_fetch_uri_with_range (GstUriDownloader * downloader,
GstStateChangeReturn ret; GstStateChangeReturn ret;
GstFragment *download = NULL; GstFragment *download = NULL;
GST_DEBUG_OBJECT (downloader, "Fetching URI %s", uri);
g_mutex_lock (&downloader->priv->download_lock); g_mutex_lock (&downloader->priv->download_lock);
GST_OBJECT_LOCK (downloader); GST_OBJECT_LOCK (downloader);
if (downloader->priv->cancelled) { if (downloader->priv->cancelled) {
GST_DEBUG_OBJECT (downloader, "Cancelled, aborting fetch");
goto quit; goto quit;
} }
@ -391,10 +403,12 @@ gst_uri_downloader_fetch_uri_with_range (GstUriDownloader * downloader,
} }
gst_bus_set_flushing (downloader->priv->bus, FALSE); gst_bus_set_flushing (downloader->priv->bus, FALSE);
downloader->priv->download = gst_fragment_new ();
GST_OBJECT_UNLOCK (downloader); GST_OBJECT_UNLOCK (downloader);
ret = gst_element_set_state (downloader->priv->urisrc, GST_STATE_READY); ret = gst_element_set_state (downloader->priv->urisrc, GST_STATE_READY);
GST_OBJECT_LOCK (downloader); GST_OBJECT_LOCK (downloader);
if (ret == GST_STATE_CHANGE_FAILURE) { if (ret == GST_STATE_CHANGE_FAILURE || downloader->priv->download == NULL) {
GST_WARNING_OBJECT (downloader, "Failed to set src to READY");
goto quit; goto quit;
} }
@ -408,7 +422,6 @@ gst_uri_downloader_fetch_uri_with_range (GstUriDownloader * downloader,
goto quit; goto quit;
} }
downloader->priv->download = gst_fragment_new ();
GST_OBJECT_UNLOCK (downloader); GST_OBJECT_UNLOCK (downloader);
ret = gst_element_set_state (downloader->priv->urisrc, GST_STATE_PLAYING); ret = gst_element_set_state (downloader->priv->urisrc, GST_STATE_PLAYING);
GST_OBJECT_LOCK (downloader); GST_OBJECT_LOCK (downloader);