X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gst%2Fgstplugin.c;h=6251b147ff82944815c031faa7008ff2f5384b2c;hb=035bc8b8dbf4307b55303451691aa24336dbe6f1;hp=2c13e68b3e8a6d84d3b1e621355cb468521e421f;hpb=2d7f9cfe92de5fe8faa767d9261d3adb55c7f5e2;p=platform%2Fupstream%2Fgstreamer.git diff --git a/gst/gstplugin.c b/gst/gstplugin.c index 2c13e68..6251b14 100644 --- a/gst/gstplugin.c +++ b/gst/gstplugin.c @@ -16,8 +16,8 @@ * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. */ /** @@ -39,7 +39,7 @@ * Once you have a handle to a #GstPlugin (e.g. from the #GstRegistry), you * can add any object that subclasses #GstPluginFeature. * - * Usually plugins are always automaticlly loaded so you don't need to call + * Usually plugins are always automatically loaded so you don't need to call * gst_plugin_load() explicitly to bring it into memory. There are options to * statically link plugins to an app or even use GStreamer without a plugin * repository in which case gst_plugin_load() can be needed to bring the plugin @@ -90,18 +90,17 @@ static char *_gst_plugin_fault_handler_filename = NULL; * MIT/X11: http://www.opensource.org/licenses/mit-license.php * 3-clause BSD: http://www.opensource.org/licenses/bsd-license.php */ -static const gchar *valid_licenses[] = { - "LGPL", /* GNU Lesser General Public License */ - "GPL", /* GNU General Public License */ - "QPL", /* Trolltech Qt Public License */ - "GPL/QPL", /* Combi-license of GPL + QPL */ - "MPL", /* MPL 1.1 license */ - "BSD", /* 3-clause BSD license */ - "MIT/X11", /* MIT/X11 license */ - "Proprietary", /* Proprietary license */ - GST_LICENSE_UNKNOWN, /* some other license */ - NULL -}; +static const gchar valid_licenses[] = "LGPL\000" /* GNU Lesser General Public License */ + "GPL\000" /* GNU General Public License */ + "QPL\000" /* Trolltech Qt Public License */ + "GPL/QPL\000" /* Combi-license of GPL + QPL */ + "MPL\000" /* MPL 1.1 license */ + "BSD\000" /* 3-clause BSD license */ + "MIT/X11\000" /* MIT/X11 license */ + "Proprietary\000" /* Proprietary license */ + GST_LICENSE_UNKNOWN; /* some other license */ + +static const guint8 valid_licenses_idx[] = { 0, 5, 9, 13, 21, 25, 29, 37, 49 }; static GstPlugin *gst_plugin_register_func (GstPlugin * plugin, const GstPluginDesc * desc, gpointer user_data); @@ -123,15 +122,20 @@ static void gst_plugin_finalize (GObject * object) { GstPlugin *plugin = GST_PLUGIN_CAST (object); - GstRegistry *registry = gst_registry_get_default (); - GList *g; GST_DEBUG ("finalizing plugin %" GST_PTR_FORMAT, plugin); + + /* FIXME: make registry add a weak ref instead */ +#if 0 + GstRegistry *registry = gst_registry_get (); + GList *g; for (g = registry->plugins; g; g = g->next) { if (g->data == (gpointer) plugin) { g_warning ("removing plugin that is still in registry"); } } +#endif + g_free (plugin->filename); g_free (plugin->basename); @@ -190,8 +194,6 @@ gst_plugin_error_quark (void) * via gst_init_get_option_group()) before calling this function. * * Returns: TRUE if the plugin was registered correctly, otherwise FALSE. - * - * Since: 0.10.16 */ gboolean gst_plugin_register_static (gint major_version, gint minor_version, @@ -221,7 +223,7 @@ gst_plugin_register_static (gint major_version, gint minor_version, plugin = g_object_newv (GST_TYPE_PLUGIN, 0, NULL); if (gst_plugin_register_func (plugin, &desc, NULL) != NULL) { GST_INFO ("registered static plugin \"%s\"", name); - res = gst_default_registry_add_plugin (plugin); + res = gst_registry_add_plugin (gst_registry_get (), plugin); GST_INFO ("added static plugin \"%s\", result: %d", name, res); } return res; @@ -257,9 +259,6 @@ gst_plugin_register_static (gint major_version, gint minor_version, * via gst_init_get_option_group()) before calling this function. * * Returns: TRUE if the plugin was registered correctly, otherwise FALSE. - * - * Since: 0.10.24 - * */ gboolean gst_plugin_register_static_full (gint major_version, gint minor_version, @@ -291,7 +290,7 @@ gst_plugin_register_static_full (gint major_version, gint minor_version, plugin = g_object_newv (GST_TYPE_PLUGIN, 0, NULL); if (gst_plugin_register_func (plugin, &desc, user_data) != NULL) { GST_INFO ("registered static plugin \"%s\"", name); - res = gst_default_registry_add_plugin (plugin); + res = gst_registry_add_plugin (gst_registry_get (), plugin); GST_INFO ("added static plugin \"%s\", result: %d", name, res); } return res; @@ -455,14 +454,11 @@ priv_gst_plugin_loading_get_whitelist_hash (void) static gboolean gst_plugin_check_license (const gchar * license) { - const gchar **check_license = valid_licenses; - - g_assert (check_license); + gint i; - while (*check_license) { - if (strcmp (license, *check_license) == 0) + for (i = 0; i < G_N_ELEMENTS (valid_licenses_idx); ++i) { + if (strcmp (license, valid_licenses + valid_licenses_idx[i]) == 0) return TRUE; - check_license++; } return FALSE; } @@ -472,7 +468,7 @@ gst_plugin_check_version (gint major, gint minor) { /* return NULL if the major and minor version numbers are not compatible */ /* with ours. */ - if (major != GST_VERSION_MAJOR || minor != GST_VERSION_MINOR) + if (major != GST_VERSION_MAJOR || minor > GST_VERSION_MINOR) return FALSE; return TRUE; @@ -485,7 +481,7 @@ gst_plugin_register_func (GstPlugin * plugin, const GstPluginDesc * desc, if (!gst_plugin_check_version (desc->major_version, desc->minor_version)) { if (GST_CAT_DEFAULT) GST_WARNING ("plugin \"%s\" has incompatible version, not loading", - plugin->filename); + GST_STR_NULL (plugin->filename)); return NULL; } @@ -493,14 +489,14 @@ gst_plugin_register_func (GstPlugin * plugin, const GstPluginDesc * desc, !desc->package || !desc->origin) { if (GST_CAT_DEFAULT) GST_WARNING ("plugin \"%s\" has incorrect GstPluginDesc, not loading", - plugin->filename); + GST_STR_NULL (plugin->filename)); return NULL; } if (!gst_plugin_check_license (desc->license)) { if (GST_CAT_DEFAULT) GST_WARNING ("plugin \"%s\" has invalid license \"%s\", not loading", - plugin->filename, desc->license); + GST_STR_NULL (plugin->filename), desc->license); return NULL; } @@ -518,13 +514,15 @@ gst_plugin_register_func (GstPlugin * plugin, const GstPluginDesc * desc, if (user_data) { if (!(((GstPluginInitFullFunc) (desc->plugin_init)) (plugin, user_data))) { if (GST_CAT_DEFAULT) - GST_WARNING ("plugin \"%s\" failed to initialise", plugin->filename); + GST_WARNING ("plugin \"%s\" failed to initialise", + GST_STR_NULL (plugin->filename)); return NULL; } } else { if (!((desc->plugin_init) (plugin))) { if (GST_CAT_DEFAULT) - GST_WARNING ("plugin \"%s\" failed to initialise", plugin->filename); + GST_WARNING ("plugin \"%s\" failed to initialise", + GST_STR_NULL (plugin->filename)); return NULL; } } @@ -654,11 +652,15 @@ check_release_datetime (const gchar * date_time) return (*date_time == '\0'); } -static GStaticMutex gst_plugin_loading_mutex = G_STATIC_MUTEX_INIT; +static GMutex gst_plugin_loading_mutex; #define CHECK_PLUGIN_DESC_FIELD(desc,field,fn) \ - if (G_UNLIKELY ((desc)->field == NULL)) { \ - GST_ERROR ("GstPluginDesc for '%s' has no %s", fn, G_STRINGIFY (field)); \ + if (G_UNLIKELY ((desc)->field == NULL || *(desc)->field == '\0')) { \ + g_warning ("Plugin description for '%s' has no valid %s field", fn, G_STRINGIFY (field)); \ + g_set_error (error, GST_PLUGIN_ERROR, GST_PLUGIN_ERROR_MODULE, \ + "Plugin %s has invalid plugin description field '%s'", \ + filename, G_STRINGIFY (field)); \ + goto return_error; \ } /** @@ -686,14 +688,14 @@ gst_plugin_load_file (const gchar * filename, GError ** error) g_return_val_if_fail (filename != NULL, NULL); - registry = gst_registry_get_default (); - g_static_mutex_lock (&gst_plugin_loading_mutex); + registry = gst_registry_get (); + g_mutex_lock (&gst_plugin_loading_mutex); plugin = gst_registry_lookup (registry, filename); if (plugin) { if (plugin->module) { /* already loaded */ - g_static_mutex_unlock (&gst_plugin_loading_mutex); + g_mutex_unlock (&gst_plugin_loading_mutex); return plugin; } else { /* load plugin and update fields */ @@ -780,8 +782,7 @@ gst_plugin_load_file (const gchar * filename, GError ** error) plugin->orig_desc = desc; if (new_plugin) { - /* check plugin description: complain about bad values but accept them, to - * maintain backwards compatibility (FIXME: 0.11) */ + /* check plugin description: complain about bad values and fail */ CHECK_PLUGIN_DESC_FIELD (plugin->orig_desc, name, filename); CHECK_PLUGIN_DESC_FIELD (plugin->orig_desc, description, filename); CHECK_PLUGIN_DESC_FIELD (plugin->orig_desc, version, filename); @@ -790,6 +791,11 @@ gst_plugin_load_file (const gchar * filename, GError ** error) CHECK_PLUGIN_DESC_FIELD (plugin->orig_desc, package, filename); CHECK_PLUGIN_DESC_FIELD (plugin->orig_desc, origin, filename); + if (plugin->orig_desc->name != NULL && plugin->orig_desc->name[0] == '"') { + g_warning ("Invalid plugin name '%s' - fix your GST_PLUGIN_DEFINE " + "(remove quotes around plugin name)", plugin->orig_desc->name); + } + if (plugin->orig_desc->release_datetime != NULL && !check_release_datetime (plugin->orig_desc->release_datetime)) { GST_ERROR ("GstPluginDesc for '%s' has invalid datetime '%s'", @@ -828,17 +834,17 @@ gst_plugin_load_file (const gchar * filename, GError ** error) if (new_plugin) { gst_object_ref (plugin); - gst_default_registry_add_plugin (plugin); + gst_registry_add_plugin (gst_registry_get (), plugin); } - g_static_mutex_unlock (&gst_plugin_loading_mutex); + g_mutex_unlock (&gst_plugin_loading_mutex); return plugin; return_error: { if (plugin) gst_object_unref (plugin); - g_static_mutex_unlock (&gst_plugin_loading_mutex); + g_mutex_unlock (&gst_plugin_loading_mutex); return NULL; } } @@ -988,21 +994,26 @@ gst_plugin_get_origin (GstPlugin * plugin) } /** - * gst_plugin_get_module: - * @plugin: plugin to query + * gst_plugin_get_release_date_string: + * @plugin: plugin to get the release date of + * + * Get the release date (and possibly time) in form of a string, if available. + * + * For normal GStreamer plugin releases this will usually just be a date in + * the form of "YYYY-MM-DD", while pre-releases and builds from git may contain + * a time component after the date as well, in which case the string will be + * formatted like "YYYY-MM-DDTHH:MMZ" (e.g. "2012-04-30T09:30Z"). * - * Gets the #GModule of the plugin. If the plugin isn't loaded yet, NULL is - * returned. + * There may be plugins that do not have a valid release date set on them. * - * Returns: (transfer none): module belonging to the plugin or NULL if the - * plugin isn't loaded yet. + * Returns: the date string of the plugin, or %NULL if not available. */ -GModule * -gst_plugin_get_module (GstPlugin * plugin) +const gchar * +gst_plugin_get_release_date_string (GstPlugin * plugin) { g_return_val_if_fail (plugin != NULL, NULL); - return plugin->module; + return plugin->desc.release_datetime; } /** @@ -1029,8 +1040,6 @@ gst_plugin_is_loaded (GstPlugin * plugin) * stored. This is the case when the registry is getting rebuilt. * * Returns: (transfer none): The cached data as a #GstStructure or %NULL. - * - * Since: 0.10.24 */ const GstStructure * gst_plugin_get_cache_data (GstPlugin * plugin) @@ -1049,8 +1058,6 @@ gst_plugin_get_cache_data (GstPlugin * plugin) * the @plugin. * * The cache is flushed every time the registry is rebuilt. - * - * Since: 0.10.24 */ void gst_plugin_set_cache_data (GstPlugin * plugin, GstStructure * cache_data) @@ -1149,26 +1156,8 @@ gst_plugin_list_feature_filter (GList * list, return data.result; } -#endif /** - * gst_plugin_name_filter: - * @plugin: the plugin to check - * @name: the name of the plugin - * - * A standard filter that returns TRUE when the plugin is of the - * given name. - * - * Returns: TRUE if the plugin is of the given name. - */ -gboolean -gst_plugin_name_filter (GstPlugin * plugin, const gchar * name) -{ - return (plugin->desc.name && !strcmp (plugin->desc.name, name)); -} - -#if 0 -/** * gst_plugin_find_feature: * @plugin: plugin to get the feature from * @name: The name of the feature to find @@ -1259,7 +1248,7 @@ gst_plugin_load_by_name (const gchar * name) GError *error = NULL; GST_DEBUG ("looking up plugin %s in default registry", name); - plugin = gst_registry_find_plugin (gst_registry_get_default (), name); + plugin = gst_registry_find_plugin (gst_registry_get (), name); if (plugin) { GST_DEBUG ("loading plugin %s from file %s", name, plugin->filename); newplugin = gst_plugin_load_file (plugin->filename, &error); @@ -1722,15 +1711,15 @@ gst_plugin_ext_dep_equals (GstPluginDep * dep, const gchar ** env_vars, /** * gst_plugin_add_dependency: * @plugin: a #GstPlugin - * @env_vars: NULL-terminated array of environment variables affecting the + * @env_vars: (allow-none): NULL-terminated array of environment variables affecting the * feature set of the plugin (e.g. an environment variable containing * paths where to look for additional modules/plugins of a library), * or NULL. Environment variable names may be followed by a path component * which will be added to the content of the environment variable, e.g. * "HOME/.mystuff/plugins". - * @paths: NULL-terminated array of directories/paths where dependent files - * may be. - * @names: NULL-terminated array of file names (or file name suffixes, + * @paths: (allow-none): NULL-terminated array of directories/paths where dependent files + * may be, or NULL. + * @names: (allow-none): NULL-terminated array of file names (or file name suffixes, * depending on @flags) to be used in combination with the paths from * @paths and/or the paths extracted from the environment variables in * @env_vars, or NULL. @@ -1745,8 +1734,6 @@ gst_plugin_ext_dep_equals (GstPluginDep * dep, const gchar ** env_vars, * library and makes visualisations available as GStreamer elements, or a * codec loader which exposes elements and/or caps dependent on what external * codec libraries are currently installed. - * - * Since: 0.10.22 */ void gst_plugin_add_dependency (GstPlugin * plugin, const gchar ** env_vars, @@ -1795,14 +1782,14 @@ gst_plugin_add_dependency (GstPlugin * plugin, const gchar ** env_vars, /** * gst_plugin_add_dependency_simple: * @plugin: the #GstPlugin - * @env_vars: one or more environment variables (separated by ':', ';' or ','), + * @env_vars: (allow-none): one or more environment variables (separated by ':', ';' or ','), * or NULL. Environment variable names may be followed by a path component * which will be added to the content of the environment variable, e.g. * "HOME/.mystuff/plugins:MYSTUFF_PLUGINS_PATH" - * @paths: one ore more directory paths (separated by ':' or ';' or ','), + * @paths: (allow-none): one ore more directory paths (separated by ':' or ';' or ','), * or NULL. Example: "/usr/lib/mystuff/plugins" - * @names: one or more file names or file name suffixes (separated by commas), - * or NULL + * @names: (allow-none): one or more file names or file name suffixes (separated by commas), + * or NULL * @flags: optional flags, or #GST_PLUGIN_DEPENDENCY_FLAG_NONE * * Make GStreamer aware of external dependencies which affect the feature @@ -1818,8 +1805,6 @@ gst_plugin_add_dependency (GstPlugin * plugin, const gchar ** env_vars, * Convenience wrapper function for gst_plugin_add_dependency() which * takes simple strings as arguments instead of string arrays, with multiple * arguments separated by predefined delimiters (see above). - * - * Since: 0.10.22 */ void gst_plugin_add_dependency_simple (GstPlugin * plugin,