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

registry: Add plugins to the registry we are loading and not default one

Browse source 
When running gst_registry_scan_plugin_file we were losing the
information about the registry being loaded and ended up adding the
plugin to the default registry which was not correct.

https://bugzilla.gnome.org/show_bug.cgi?id=752662
This commit is contained in:
Thibault Saunier 2015-07-21 13:35:33 +02:00 committed by Nicolas Dufresne
parent e24e902d2f
commit 749810b238
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/gst_private.h
View file

@ -133,6 +133,10 @@ G_GNUC_INTERNAL void _priv_gst_registry_cleanup (void);
gboolean _gst_plugin_loader_client_run (void); gboolean _gst_plugin_loader_client_run (void);
G_GNUC_INTERNAL GstPlugin * _priv_gst_plugin_load_file_for_registry (const gchar *filename,
GstRegistry * registry,
GError** error);
/* Used in GstBin for manual state handling */ /* Used in GstBin for manual state handling */
G_GNUC_INTERNAL void _priv_gst_element_state_changed (GstElement *element, G_GNUC_INTERNAL void _priv_gst_element_state_changed (GstElement *element,
GstState oldstate, GstState newstate, GstState pending); GstState oldstate, GstState newstate, GstState pending);

14
gst/gstplugin.c
View file

@ -676,6 +676,13 @@ static GMutex gst_plugin_loading_mutex;
*/ */
GstPlugin * GstPlugin *
gst_plugin_load_file (const gchar * filename, GError ** error) gst_plugin_load_file (const gchar * filename, GError ** error)
{
return _priv_gst_plugin_load_file_for_registry (filename, NULL, error);
}
GstPlugin *
_priv_gst_plugin_load_file_for_registry (const gchar * filename,
GstRegistry * registry, GError ** error)
{ {
GstPluginDesc *desc; GstPluginDesc *desc;
GstPlugin *plugin; GstPlugin *plugin;
@ -683,13 +690,14 @@ gst_plugin_load_file (const gchar * filename, GError ** error)
gboolean ret; gboolean ret;
gpointer ptr; gpointer ptr;
GStatBuf file_status; GStatBuf file_status;
GstRegistry *registry;
gboolean new_plugin = TRUE; gboolean new_plugin = TRUE;
GModuleFlags flags; GModuleFlags flags;
g_return_val_if_fail (filename != NULL, NULL); g_return_val_if_fail (filename != NULL, NULL);
registry = gst_registry_get (); if (registry == NULL)
registry = gst_registry_get ();
g_mutex_lock (&gst_plugin_loading_mutex); g_mutex_lock (&gst_plugin_loading_mutex);
plugin = gst_registry_lookup (registry, filename); plugin = gst_registry_lookup (registry, filename);
@ -835,7 +843,7 @@ gst_plugin_load_file (const gchar * filename, GError ** error)
if (new_plugin) { if (new_plugin) {
gst_object_ref (plugin); gst_object_ref (plugin);
gst_registry_add_plugin (gst_registry_get (), plugin); gst_registry_add_plugin (registry, plugin);
} }
g_mutex_unlock (&gst_plugin_loading_mutex); g_mutex_unlock (&gst_plugin_loading_mutex);

3
gst/gstregistry.c
View file

@ -1177,7 +1177,8 @@ gst_registry_scan_plugin_file (GstRegistryScanContext * context,
/* We don't use a GError here because a failure to load some shared /* We don't use a GError here because a failure to load some shared
* objects as plugins is normal (particularly in the uninstalled case) * objects as plugins is normal (particularly in the uninstalled case)
*/ */
newplugin = gst_plugin_load_file (filename, NULL); newplugin = _priv_gst_plugin_load_file_for_registry (filename,
context->registry, NULL);
} }
if (newplugin) { if (newplugin) {