mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-12 10:25:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/playback/gststreamselector.c: Fix ref-counting

Browse source 
Original commit message from CVS:
* gst/playback/gststreamselector.c:
(gst_stream_selector_class_init),
(gst_stream_selector_set_property),
(gst_stream_selector_get_property),
(gst_stream_selector_request_new_pad), (gst_stream_selector_chain):
Fix ref-counting
This commit is contained in:
Jan Schmidt 2005-11-29 16:43:41 +00:00
parent 2554dd0d5d
commit 35905dcfb6
2 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2005-11-29 Jan Schmidt <thaytan@mad.scientist.com>
* gst/playback/gststreamselector.c:
(gst_stream_selector_class_init),
(gst_stream_selector_set_property),
(gst_stream_selector_get_property),
(gst_stream_selector_request_new_pad), (gst_stream_selector_chain):
Fix ref-counting
2005-11-29 Tim-Philipp Müller <tim at centricular dot net> 2005-11-29 Tim-Philipp Müller <tim at centricular dot net>
* gst/subparse/gstsubparse.c: (feed_textbuf): * gst/subparse/gstsubparse.c: (feed_textbuf):

28
gst/playback/gststreamselector.c
View file

@ -180,12 +180,28 @@ gst_stream_selector_set_property (GObject * object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case PROP_ACTIVE_PAD:{ case PROP_ACTIVE_PAD:{
const gchar *pad_name = g_value_get_string (value); const gchar *pad_name = g_value_get_string (value);
GstObject *pad_obj;
GstPad *pad; GstPad *pad;
GST_OBJECT_LOCK (object);
pad = gst_element_get_pad (GST_ELEMENT (object), pad_name); pad = gst_element_get_pad (GST_ELEMENT (object), pad_name);
pad_obj = GST_OBJECT (sel->active_sinkpad); if (pad == sel->active_sinkpad) {
gst_object_replace (&pad_obj, GST_OBJECT (pad)); GST_OBJECT_UNLOCK (object);
gst_object_unref (pad);
break;
}
if (sel->active_sinkpad && (GST_STATE (sel) >= GST_STATE_PAUSED)) {
gst_pad_set_active (sel->active_sinkpad, FALSE);
}
gst_object_replace ((GstObject **) (&sel->active_sinkpad),
GST_OBJECT (pad));
gst_object_unref (pad);
if (sel->active_sinkpad && (GST_STATE (sel) >= GST_STATE_PAUSED)) {
gst_pad_set_active (sel->active_sinkpad, TRUE);
}
GST_OBJECT_UNLOCK (object);
break; break;
} }
default: default:
@ -202,10 +218,12 @@ gst_stream_selector_get_property (GObject * object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case PROP_ACTIVE_PAD:{ case PROP_ACTIVE_PAD:{
GST_OBJECT_LOCK (object);
if (sel->active_sinkpad != NULL) { if (sel->active_sinkpad != NULL) {
g_value_set_string (value, gst_pad_get_name (sel->active_sinkpad)); g_value_set_string (value, gst_pad_get_name (sel->active_sinkpad));
} else } else
g_value_set_string (value, ""); g_value_set_string (value, "");
GST_OBJECT_UNLOCK (object);
break; break;
} }
default: default:
@ -296,7 +314,7 @@ gst_stream_selector_request_new_pad (GstElement * element,
GST_OBJECT_LOCK (sel); GST_OBJECT_LOCK (sel);
if (GST_STATE (sel) >= GST_STATE_PAUSED) { if (GST_STATE (sel) >= GST_STATE_PAUSED) {
gst_pad_set_active (sinkpad, GST_ACTIVATE_PUSH); gst_pad_set_active (sinkpad, TRUE);
} }
GST_OBJECT_UNLOCK (sel); GST_OBJECT_UNLOCK (sel);
@ -313,7 +331,7 @@ gst_stream_selector_chain (GstPad * pad, GstBuffer * buf)
if (pad != sel->active_sinkpad) { if (pad != sel->active_sinkpad) {
GST_DEBUG_OBJECT (sel, "Ignoring buffer %p from pad %s:%s", GST_DEBUG_OBJECT (sel, "Ignoring buffer %p from pad %s:%s",
buf, GST_DEBUG_PAD_NAME (pad)); buf, GST_DEBUG_PAD_NAME (pad));
gst_buffer_unref (buf); gst_object_unref (sel);
return GST_FLOW_NOT_LINKED; return GST_FLOW_NOT_LINKED;
} }