mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 01:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

autoconvert: Keep a ref to the pads too

Browse source 
Simplifies the code
This commit is contained in:
Olivier Crête 2014-05-07 19:48:49 -04:00
parent 968b4a4969
commit 606ff3debd
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
gst/autoconvert/gstautoconvert.c
View file

@ -212,12 +212,9 @@ gst_auto_convert_dispose (GObject * object)
GstAutoConvert *autoconvert = GST_AUTO_CONVERT (object); GstAutoConvert *autoconvert = GST_AUTO_CONVERT (object);
GST_AUTOCONVERT_LOCK (autoconvert); GST_AUTOCONVERT_LOCK (autoconvert);
if (autoconvert->current_subelement) { g_clear_object (&autoconvert->current_subelement);
gst_object_unref (autoconvert->current_subelement); g_clear_object (&autoconvert->current_internal_sinkpad);
autoconvert->current_subelement = NULL; g_clear_object (&autoconvert->current_internal_srcpad);
autoconvert->current_internal_sinkpad = NULL;
autoconvert->current_internal_srcpad = NULL;
}
gst_plugin_feature_list_free (autoconvert->factories); gst_plugin_feature_list_free (autoconvert->factories);
autoconvert->factories = NULL; autoconvert->factories = NULL;
@ -664,9 +661,12 @@ gst_auto_convert_activate_element (GstAutoConvert * autoconvert,
} }
GST_AUTOCONVERT_LOCK (autoconvert); GST_AUTOCONVERT_LOCK (autoconvert);
autoconvert->current_subelement = element; gst_object_replace ((GstObject **) & autoconvert->current_subelement,
autoconvert->current_internal_srcpad = internal_srcpad; GST_OBJECT (element));
autoconvert->current_internal_sinkpad = internal_sinkpad; gst_object_replace ((GstObject **) & autoconvert->current_internal_srcpad,
GST_OBJECT (internal_srcpad));
gst_object_replace ((GstObject **) & autoconvert->current_internal_sinkpad,
GST_OBJECT (internal_sinkpad));
GST_AUTOCONVERT_UNLOCK (autoconvert); GST_AUTOCONVERT_UNLOCK (autoconvert);
gst_pad_sticky_events_foreach (autoconvert->sinkpad, sticky_event_push, gst_pad_sticky_events_foreach (autoconvert->sinkpad, sticky_event_push,
@ -674,9 +674,10 @@ gst_auto_convert_activate_element (GstAutoConvert * autoconvert,
gst_pad_push_event (autoconvert->sinkpad, gst_event_new_reconfigure ()); gst_pad_push_event (autoconvert->sinkpad, gst_event_new_reconfigure ());
GST_INFO_OBJECT (autoconvert, GST_INFO_OBJECT (autoconvert, "Selected element %s",
"Selected element %s", GST_OBJECT_NAME (GST_OBJECT (element)));
GST_OBJECT_NAME (GST_OBJECT (autoconvert->current_subelement)));
gst_object_unref (element);
return TRUE; return TRUE;
} }
@ -752,10 +753,9 @@ gst_auto_convert_sink_setcaps (GstAutoConvert * autoconvert, GstCaps * caps)
*/ */
GST_AUTOCONVERT_LOCK (autoconvert); GST_AUTOCONVERT_LOCK (autoconvert);
if (autoconvert->current_subelement == subelement) { if (autoconvert->current_subelement == subelement) {
gst_object_unref (autoconvert->current_subelement); g_clear_object (&autoconvert->current_subelement);
autoconvert->current_subelement = NULL; g_clear_object (&autoconvert->current_internal_sinkpad);
autoconvert->current_internal_srcpad = NULL; g_clear_object (&autoconvert->current_internal_srcpad);
autoconvert->current_internal_sinkpad = NULL;
} }
GST_AUTOCONVERT_UNLOCK (autoconvert); GST_AUTOCONVERT_UNLOCK (autoconvert);
gst_object_unref (subelement); gst_object_unref (subelement);