FCL/sf/mw/gstreamer: comparison gstreamer_core/gst/gstelementfactory.c

equal deleted inserted replaced

-:567bb019e3e3
+:7e817e7e631c
 *
 * <example>
 * <title>Using an element factory</title>
 * <programlisting language="c">
 *   #include &lt;gst/gst.h&gt;
-*
 *   GstElement *src;
 *   GstElementFactory *srcfactory;
-*
+*   gst_init(&amp;argc,&amp;argv);
-*   gst_init (&amp;argc, &amp;argv);
+*   srcfactory = gst_element_factory_find("filesrc");
-*
+*   g_return_if_fail(srcfactory != NULL);
-*   srcfactory = gst_element_factory_find ("filesrc");
+*   src = gst_element_factory_create(srcfactory,"src");
-*   g_return_if_fail (srcfactory != NULL);
+*   g_return_if_fail(src != NULL);
-*   src = gst_element_factory_create (srcfactory, "src");
-*   g_return_if_fail (src != NULL);
 *   ...
 * </programlisting>
 * </example>
 *
 * Last reviewed on 2005-11-23 (0.9.5)
 #define GST_CAT_DEFAULT element_factory_debug
 static void gst_element_factory_class_init (GstElementFactoryClass * klass);
 static void gst_element_factory_init (GstElementFactory * factory);
 static void gst_element_factory_finalize (GObject * object);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 void __gst_element_details_clear (GstElementDetails * dp);
 static void gst_element_factory_cleanup (GstElementFactory * factory);
 static GstPluginFeatureClass *parent_class = NULL;
 /* static guint gst_element_factory_signals[LAST_SIGNAL] = { 0 }; */
+#ifdef __SYMBIAN32__
-/* this is defined in gstelement.c */
+EXPORT_C
-extern GQuark _gst_elementclass_factory;
+#endif
-#define _do_init \
-{ \
+GType
-GST_DEBUG_CATEGORY_INIT (element_factory_debug, "GST_ELEMENT_FACTORY", \
+gst_element_factory_get_type (void)
-GST_DEBUG_BOLD | GST_DEBUG_FG_WHITE | GST_DEBUG_BG_RED, \
+{
-"element factories keep information about installed elements"); \
+static GType elementfactory_type = 0;
-}
+if (G_UNLIKELY (elementfactory_type == 0)) {
-G_DEFINE_TYPE_WITH_CODE (GstElementFactory, gst_element_factory,
+static const GTypeInfo elementfactory_info = {
-GST_TYPE_PLUGIN_FEATURE, _do_init);
+sizeof (GstElementFactoryClass),
+NULL,
+NULL,
+(GClassInitFunc) gst_element_factory_class_init,
+NULL,
+NULL,
+sizeof (GstElementFactory),
+0,
+(GInstanceInitFunc) gst_element_factory_init,
+NULL
+};
+elementfactory_type = g_type_register_static (GST_TYPE_PLUGIN_FEATURE,
+"GstElementFactory", &elementfactory_info, 0);
+GST_DEBUG_CATEGORY_INIT (element_factory_debug, "GST_ELEMENT_FACTORY",
+GST_DEBUG_BOLD | GST_DEBUG_FG_WHITE | GST_DEBUG_BG_RED,
+"element factories keep information about installed elements");
+}
+return elementfactory_type;
+}
 static void
 gst_element_factory_class_init (GstElementFactoryClass * klass)
 {
-GObjectClass *gobject_class = (GObjectClass *) klass;
+GObjectClass *gobject_class;
+GstObjectClass *gstobject_class;
+GstPluginFeatureClass *gstpluginfeature_class;
+gobject_class = (GObjectClass *) klass;
+gstobject_class = (GstObjectClass *) klass;
+gstpluginfeature_class = (GstPluginFeatureClass *) klass;
 parent_class = g_type_class_peek_parent (klass);
 gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_element_factory_finalize);
 }
 } else {                                                              \
 g_warning ("Invalid UTF-8 in " G_STRINGIFY (__entry) ": %s",        \
 __src->__entry);                                                \
 __dest->__entry = g_strdup ("[ERROR: invalid UTF-8]");              \
 }                                                                     \
-}G_STMT_END
+} G_STMT_END
-#ifdef __SYMBIAN32__
-EXPORT_C
+#ifdef __SYMBIAN32__
-#endif
+EXPORT_C
+#endif
 void
 __gst_element_details_set (GstElementDetails * dest,
 const GstElementDetails * src)
 {
 VALIDATE_SET (dest, src, longname);
 {
 GList *item;
 __gst_element_details_clear (&factory->details);
 if (factory->type) {
-factory->type = G_TYPE_INVALID;
+g_type_class_unref (g_type_class_peek (factory->type));
+factory->type = 0;
 }
 for (item = factory->staticpadtemplates; item; item = item->next) {
 GstStaticPadTemplate *templ = item->data;
 GstCaps *caps = (GstCaps *) & (templ->static_caps);
 gboolean
 gst_element_register (GstPlugin * plugin, const gchar * name, guint rank,
 GType type)
 {
-GstPluginFeature *existing_feature;
-GstRegistry *registry;
 GstElementFactory *factory;
 GType *interfaces;
 guint n_interfaces, i;
 GstElementClass *klass;
 GList *item;
 g_return_val_if_fail (name != NULL, FALSE);
 g_return_val_if_fail (g_type_is_a (type, GST_TYPE_ELEMENT), FALSE);
-registry = gst_registry_get_default ();
+factory = GST_ELEMENT_FACTORY (g_object_new (GST_TYPE_ELEMENT_FACTORY, NULL));
+gst_plugin_feature_set_name (GST_PLUGIN_FEATURE (factory), name);
-/* check if feature already exists, if it exists there is no need to update it
-* when the registry is getting updated, outdated plugins and all there
-* feature are removed and readded.
-*/
-existing_feature = gst_registry_lookup_feature (registry, name);
-if (existing_feature) {
-GST_DEBUG_OBJECT (registry, "update existing feature %p (%s)",
-existing_feature, name);
-factory = GST_ELEMENT_FACTORY_CAST (existing_feature);
-factory->type = type;
-existing_feature->loaded = TRUE;
-g_type_set_qdata (type, _gst_elementclass_factory, factory);
-gst_object_unref (existing_feature);
-return TRUE;
-}
-factory =
-GST_ELEMENT_FACTORY_CAST (g_object_new (GST_TYPE_ELEMENT_FACTORY, NULL));
-gst_plugin_feature_set_name (GST_PLUGIN_FEATURE_CAST (factory), name);
 GST_LOG_OBJECT (factory, "Created new elementfactory for type %s",
 g_type_name (type));
 klass = GST_ELEMENT_CLASS (g_type_class_ref (type));
 if ((klass->details.longname == NULL) ||
 newt->static_caps.string = gst_caps_to_string (templ->caps);
 factory->staticpadtemplates =
 g_list_append (factory->staticpadtemplates, newt);
 }
 factory->numpadtemplates = klass->numpadtemplates;
-g_type_set_qdata (type, _gst_elementclass_factory, factory);
+klass->elementfactory = factory;
 /* special stuff for URI handling */
 if (g_type_is_a (type, GST_TYPE_URI_HANDLER)) {
 GstURIHandlerInterface *iface = (GstURIHandlerInterface *)
 g_type_interface_peek (klass, GST_TYPE_URI_HANDLER);
 __gst_element_factory_add_interface (factory, g_type_name (interfaces[i]));
 }
 g_free (interfaces);
 if (plugin && plugin->desc.name) {
-GST_PLUGIN_FEATURE_CAST (factory)->plugin_name = plugin->desc.name;
+GST_PLUGIN_FEATURE (factory)->plugin_name = plugin->desc.name;
 } else {
-GST_PLUGIN_FEATURE_CAST (factory)->plugin_name = "NULL";
+GST_PLUGIN_FEATURE (factory)->plugin_name = "NULL";
 }
-gst_plugin_feature_set_rank (GST_PLUGIN_FEATURE_CAST (factory), rank);
+gst_plugin_feature_set_rank (GST_PLUGIN_FEATURE (factory), rank);
-GST_PLUGIN_FEATURE_CAST (factory)->loaded = TRUE;
+GST_PLUGIN_FEATURE (factory)->loaded = TRUE;
-gst_registry_add_feature (registry, GST_PLUGIN_FEATURE_CAST (factory));
+gst_registry_add_feature (gst_registry_get_default (),
+GST_PLUGIN_FEATURE (factory));
 return TRUE;
 /* ERRORS */
 urierror:
 if (G_UNLIKELY (element == NULL))
 goto no_element;
 /* fill in the pointer to the factory in the element class. The
 * class will not be unreffed currently.
-* Be thread safe as there might be 2 threads creating the first instance of
+* FIXME: This isn't safe and may leak a refcount on the factory if 2 threads
-* an element at the same moment
+* create the first instance of an element at the same moment */
-*/
 oclass = GST_ELEMENT_GET_CLASS (element);
-if (!g_atomic_pointer_compare_and_exchange (
+if (G_UNLIKELY (oclass->elementfactory == NULL))
-(gpointer) & oclass->elementfactory, NULL, factory))
+oclass->elementfactory = factory;
+else
 gst_object_unref (factory);
 if (name)
-gst_object_set_name (GST_OBJECT_CAST (element), name);
+gst_object_set_name (GST_OBJECT (element), name);
 GST_DEBUG ("created element \"%s\"", GST_PLUGIN_FEATURE_NAME (factory));
 return element;
 /* ERRORS */
 load_failed:
 {
-GST_WARNING_OBJECT (factory,
+GST_WARNING_OBJECT (factory, "loading plugin returned NULL!");
-"loading plugin containing feature %s returned NULL!", name);
 return NULL;
 }
 no_type:
 {
 GST_WARNING_OBJECT (factory, "factory has no type");
 if (factory == NULL)
 goto no_factory;
 GST_LOG_OBJECT (factory, "found factory %p", factory);
 element = gst_element_factory_create (factory, name);
+gst_object_unref (factory);
 if (element == NULL)
 goto create_failed;
-gst_object_unref (factory);
 return element;
 /* ERRORS */
 no_factory:
 {
 return NULL;
 }
 create_failed:
 {
 GST_INFO_OBJECT (factory, "couldn't create instance!");
-gst_object_unref (factory);
 return NULL;
 }
 }
 #ifdef __SYMBIAN32__
 EXPORT_C
 /**
 * gst_element_factory_get_uri_type:
 * @factory: a #GstElementFactory
 *
-* Gets the type of URIs the element supports or #GST_URI_UNKNOWN if none.
+* Gets the type of URIs the element supports or GST_URI_UNKNOWN if none.
 *
 * Returns: type of URIs this element supports
 */
 #ifdef __SYMBIAN32__
 EXPORT_C

branch	RCL_3
changeset 30	7e817e7e631c
parent 29	567bb019e3e3