mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-18 05:16:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

uridownloader: unlock mutex when switching urisrc state to NULL to avoid deadlock

Browse source 
When chain method was called after gst_uri_downloader_stop and before state has been changed to NULL, execution was blocking on g_mutex_lock.

Conflicts:
	gst-libs/gst/uridownloader/gsturidownloader.c
This commit is contained in:
Louis-Francis Ratté-Boulianne 2013-02-19 13:01:37 -05:00 committed by Thiago Santos
parent 99efe87b5d
commit f0211e5b7b
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -243,10 +243,15 @@ done:
}
}
/* Must be called with mutex locked. */
static void
gst_uri_downloader_stop (GstUriDownloader * downloader)
{
GstPad *pad;
GstElement *urisrc;
if (!downloader->priv->urisrc)
return;
GST_DEBUG_OBJECT (downloader, "Stopping source element %s",
GST_ELEMENT_NAME (downloader->priv->urisrc));
@ -259,14 +264,23 @@ gst_uri_downloader_stop (GstUriDownloader * downloader)
gst_pad_unlink (pad, downloader->priv->pad);
gst_object_unref (pad);
}
/* set the element state to NULL */
gst_element_set_state (downloader->priv->urisrc, GST_STATE_NULL);
gst_element_get_state (downloader->priv->urisrc, NULL, NULL,
GST_CLOCK_TIME_NONE);
gst_element_set_bus (downloader->priv->urisrc, NULL);
gst_object_unref (downloader->priv->urisrc);
urisrc = downloader->priv->urisrc;
downloader->priv->urisrc = NULL;
/* unlock so it doesn't block on chain function while changing state */
g_mutex_unlock (&downloader->priv->lock);
GST_DEBUG_OBJECT (downloader, "Stopping source element %s",
GST_ELEMENT_NAME (urisrc));
/* set the element state to NULL */
gst_element_set_state (urisrc, GST_STATE_NULL);
gst_element_get_state (urisrc, NULL, NULL, GST_CLOCK_TIME_NONE);
gst_element_set_bus (urisrc, NULL);
gst_object_unref (urisrc);
/* caller expects the mutex to be locked */
g_mutex_lock (&downloader->priv->lock);
gst_bus_set_flushing (downloader->priv->bus, TRUE);
}