mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-24 17:20:36 +00:00
omx: don't log error when failing to load conf file with generic target
The generic target is meant to only test building gst-omx. It doesn't provide any configuration file and so is not supposed to register any element. I'm not aware of any user building gst-omx with this target and providing their own conf file to actually register elements. But best to not break this use case anyway so let's just downgrade the log message. Fix GST_ERROR in the 'check fedora' CI job.
This commit is contained in:
parent
9e8a1de79d
commit
27c1aa544e
1 changed files with 16 additions and 7 deletions
23
omx/gstomx.c
23
omx/gstomx.c
|
@ -4024,14 +4024,23 @@ plugin_init (GstPlugin * plugin)
|
|||
config = g_key_file_new ();
|
||||
if (!g_key_file_load_from_dirs (config, *config_name,
|
||||
(const gchar **) config_dirs, NULL, G_KEY_FILE_NONE, &err)) {
|
||||
gchar *paths;
|
||||
#ifdef USE_OMX_TARGET_GENERIC
|
||||
GST_INFO ("No configuration file found; "
|
||||
"ignore as gst-omx has been built with the generic target used only for testing");
|
||||
#else
|
||||
{
|
||||
gchar *paths;
|
||||
|
||||
paths = g_strjoinv (":", config_dirs);
|
||||
GST_ERROR
|
||||
("Failed to load configuration file: %s (searched in: %s as per "
|
||||
"GST_OMX_CONFIG_DIR environment variable, the xdg user config "
|
||||
"directory (or XDG_CONFIG_HOME) and the system config directory "
|
||||
"(or XDG_CONFIG_DIRS)", err->message, paths);
|
||||
g_free (paths);
|
||||
}
|
||||
#endif /* USE_OMX_TARGET_GENERIC */
|
||||
|
||||
paths = g_strjoinv (":", config_dirs);
|
||||
GST_ERROR ("Failed to load configuration file: %s (searched in: %s as per "
|
||||
"GST_OMX_CONFIG_DIR environment variable, the xdg user config "
|
||||
"directory (or XDG_CONFIG_HOME) and the system config directory "
|
||||
"(or XDG_CONFIG_DIRS)", err->message, paths);
|
||||
g_free (paths);
|
||||
g_error_free (err);
|
||||
goto done;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue