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

playbin: Make sure to ref_sink() any sinks before calling activate_sink()

Browse source 
It is forwarding messages to the playbin bus, thus forwarding messages
that contain a floating reference to the application. This generally
makes bindings unhappy, we must not leak floating references to them.
This commit is contained in:
Sebastian Dröge 2017-08-07 15:27:45 +03:00
parent f996b05644
commit b4899a5a65
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gst/playback/gstplaybin2.c
View file

@ -4570,6 +4570,7 @@ autoplug_select_cb (GstElement * decodebin, GstPad * pad,
GstAVElement *ave = NULL; GstAVElement *ave = NULL;
GSequence *ave_seq = NULL; GSequence *ave_seq = NULL;
GSequenceIter *seq_iter; GSequenceIter *seq_iter;
gboolean created_sink = FALSE;
playbin = group->playbin; playbin = group->playbin;
@ -4635,8 +4636,6 @@ autoplug_select_cb (GstElement * decodebin, GstPad * pad,
/* if it is a decoder and we don't have a fixed sink, then find out /* if it is a decoder and we don't have a fixed sink, then find out
* the matching audio/video sink from GstAVElements list */ * the matching audio/video sink from GstAVElements list */
for (l = ave_list; l; l = l->next) { for (l = ave_list; l; l = l->next) {
gboolean created_sink = FALSE;
ave = (GstAVElement *) l->data; ave = (GstAVElement *) l->data;
if (((isaudiodec && !group->audio_sink) || if (((isaudiodec && !group->audio_sink) ||
@ -4652,6 +4651,10 @@ autoplug_select_cb (GstElement * decodebin, GstPad * pad,
gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (ave->sink))); gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (ave->sink)));
continue; continue;
} else { } else {
/* The sink is ours now, don't leak the floating reference in the
* state-changed messages */
gst_object_ref_sink (*sinkp);
if (!activate_sink (playbin, *sinkp, NULL)) { if (!activate_sink (playbin, *sinkp, NULL)) {
gst_object_unref (*sinkp); gst_object_unref (*sinkp);
*sinkp = NULL; *sinkp = NULL;
@ -4725,6 +4728,7 @@ autoplug_select_cb (GstElement * decodebin, GstPad * pad,
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;
created_sink = FALSE;
} else { } else {
g_mutex_unlock (&playbin->elements_lock); g_mutex_unlock (&playbin->elements_lock);
GST_SOURCE_GROUP_UNLOCK (group); GST_SOURCE_GROUP_UNLOCK (group);
@ -4799,6 +4803,12 @@ autoplug_select_cb (GstElement * decodebin, GstPad * pad,
return GST_AUTOPLUG_SELECT_SKIP; return GST_AUTOPLUG_SELECT_SKIP;
} }
/* The sink is ours now, don't leak floating references in the state-changed
* messages, but only do that if we didn't just create the sink above and
* already ref_sink'd it there */
if (!created_sink)
gst_object_ref_sink (sinkp);
element = *sinkp; element = *sinkp;
if (!activate_sink (playbin, element, NULL)) { if (!activate_sink (playbin, element, NULL)) {
@ -4820,13 +4830,11 @@ autoplug_select_cb (GstElement * decodebin, GstPad * pad,
return GST_AUTOPLUG_SELECT_SKIP; return GST_AUTOPLUG_SELECT_SKIP;
} }
/* remember the sink in the group now, the element is floating, we take /* remember the sink in the group now
* ownership now
* *
* store the sink in the group, we will configure it later when we * store the sink in the group, we will configure it later when we
* reconfigure the sink */ * reconfigure the sink */
GST_DEBUG_OBJECT (playbin, "remember sink"); GST_DEBUG_OBJECT (playbin, "remember sink");
gst_object_ref_sink (element);
GST_SOURCE_GROUP_UNLOCK (group); GST_SOURCE_GROUP_UNLOCK (group);
/* tell decodebin to expose the pad because we are going to use this /* tell decodebin to expose the pad because we are going to use this