gst_plugin_load_file: force plugin reload if diff filename

If a file includes a new version of a plugin that exits in the
registry, the output of gst-inspect is incorrect. The output has the
correct version but incorrect filename, and element description.

This seems to have also fixed some documentation issues.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1344>

diff --git a/subprojects/gst-plugins-bad/docs/plugins/gst_plugins_cache.json b/subprojects/gst-plugins-bad/docs/plugins/gst_plugins_cache.json
index 245970f8ca56a5fee9e119e4fedd3e9e00bba3ae..8f56ef268eb76f0ca4b7840e7c2f79aeae57f2bb 100644 (file)
--- a/subprojects/gst-plugins-bad/docs/plugins/gst_plugins_cache.json
+++ b/subprojects/gst-plugins-bad/docs/plugins/gst_plugins_cache.json
@@ -212590,7 +212590,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "true",
+                        "default": "false",
                         "mutable": "null",
                         "readable": true,
                         "type": "gboolean",

diff --git a/subprojects/gst-plugins-base/docs/plugins/gst_plugins_cache.json b/subprojects/gst-plugins-base/docs/plugins/gst_plugins_cache.json
index b746807d004e4852dba02e94305d0d0aab374c60..52cc0fc30e5f7e31c7e3ff94e3f0d4dd2ffeddec 100644 (file)
--- a/subprojects/gst-plugins-base/docs/plugins/gst_plugins_cache.json
+++ b/subprojects/gst-plugins-base/docs/plugins/gst_plugins_cache.json
@@ -8579,7 +8579,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "top (2)",
+                        "default": "baseline (0)",
                         "mutable": "null",
                         "readable": true,
                         "type": "GstBaseTextOverlayVAlign",

diff --git a/subprojects/gst-plugins-good/docs/gst_plugins_cache.json b/subprojects/gst-plugins-good/docs/gst_plugins_cache.json
index 4552b0d37a81646878b56a522d7973fd439e0a91..012ebab944eebaaed7edb64b84e0d3dfb6124bbf 100644 (file)
--- a/subprojects/gst-plugins-good/docs/gst_plugins_cache.json
+++ b/subprojects/gst-plugins-good/docs/gst_plugins_cache.json
@@ -371,7 +371,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "24",
+                        "default": "0",
                         "max": "2147483647",
                         "min": "-2147483648",
                         "mutable": "null",
@@ -411,7 +411,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "80",
+                        "default": "0",
                         "max": "2147483647",
                         "min": "-2147483648",
                         "mutable": "null",

diff --git a/subprojects/gstreamer/gst/gstplugin.c b/subprojects/gstreamer/gst/gstplugin.c
index aa7d6d93a6e0aae8ae847475a8c4f772471a6129..09230bebe00eca61ebe3f0b5bf9417991142df4e 100644 (file)
--- a/subprojects/gstreamer/gst/gstplugin.c
+++ b/subprojects/gstreamer/gst/gstplugin.c
@@ -819,7 +819,7 @@ _priv_gst_plugin_load_file_for_registry (const gchar * filename,
       /* already loaded */
       g_mutex_unlock (&gst_plugin_loading_mutex);
       return plugin;
-    } else {
+    } else if (g_strcmp0 (plugin->filename, filename) == 0) {
       /* load plugin and update fields */
       new_plugin = FALSE;
     }