From 64640399469fa6d456dc862d29df5625f6aff22c Mon Sep 17 00:00:00 2001 From: Ruben Gonzalez Date: Fri, 12 Nov 2021 20:13:10 +0100 Subject: [PATCH] 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: --- .../gst-plugins-bad/docs/plugins/gst_plugins_cache.json | 2 +- .../gst-plugins-base/docs/plugins/gst_plugins_cache.json | 2 +- subprojects/gst-plugins-good/docs/gst_plugins_cache.json | 4 ++-- subprojects/gstreamer/gst/gstplugin.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) 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 785148b764..add1c2519d 100644 --- a/subprojects/gst-plugins-bad/docs/plugins/gst_plugins_cache.json +++ b/subprojects/gst-plugins-bad/docs/plugins/gst_plugins_cache.json @@ -211889,7 +211889,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 0fd54452de..987debbff7 100644 --- a/subprojects/gst-plugins-base/docs/plugins/gst_plugins_cache.json +++ b/subprojects/gst-plugins-base/docs/plugins/gst_plugins_cache.json @@ -8565,7 +8565,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 1bb67a4cb9..7a34212a27 100644 --- 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 aa7d6d93a6..09230bebe0 100644 --- 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; }