From: MyungJoo Ham <myungjoo.ham@samsung.com>
Date: Tue, 21 Jan 2020 02:22:58 +0000 (+0900)
Subject: Fix: load the configuration even if there is no .ini file
X-Git-Tag: accepted/tizen/unified/20200130.214603~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=98af16df9d8113b5fec92d05b87780f5630e4dfb;p=platform%2Fupstream%2Fnnstreamer.git

Fix: load the configuration even if there is no .ini file

Even if there is no .ini file, we need to load up the
subplugins from the default hardcoded paths or
the paths given with envvars.

Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
---

diff --git a/gst/nnstreamer/nnstreamer_conf.c b/gst/nnstreamer/nnstreamer_conf.c
index 7278e95..d44176f 100644
--- a/gst/nnstreamer/nnstreamer_conf.c
+++ b/gst/nnstreamer/nnstreamer_conf.c
@@ -356,35 +356,38 @@ nnsconf_loadconf (gboolean force_reload)
      * Note that Android API does not use the configuration.
      */
     g_warning ("Failed to load the configuration, no config file found.");
-    return FALSE;
   }
 
-  key_file = g_key_file_new ();
-  g_assert (key_file != NULL);
-
-  /* Read the conf file. It's ok even if we cannot load it. */
-  if (g_key_file_load_from_file (key_file, conf.conffile, G_KEY_FILE_NONE,
-          NULL)) {
-    gchar *value;
-
-    value = g_key_file_get_string (key_file, "common", "enable_envvar", NULL);
-    conf.enable_envvar = _parse_bool_string (value, FALSE);
-    g_free (value);
-
-    value = g_key_file_get_string (key_file, "common", "enable_symlink", NULL);
-    conf.enable_symlink = _parse_bool_string (value, FALSE);
-    g_free (value);
-
-    conf.conf[NNSCONF_PATH_FILTERS].path[CONF_SOURCE_INI] =
-        g_key_file_get_string (key_file, "filter", "filters", NULL);
-    conf.conf[NNSCONF_PATH_DECODERS].path[CONF_SOURCE_INI] =
-        g_key_file_get_string (key_file, "decoder", "decoders", NULL);
-    conf.conf[NNSCONF_PATH_CUSTOM_FILTERS].path[CONF_SOURCE_INI] =
-        g_key_file_get_string (key_file, "filter", "customfilters", NULL);
-    conf.conf[NNSCONF_PATH_CONVERTERS].path[CONF_SOURCE_INI] =
-        g_key_file_get_string (key_file, "converter", "converters", NULL);
-  }
+  if (conf.conffile) {
+    key_file = g_key_file_new ();
+    g_assert (key_file != NULL);
+
+    /* Read the conf file. It's ok even if we cannot load it. */
+    if (g_key_file_load_from_file (key_file, conf.conffile, G_KEY_FILE_NONE,
+            NULL)) {
+      gchar *value;
+
+      value = g_key_file_get_string (key_file, "common", "enable_envvar", NULL);
+      conf.enable_envvar = _parse_bool_string (value, FALSE);
+      g_free (value);
+
+      value =
+          g_key_file_get_string (key_file, "common", "enable_symlink", NULL);
+      conf.enable_symlink = _parse_bool_string (value, FALSE);
+      g_free (value);
+
+      conf.conf[NNSCONF_PATH_FILTERS].path[CONF_SOURCE_INI] =
+          g_key_file_get_string (key_file, "filter", "filters", NULL);
+      conf.conf[NNSCONF_PATH_DECODERS].path[CONF_SOURCE_INI] =
+          g_key_file_get_string (key_file, "decoder", "decoders", NULL);
+      conf.conf[NNSCONF_PATH_CUSTOM_FILTERS].path[CONF_SOURCE_INI] =
+          g_key_file_get_string (key_file, "filter", "customfilters", NULL);
+      conf.conf[NNSCONF_PATH_CONVERTERS].path[CONF_SOURCE_INI] =
+          g_key_file_get_string (key_file, "converter", "converters", NULL);
+    }
 
+    g_key_file_free (key_file);
+  }
 
   for (t = 0; t < NNSCONF_PATH_END; t++) {
     if (t == NNSCONF_PATH_EASY_CUSTOM_FILTERS)