[Filter/Sub] use glib to compare strings

change string util functions to parse and compare strings.

Signed-off-by: Jaeyun Jung <jy1210.jung@samsung.com>

diff --git a/ext/nnstreamer/tensor_filter/tensor_filter_nnfw.c b/ext/nnstreamer/tensor_filter/tensor_filter_nnfw.c
index f641b9a..96ece3d 100644 (file)
--- a/ext/nnstreamer/tensor_filter/tensor_filter_nnfw.c
+++ b/ext/nnstreamer/tensor_filter/tensor_filter_nnfw.c
@@ -62,7 +62,7 @@ nnfw_open (const GstTensorFilterProperties * prop, void **private_data)
 
   if (*private_data != NULL) {
     pdata = *private_data;
-    if (strcmp (prop->model_file, pdata->model_path)) {
+    if (g_strcmp0 (prop->model_file, pdata->model_path)) {
       nnfw_close (prop, private_data);  /* "reopen" */
     } else {
       return 1;

diff --git a/ext/nnstreamer/tensor_filter/tensor_filter_python.c b/ext/nnstreamer/tensor_filter/tensor_filter_python.c
index 3018578..f5515b1 100644 (file)
--- a/ext/nnstreamer/tensor_filter/tensor_filter_python.c
+++ b/ext/nnstreamer/tensor_filter/tensor_filter_python.c
@@ -171,7 +171,7 @@ py_loadScriptFile (const GstTensorFilterProperties * prop, void **private_data)
 
   if (*private_data != NULL) {
     py = *private_data;
-    if (strcmp (prop->model_file, py_core_getScriptPath (py->py_private_data))) {
+    if (g_strcmp0 (prop->model_file, py_core_getScriptPath (py->py_private_data))) {
       py_close (prop, private_data);
     } else {
       return 1;

diff --git a/ext/nnstreamer/tensor_filter/tensor_filter_pytorch.c b/ext/nnstreamer/tensor_filter/tensor_filter_pytorch.c
index b44fd4d..517b059 100644 (file)
--- a/ext/nnstreamer/tensor_filter/tensor_filter_pytorch.c
+++ b/ext/nnstreamer/tensor_filter/tensor_filter_pytorch.c
@@ -73,7 +73,7 @@ torch_loadModelFile (const GstTensorFilterProperties * prop,
   gboolean torch_use_gpu;
   if (*private_data != NULL) {
     torch = *private_data;
-    if (strcmp (prop->model_file,
+    if (g_strcmp0 (prop->model_file,
             torch_core_getModelPath (torch->torch_private_data))) {
       torch_close (prop, private_data);
     } else {

diff --git a/ext/nnstreamer/tensor_filter/tensor_filter_tensorflow.c b/ext/nnstreamer/tensor_filter/tensor_filter_tensorflow.c
index 74ae829..0dd8473 100644 (file)
--- a/ext/nnstreamer/tensor_filter/tensor_filter_tensorflow.c
+++ b/ext/nnstreamer/tensor_filter/tensor_filter_tensorflow.c
@@ -73,7 +73,7 @@ tf_loadModelFile (const GstTensorFilterProperties * prop, void **private_data)
 
   if (*private_data != NULL) {
     tf = *private_data;
-    if (strcmp (prop->model_file, tf_core_getModelPath (tf->tf_private_data))) {
+    if (g_strcmp0 (prop->model_file, tf_core_getModelPath (tf->tf_private_data))) {
       tf_close (prop, private_data);
     } else {
       return 1;

diff --git a/ext/nnstreamer/tensor_filter/tensor_filter_tensorflow_lite.c b/ext/nnstreamer/tensor_filter/tensor_filter_tensorflow_lite.c
index b250ec0..e4b761e 100644 (file)
--- a/ext/nnstreamer/tensor_filter/tensor_filter_tensorflow_lite.c
+++ b/ext/nnstreamer/tensor_filter/tensor_filter_tensorflow_lite.c
@@ -83,21 +83,30 @@ tflite_loadModelFile (const GstTensorFilterProperties * prop,
 {
   tflite_data *tf;
   nnapi_hw hw = NNAPI_UNKNOWN;
+
   if (prop->nnapi) {
     gchar **strv = NULL;
+    guint len;
+
     strv = g_strsplit (prop->nnapi, ":", 2);
-    if (!g_strcmp0 (strv[0], "true") && g_strv_length (strv) >= 2) {
-      hw = get_nnapi_hw_type (strv[1]);
-    } else if (!g_strcmp0 (strv[0], "true") && g_strv_length (strv) == 1) {
-      /** defalut hw for nnapi is CPU */
-      hw = NNAPI_CPU;
+    len = g_strv_length (strv);
+
+    if (!g_ascii_strcasecmp (strv[0], "true")) {
+      if (len >= 2) {
+        hw = get_nnapi_hw_type (strv[1]);
+      } else {
+        /** defalut hw for nnapi is CPU */
+        hw = NNAPI_CPU;
+      }
     }
+
+    g_strfreev (strv);
   }
 
   if (*private_data != NULL) {
     /** @todo : Check the integrity of filter->data and filter->model_file, nnfw */
     tf = *private_data;
-    if (strcmp (prop->model_file,
+    if (g_strcmp0 (prop->model_file,
             tflite_core_getModelPath (tf->tflite_private_data))) {
       tflite_close (prop, private_data);
     } else {