From: Jaeyun <jy1210.jung@samsung.com>
Date: Mon, 19 Nov 2018 11:41:21 +0000 (+0900)
Subject: [Transform] free operators list
X-Git-Tag: v0.0.3~67
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bb4e34f31d459480c064ce32467b4ec420ec8027;p=platform%2Fupstream%2Fnnstreamer.git

[Transform] free operators list

1. If there exists pre-configured list for arith operators, free it before parsing new option.
2. Remove duplicated code in the loop of arith mode.

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

diff --git a/gst/tensor_transform/tensor_transform.c b/gst/tensor_transform/tensor_transform.c
index 4150d41..eb487c9 100644
--- a/gst/tensor_transform/tensor_transform.c
+++ b/gst/tensor_transform/tensor_transform.c
@@ -634,6 +634,15 @@ gst_tensor_transform_set_option_data (GstTensorTransform * filter)
 
       filter->data_arithmetic.out_type = _NNS_END;
 
+      if (filter->operators) {
+        GST_WARNING_OBJECT (filter,
+            "There exists pre-defined operators (total %d), now reset these.",
+            g_slist_length (filter->operators));
+
+        g_slist_free_full (filter->operators, g_free);
+        filter->operators = NULL;
+      }
+
       str_operators = g_strsplit (filter->option, ",", -1);
       num_operators = g_strv_length (str_operators);
 
@@ -978,22 +987,12 @@ gst_tensor_transform_arithmetic (GstTensorTransform * filter,
               op_s->value.type);
           break;
         case GTT_OP_ADD:
-          gst_tensor_transform_typecast_value (filter, &op_s->value,
-              value.type);
-          gst_tensor_transform_do_operator (filter, &value, &op_s->value,
-              GTT_OP_ADD);
-          break;
         case GTT_OP_MUL:
-          gst_tensor_transform_typecast_value (filter, &op_s->value,
-              value.type);
-          gst_tensor_transform_do_operator (filter, &value, &op_s->value,
-              GTT_OP_MUL);
-          break;
         case GTT_OP_DIV:
           gst_tensor_transform_typecast_value (filter, &op_s->value,
               value.type);
           gst_tensor_transform_do_operator (filter, &value, &op_s->value,
-              GTT_OP_DIV);
+              op_s->op);
           break;
         default:
           g_assert (0);