mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 06:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

playbin: Fix deadlock caused by lock order inversion

Browse source 
First the source group lock, then the elements list lock.
This commit is contained in:
Sebastian Dröge 2013-05-15 13:38:32 +02:00
parent 36470a4aa8
commit 74a31a02fc
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst/playback/gstplaybin2.c
View file

@ -3866,6 +3866,7 @@ autoplug_select_cb (GstElement * decodebin, GstPad * pad,
if (!isvideodec && !isaudiodec) if (!isvideodec && !isaudiodec)
return GST_AUTOPLUG_SELECT_TRY; return GST_AUTOPLUG_SELECT_TRY;
GST_SOURCE_GROUP_LOCK (group);
g_mutex_lock (&playbin->elements_lock); g_mutex_lock (&playbin->elements_lock);
if (isaudiodec) { if (isaudiodec) {
@ -3911,7 +3912,6 @@ autoplug_select_cb (GstElement * decodebin, GstPad * pad,
if (((isaudiodec && !group->audio_sink) || if (((isaudiodec && !group->audio_sink) ||
(isvideodec && !group->video_sink))) { (isvideodec && !group->video_sink))) {
GST_SOURCE_GROUP_LOCK (group);
if (ave && ave->sink) { if (ave && ave->sink) {
if ((*sinkp = gst_element_factory_create (ave->sink, NULL)) == NULL) if ((*sinkp = gst_element_factory_create (ave->sink, NULL)) == NULL)
GST_WARNING_OBJECT (playbin, GST_WARNING_OBJECT (playbin,
@ -3919,7 +3919,6 @@ autoplug_select_cb (GstElement * decodebin, GstPad * pad,
gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (*sinkp))); gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (*sinkp)));
gst_object_ref_sink (*sinkp); gst_object_ref_sink (*sinkp);
} }
GST_SOURCE_GROUP_UNLOCK (group);
} }
/* If it is a decoder and we have a fixed sink for the media /* If it is a decoder and we have a fixed sink for the media
@ -3978,19 +3977,19 @@ autoplug_select_cb (GstElement * decodebin, GstPad * pad,
* sink or if we have a fixed sink, skip the decoder */ * sink or if we have a fixed sink, skip the decoder */
if ((isaudiodec && group->audio_sink != playbin->audio_sink) || if ((isaudiodec && group->audio_sink != playbin->audio_sink) ||
(isvideodec && group->video_sink != playbin->video_sink)) { (isvideodec && group->video_sink != playbin->video_sink)) {
GST_SOURCE_GROUP_LOCK (group);
gst_element_set_state (*sinkp, GST_STATE_NULL); gst_element_set_state (*sinkp, GST_STATE_NULL);
gst_object_unref (*sinkp); gst_object_unref (*sinkp);
*sinkp = NULL; *sinkp = NULL;
GST_SOURCE_GROUP_UNLOCK (group);
} else { } else {
g_mutex_unlock (&playbin->elements_lock); g_mutex_unlock (&playbin->elements_lock);
GST_SOURCE_GROUP_UNLOCK (group);
return GST_AUTOPLUG_SELECT_SKIP; return GST_AUTOPLUG_SELECT_SKIP;
} }
} }
} }
g_list_free (ave_list); g_list_free (ave_list);
g_mutex_unlock (&playbin->elements_lock); g_mutex_unlock (&playbin->elements_lock);
GST_SOURCE_GROUP_UNLOCK (group);
return GST_AUTOPLUG_SELECT_TRY; return GST_AUTOPLUG_SELECT_TRY;
} }
@ -4130,8 +4129,9 @@ autoplug_query_cb (GstElement * uridecodebin, GstPad * pad, GstQuery * query,
* check the audio and video sink */ * check the audio and video sink */
if (group->suburidecodebin if (group->suburidecodebin
&& gst_object_has_ancestor (GST_OBJECT_CAST (pad), && gst_object_has_ancestor (GST_OBJECT_CAST (pad),
GST_OBJECT_CAST (group->suburidecodebin))) GST_OBJECT_CAST (group->suburidecodebin))) {
goto done; goto done;
}
if ((sink = group->audio_sink)) { if ((sink = group->audio_sink)) {
sinkpad = gst_element_get_static_pad (sink, "sink"); sinkpad = gst_element_get_static_pad (sink, "sink");