[Common] change function name

change common functions for nnstreamer plugin api

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

diff --git a/ext/nnstreamer/tensor_decoder/tensordec-boundingbox.c b/ext/nnstreamer/tensor_decoder/tensordec-boundingbox.c
index a1a5711..f233211 100644 (file)
--- a/ext/nnstreamer/tensor_decoder/tensordec-boundingbox.c
+++ b/ext/nnstreamer/tensor_decoder/tensordec-boundingbox.c
@@ -348,7 +348,7 @@ bb_setOption (void **pdata, int opNum, const char *param)
   } else if (opNum == 3) {
     /* option4 = output video size (width:height) */
     tensor_dim dim;
-    int rank = get_tensor_dimension (param, dim);
+    int rank = gst_tensor_parse_dimension (param, dim);
 
     bdata->width = 0;
     bdata->height = 0;
@@ -372,7 +372,7 @@ bb_setOption (void **pdata, int opNum, const char *param)
   } else if (opNum == 4) {
     /* option5 = input model size (width:height) */
     tensor_dim dim;
-    int rank = get_tensor_dimension (param, dim);
+    int rank = gst_tensor_parse_dimension (param, dim);
 
     bdata->i_width = 0;
     bdata->i_height = 0;

diff --git a/ext/nnstreamer/tensor_filter/tensor_filter_tensorflow_lite_core.cc b/ext/nnstreamer/tensor_filter/tensor_filter_tensorflow_lite_core.cc
index 39a5305..1b31500 100644 (file)
--- a/ext/nnstreamer/tensor_filter/tensor_filter_tensorflow_lite_core.cc
+++ b/ext/nnstreamer/tensor_filter/tensor_filter_tensorflow_lite_core.cc
@@ -196,7 +196,7 @@ TFLiteCore::setInputTensorProp ()
 
 #if (DBG)
     gchar *dim_str =
-        get_tensor_dimension_string (inputTensorMeta.info[i].dimension);
+        gst_tensor_get_dimension_string (inputTensorMeta.info[i].dimension);
     g_message ("inputTensorMeta[%d] >> type:%d, dim[%s]",
         i, inputTensorMeta.info[i].type, dim_str);
     g_free (dim_str);
@@ -225,7 +225,7 @@ TFLiteCore::setOutputTensorProp ()
 
 #if (DBG)
     gchar *dim_str =
-        get_tensor_dimension_string (outputTensorMeta.info[i].dimension);
+        gst_tensor_get_dimension_string (outputTensorMeta.info[i].dimension);
     g_message ("outputTensorMeta[%d] >> type:%d, dim[%s]",
         i, outputTensorMeta.info[i].type, dim_str);
     g_free (dim_str);

diff --git a/gst/nnstreamer/nnstreamer_plugin_api.c b/gst/nnstreamer/nnstreamer_plugin_api.c
index abbb038..6b87ee1 100644 (file)
--- a/gst/nnstreamer/nnstreamer_plugin_api.c
+++ b/gst/nnstreamer/nnstreamer_plugin_api.c
@@ -77,7 +77,7 @@ gst_tensor_info_get_size (const GstTensorInfo * info)
 
   g_return_val_if_fail (info != NULL, 0);
 
-  data_size = get_tensor_element_count (info->dimension) *
+  data_size = gst_tensor_get_element_count (info->dimension) *
       tensor_element_size[info->type];
 
   return data_size;
@@ -148,7 +148,7 @@ gst_tensors_info_parse_dimensions_string (GstTensorsInfo * info,
     }
 
     for (i = 0; i < num_dims; i++) {
-      get_tensor_dimension (str_dims[i], info->info[i].dimension);
+      gst_tensor_parse_dimension (str_dims[i], info->info[i].dimension);
     }
 
     g_strfreev (str_dims);
@@ -186,7 +186,7 @@ gst_tensors_info_parse_types_string (GstTensorsInfo * info,
     }
 
     for (i = 0; i < num_types; i++) {
-      info->info[i].type = get_tensor_type (str_types[i]);
+      info->info[i].type = gst_tensor_get_type (str_types[i]);
     }
 
     g_strfreev (str_types);
@@ -279,12 +279,12 @@ gst_tensor_config_from_tensor_info (GstTensorConfig * config,
 
   if (gst_structure_has_field (structure, "dimension")) {
     const gchar *dim_str = gst_structure_get_string (structure, "dimension");
-    get_tensor_dimension (dim_str, info->dimension);
+    gst_tensor_parse_dimension (dim_str, info->dimension);
   }
 
   if (gst_structure_has_field (structure, "type")) {
     const gchar *type_str = gst_structure_get_string (structure, "type");
-    info->type = get_tensor_type (type_str);
+    info->type = gst_tensor_get_type (type_str);
   }
 
   gst_structure_get_fraction (structure, "framerate", &config->rate_n,
@@ -761,7 +761,7 @@ gst_tensor_dimension_is_valid (const tensor_dim dim)
  * @param dim dimension to be filled.
  */
 guint
-get_tensor_dimension (const gchar * dimstr, tensor_dim dim)
+gst_tensor_parse_dimension (const gchar * dimstr, tensor_dim dim)
 {
   guint rank = 0;
   guint64 val;
@@ -804,7 +804,7 @@ get_tensor_dimension (const gchar * dimstr, tensor_dim dim)
  * @note The returned value should be freed with g_free()
  */
 gchar *
-get_tensor_dimension_string (const tensor_dim dim)
+gst_tensor_get_dimension_string (const tensor_dim dim)
 {
   guint i;
   GString *dim_str;
@@ -828,7 +828,7 @@ get_tensor_dimension_string (const tensor_dim dim)
  * @param dim The tensor dimension
  */
 gsize
-get_tensor_element_count (const tensor_dim dim)
+gst_tensor_get_element_count (const tensor_dim dim)
 {
   gsize count = 1;
   guint i;
@@ -846,7 +846,7 @@ get_tensor_element_count (const tensor_dim dim)
  * @param typestr The string type name, supposed to be one of tensor_element_typename[]
  */
 tensor_type
-get_tensor_type (const gchar * typestr)
+gst_tensor_get_type (const gchar * typestr)
 {
   guint len;
   gchar *type_string;

diff --git a/gst/nnstreamer/nnstreamer_plugin_api.h b/gst/nnstreamer/nnstreamer_plugin_api.h
index 60f6547..73efea6 100644 (file)
--- a/gst/nnstreamer/nnstreamer_plugin_api.h
+++ b/gst/nnstreamer/nnstreamer_plugin_api.h
@@ -213,7 +213,7 @@ gst_tensor_dimension_is_valid (const tensor_dim dim);
  * @param dim dimension to be filled.
  */
 extern guint
-get_tensor_dimension (const gchar * dimstr, tensor_dim dim);
+gst_tensor_parse_dimension (const gchar * dimstr, tensor_dim dim);
 
 /**
  * @brief Get dimension string from given tensor dimension.
@@ -222,7 +222,7 @@ get_tensor_dimension (const gchar * dimstr, tensor_dim dim);
  * @note The returned value should be freed with g_free()
  */
 extern gchar *
-get_tensor_dimension_string (const tensor_dim dim);
+gst_tensor_get_dimension_string (const tensor_dim dim);
 
 /**
  * @brief Count the number of elemnts of a tensor
@@ -230,7 +230,7 @@ get_tensor_dimension_string (const tensor_dim dim);
  * @param dim The tensor dimension
  */
 extern gsize
-get_tensor_element_count (const tensor_dim dim);
+gst_tensor_get_element_count (const tensor_dim dim);
 
 /**
  * @brief Get tensor_type from string tensor_type input
@@ -238,7 +238,7 @@ get_tensor_element_count (const tensor_dim dim);
  * @param typestr The string type name, supposed to be one of tensor_element_typename[]
  */
 extern tensor_type
-get_tensor_type (const gchar * typestr);
+gst_tensor_get_type (const gchar * typestr);
 
 /**
  * @brief Find the index value of the given key string array

diff --git a/gst/nnstreamer/tensor_aggregator/tensor_aggregator.c b/gst/nnstreamer/tensor_aggregator/tensor_aggregator.c
index 5d13be3..fb33a36 100644 (file)
--- a/gst/nnstreamer/tensor_aggregator/tensor_aggregator.c
+++ b/gst/nnstreamer/tensor_aggregator/tensor_aggregator.c
@@ -64,7 +64,7 @@
   if (DBG) { \
     if (c) { \
       gchar *dim_str; \
-      dim_str = get_tensor_dimension_string ((c)->info.dimension); \
+      dim_str = gst_tensor_get_dimension_string ((c)->info.dimension); \
       GST_DEBUG_OBJECT (self, msg " type=%d dim=%s rate=%d/%d", (c)->info.type, dim_str, (c)->rate_n, (c)->rate_d); \
       g_free (dim_str); \
     } \

diff --git a/gst/nnstreamer/tensor_common.c b/gst/nnstreamer/tensor_common.c
index 821eec2..6ca99f6 100644 (file)
--- a/gst/nnstreamer/tensor_common.c
+++ b/gst/nnstreamer/tensor_common.c
@@ -209,7 +209,7 @@ gst_tensors_info_get_dimensions_string (const GstTensorsInfo * info)
     GString *dimensions = g_string_new (NULL);
 
     for (i = 0; i < info->num_tensors; i++) {
-      dim_str = get_tensor_dimension_string (info->info[i].dimension);
+      dim_str = gst_tensor_get_dimension_string (info->info[i].dimension);
 
       g_string_append (dimensions, dim_str);
 
@@ -322,7 +322,7 @@ gst_tensor_caps_from_config (const GstTensorConfig * config)
   caps = gst_caps_from_string (GST_TENSOR_CAP_DEFAULT);
 
   if (gst_tensor_dimension_is_valid (config->info.dimension)) {
-    gchar *dim_str = get_tensor_dimension_string (config->info.dimension);
+    gchar *dim_str = gst_tensor_get_dimension_string (config->info.dimension);
 
     gst_caps_set_simple (caps, "dimension", G_TYPE_STRING, dim_str, NULL);
     g_free (dim_str);

diff --git a/gst/nnstreamer/tensor_converter/tensor_converter.c b/gst/nnstreamer/tensor_converter/tensor_converter.c
index b3628ae..ef70be4 100644 (file)
--- a/gst/nnstreamer/tensor_converter/tensor_converter.c
+++ b/gst/nnstreamer/tensor_converter/tensor_converter.c
@@ -316,12 +316,12 @@ gst_tensor_converter_set_property (GObject * object, guint prop_id,
 
   switch (prop_id) {
     case PROP_INPUT_DIMENSION:
-      if (get_tensor_dimension (g_value_get_string (value),
+      if (gst_tensor_parse_dimension (g_value_get_string (value),
               self->tensor_info.dimension) == 0)
         GST_WARNING ("input dimension unknown (optinal).");
       break;
     case PROP_INPUT_TYPE:
-      self->tensor_info.type = get_tensor_type (g_value_get_string (value));
+      self->tensor_info.type = gst_tensor_get_type (g_value_get_string (value));
       if (self->tensor_info.type == _NNS_END)
         GST_WARNING ("input type unknown (optional).");
       break;
@@ -359,7 +359,7 @@ gst_tensor_converter_get_property (GObject * object, guint prop_id,
     {
       gchar *str_dim;
 
-      str_dim = get_tensor_dimension_string (self->tensor_info.dimension);
+      str_dim = gst_tensor_get_dimension_string (self->tensor_info.dimension);
       g_value_set_string (value, str_dim);
       g_free (str_dim);
       break;

diff --git a/gst/nnstreamer/tensor_filter/tensor_filter.c b/gst/nnstreamer/tensor_filter/tensor_filter.c
index 40c1075..587fa36 100644 (file)
--- a/gst/nnstreamer/tensor_filter/tensor_filter.c
+++ b/gst/nnstreamer/tensor_filter/tensor_filter.c
@@ -101,7 +101,7 @@
     gchar *dim_str; \
     GST_DEBUG_OBJECT (self, msg " total %d", (i)->num_tensors); \
     for (info_idx = 0; info_idx < (i)->num_tensors; info_idx++) { \
-      dim_str = get_tensor_dimension_string ((i)->info[info_idx].dimension); \
+      dim_str = gst_tensor_get_dimension_string ((i)->info[info_idx].dimension); \
       GST_DEBUG_OBJECT (self, "[%d] type=%d dim=%s", info_idx, (i)->info[info_idx].type, dim_str); \
       g_free (dim_str); \
     } \
@@ -976,7 +976,7 @@ _compare_tensors (GstTensorsInfo * info1, GstTensorsInfo * info2)
       break;
 
     if (info1->num_tensors > i) {
-      dimstr = get_tensor_dimension_string (info1->info[i].dimension);
+      dimstr = gst_tensor_get_dimension_string (info1->info[i].dimension);
       left = g_strdup_printf ("%s [%s]",
           tensor_element_typename[info1->info[i].type], dimstr);
       g_free (dimstr);
@@ -985,7 +985,7 @@ _compare_tensors (GstTensorsInfo * info1, GstTensorsInfo * info2)
     }
 
     if (info2->num_tensors > i) {
-      dimstr = get_tensor_dimension_string (info2->info[i].dimension);
+      dimstr = gst_tensor_get_dimension_string (info2->info[i].dimension);
       right = g_strdup_printf ("%s [%s]",
           tensor_element_typename[info2->info[i].type], dimstr);
       g_free (dimstr);

diff --git a/gst/nnstreamer/tensor_split/gsttensorsplit.c b/gst/nnstreamer/tensor_split/gsttensorsplit.c
index dc1ae44..38063c3 100644 (file)
--- a/gst/nnstreamer/tensor_split/gsttensorsplit.c
+++ b/gst/nnstreamer/tensor_split/gsttensorsplit.c
@@ -421,7 +421,7 @@ gst_get_splited_tensor (GstTensorSplit * split, GstBuffer * buffer, gint nth)
   offset = 0;
   dim = g_array_index (split->tensorseg, tensor_dim *, nth);
 
-  size += get_tensor_element_count (*dim) *
+  size += gst_tensor_get_element_count (*dim) *
       tensor_element_size[split->sink_tensor_conf.info.type];
   mem = gst_allocator_alloc (NULL, size, NULL);
   gst_memory_map (mem, &dest_info, GST_MAP_WRITE);
@@ -429,7 +429,7 @@ gst_get_splited_tensor (GstTensorSplit * split, GstBuffer * buffer, gint nth)
 
   for (i = 0; i < nth; i++) {
     dim = g_array_index (split->tensorseg, tensor_dim *, i);
-    offset += get_tensor_element_count (*dim);
+    offset += gst_tensor_get_element_count (*dim);
   }
 
   nns_memcpy (dest_info.data, src_info.data + offset, size);

diff --git a/gst/nnstreamer/tensor_transform/tensor_transform.c b/gst/nnstreamer/tensor_transform/tensor_transform.c
index d0dd98f..141a2f5 100644 (file)
--- a/gst/nnstreamer/tensor_transform/tensor_transform.c
+++ b/gst/nnstreamer/tensor_transform/tensor_transform.c
@@ -730,7 +730,7 @@ gst_tensor_transform_set_option_data (GstTensorTransform * filter)
     }
     case GTT_TYPECAST:
     {
-      filter->data_typecast.to = get_tensor_type (filter->option);
+      filter->data_typecast.to = gst_tensor_get_type (filter->option);
       if (filter->data_typecast.to != _NNS_END)
         filter->loaded = TRUE;
       break;
@@ -777,7 +777,7 @@ gst_tensor_transform_set_option_data (GstTensorTransform * filter)
                   break;
                 }
 
-                op_s->value.type = get_tensor_type (str_op[1]);
+                op_s->value.type = gst_tensor_get_type (str_op[1]);
 
                 if (op_s->value.type == _NNS_END) {
                   GST_WARNING_OBJECT (filter, "Unknown tensor type %s",
@@ -1053,7 +1053,7 @@ static GstFlowReturn
 gst_tensor_transform_typecast (GstTensorTransform * filter,
     const uint8_t * inptr, uint8_t * outptr)
 {
-  size_t num = get_tensor_element_count (filter->in_config.info.dimension);
+  gsize num = gst_tensor_get_element_count (filter->in_config.info.dimension);
   tensor_type in_tensor_type = filter->in_config.info.type;
   tensor_type out_tensor_type = filter->out_config.info.type;
 
@@ -1097,7 +1097,7 @@ static GstFlowReturn
 gst_tensor_transform_arithmetic (GstTensorTransform * filter,
     const uint8_t * inptr, uint8_t * outptr)
 {
-  size_t num = get_tensor_element_count (filter->in_config.info.dimension);
+  gsize num = gst_tensor_get_element_count (filter->in_config.info.dimension);
   tensor_type in_tensor_type = filter->in_config.info.type;
   tensor_type out_tensor_type = filter->out_config.info.type;
 

diff --git a/tests/common/unittest_common.cpp b/tests/common/unittest_common.cpp
index 2089525..bb9b882 100644 (file)
--- a/tests/common/unittest_common.cpp
+++ b/tests/common/unittest_common.cpp
@@ -22,12 +22,12 @@
  */
 TEST (common_get_tensor_type, int32)
 {
-  EXPECT_EQ (get_tensor_type ("int32"), _NNS_INT32);
-  EXPECT_EQ (get_tensor_type ("INT32"), _NNS_INT32);
-  EXPECT_EQ (get_tensor_type ("iNt32"), _NNS_INT32);
-  EXPECT_EQ (get_tensor_type ("InT32"), _NNS_INT32);
-  EXPECT_EQ (get_tensor_type ("InT322"), _NNS_END);
-  EXPECT_EQ (get_tensor_type ("int3"), _NNS_END);
+  EXPECT_EQ (gst_tensor_get_type ("int32"), _NNS_INT32);
+  EXPECT_EQ (gst_tensor_get_type ("INT32"), _NNS_INT32);
+  EXPECT_EQ (gst_tensor_get_type ("iNt32"), _NNS_INT32);
+  EXPECT_EQ (gst_tensor_get_type ("InT32"), _NNS_INT32);
+  EXPECT_EQ (gst_tensor_get_type ("InT322"), _NNS_END);
+  EXPECT_EQ (gst_tensor_get_type ("int3"), _NNS_END);
 }
 
 /**
@@ -35,12 +35,12 @@ TEST (common_get_tensor_type, int32)
  */
 TEST (common_get_tensor_type, int16)
 {
-  EXPECT_EQ (get_tensor_type ("int16"), _NNS_INT16);
-  EXPECT_EQ (get_tensor_type ("INT16"), _NNS_INT16);
-  EXPECT_EQ (get_tensor_type ("iNt16"), _NNS_INT16);
-  EXPECT_EQ (get_tensor_type ("InT16"), _NNS_INT16);
-  EXPECT_EQ (get_tensor_type ("InT162"), _NNS_END);
-  EXPECT_EQ (get_tensor_type ("int1"), _NNS_END);
+  EXPECT_EQ (gst_tensor_get_type ("int16"), _NNS_INT16);
+  EXPECT_EQ (gst_tensor_get_type ("INT16"), _NNS_INT16);
+  EXPECT_EQ (gst_tensor_get_type ("iNt16"), _NNS_INT16);
+  EXPECT_EQ (gst_tensor_get_type ("InT16"), _NNS_INT16);
+  EXPECT_EQ (gst_tensor_get_type ("InT162"), _NNS_END);
+  EXPECT_EQ (gst_tensor_get_type ("int1"), _NNS_END);
 }
 
 /**
@@ -48,12 +48,12 @@ TEST (common_get_tensor_type, int16)
  */
 TEST (common_get_tensor_type, int8)
 {
-  EXPECT_EQ (get_tensor_type ("int8"), _NNS_INT8);
-  EXPECT_EQ (get_tensor_type ("INT8"), _NNS_INT8);
-  EXPECT_EQ (get_tensor_type ("iNt8"), _NNS_INT8);
-  EXPECT_EQ (get_tensor_type ("InT8"), _NNS_INT8);
-  EXPECT_EQ (get_tensor_type ("InT82"), _NNS_END);
-  EXPECT_EQ (get_tensor_type ("int3"), _NNS_END);
+  EXPECT_EQ (gst_tensor_get_type ("int8"), _NNS_INT8);
+  EXPECT_EQ (gst_tensor_get_type ("INT8"), _NNS_INT8);
+  EXPECT_EQ (gst_tensor_get_type ("iNt8"), _NNS_INT8);
+  EXPECT_EQ (gst_tensor_get_type ("InT8"), _NNS_INT8);
+  EXPECT_EQ (gst_tensor_get_type ("InT82"), _NNS_END);
+  EXPECT_EQ (gst_tensor_get_type ("int3"), _NNS_END);
 }
 
 /**
@@ -61,12 +61,12 @@ TEST (common_get_tensor_type, int8)
  */
 TEST (common_get_tensor_type, uint32)
 {
-  EXPECT_EQ (get_tensor_type ("uint32"), _NNS_UINT32);
-  EXPECT_EQ (get_tensor_type ("UINT32"), _NNS_UINT32);
-  EXPECT_EQ (get_tensor_type ("uiNt32"), _NNS_UINT32);
-  EXPECT_EQ (get_tensor_type ("UInT32"), _NNS_UINT32);
-  EXPECT_EQ (get_tensor_type ("UInT322"), _NNS_END);
-  EXPECT_EQ (get_tensor_type ("uint3"), _NNS_END);
+  EXPECT_EQ (gst_tensor_get_type ("uint32"), _NNS_UINT32);
+  EXPECT_EQ (gst_tensor_get_type ("UINT32"), _NNS_UINT32);
+  EXPECT_EQ (gst_tensor_get_type ("uiNt32"), _NNS_UINT32);
+  EXPECT_EQ (gst_tensor_get_type ("UInT32"), _NNS_UINT32);
+  EXPECT_EQ (gst_tensor_get_type ("UInT322"), _NNS_END);
+  EXPECT_EQ (gst_tensor_get_type ("uint3"), _NNS_END);
 }
 
 /**
@@ -74,12 +74,12 @@ TEST (common_get_tensor_type, uint32)
  */
 TEST (common_get_tensor_type, uint16)
 {
-  EXPECT_EQ (get_tensor_type ("uint16"), _NNS_UINT16);
-  EXPECT_EQ (get_tensor_type ("UINT16"), _NNS_UINT16);
-  EXPECT_EQ (get_tensor_type ("uiNt16"), _NNS_UINT16);
-  EXPECT_EQ (get_tensor_type ("UInT16"), _NNS_UINT16);
-  EXPECT_EQ (get_tensor_type ("UInT162"), _NNS_END);
-  EXPECT_EQ (get_tensor_type ("uint1"), _NNS_END);
+  EXPECT_EQ (gst_tensor_get_type ("uint16"), _NNS_UINT16);
+  EXPECT_EQ (gst_tensor_get_type ("UINT16"), _NNS_UINT16);
+  EXPECT_EQ (gst_tensor_get_type ("uiNt16"), _NNS_UINT16);
+  EXPECT_EQ (gst_tensor_get_type ("UInT16"), _NNS_UINT16);
+  EXPECT_EQ (gst_tensor_get_type ("UInT162"), _NNS_END);
+  EXPECT_EQ (gst_tensor_get_type ("uint1"), _NNS_END);
 }
 
 /**
@@ -87,12 +87,12 @@ TEST (common_get_tensor_type, uint16)
  */
 TEST (common_get_tensor_type, uint8)
 {
-  EXPECT_EQ (get_tensor_type ("uint8"), _NNS_UINT8);
-  EXPECT_EQ (get_tensor_type ("UINT8"), _NNS_UINT8);
-  EXPECT_EQ (get_tensor_type ("uiNt8"), _NNS_UINT8);
-  EXPECT_EQ (get_tensor_type ("UInT8"), _NNS_UINT8);
-  EXPECT_EQ (get_tensor_type ("UInT82"), _NNS_END);
-  EXPECT_EQ (get_tensor_type ("uint3"), _NNS_END);
+  EXPECT_EQ (gst_tensor_get_type ("uint8"), _NNS_UINT8);
+  EXPECT_EQ (gst_tensor_get_type ("UINT8"), _NNS_UINT8);
+  EXPECT_EQ (gst_tensor_get_type ("uiNt8"), _NNS_UINT8);
+  EXPECT_EQ (gst_tensor_get_type ("UInT8"), _NNS_UINT8);
+  EXPECT_EQ (gst_tensor_get_type ("UInT82"), _NNS_END);
+  EXPECT_EQ (gst_tensor_get_type ("uint3"), _NNS_END);
 }
 
 /**
@@ -100,12 +100,12 @@ TEST (common_get_tensor_type, uint8)
  */
 TEST (common_get_tensor_type, float32)
 {
-  EXPECT_EQ (get_tensor_type ("float32"), _NNS_FLOAT32);
-  EXPECT_EQ (get_tensor_type ("FLOAT32"), _NNS_FLOAT32);
-  EXPECT_EQ (get_tensor_type ("float32"), _NNS_FLOAT32);
-  EXPECT_EQ (get_tensor_type ("FloaT32"), _NNS_FLOAT32);
-  EXPECT_EQ (get_tensor_type ("FloaT322"), _NNS_END);
-  EXPECT_EQ (get_tensor_type ("float3"), _NNS_END);
+  EXPECT_EQ (gst_tensor_get_type ("float32"), _NNS_FLOAT32);
+  EXPECT_EQ (gst_tensor_get_type ("FLOAT32"), _NNS_FLOAT32);
+  EXPECT_EQ (gst_tensor_get_type ("float32"), _NNS_FLOAT32);
+  EXPECT_EQ (gst_tensor_get_type ("FloaT32"), _NNS_FLOAT32);
+  EXPECT_EQ (gst_tensor_get_type ("FloaT322"), _NNS_END);
+  EXPECT_EQ (gst_tensor_get_type ("float3"), _NNS_END);
 }
 
 /**
@@ -113,12 +113,12 @@ TEST (common_get_tensor_type, float32)
  */
 TEST (common_get_tensor_type, float64)
 {
-  EXPECT_EQ (get_tensor_type ("float64"), _NNS_FLOAT64);
-  EXPECT_EQ (get_tensor_type ("FLOAT64"), _NNS_FLOAT64);
-  EXPECT_EQ (get_tensor_type ("float64"), _NNS_FLOAT64);
-  EXPECT_EQ (get_tensor_type ("FloaT64"), _NNS_FLOAT64);
-  EXPECT_EQ (get_tensor_type ("FloaT642"), _NNS_END);
-  EXPECT_EQ (get_tensor_type ("float6"), _NNS_END);
+  EXPECT_EQ (gst_tensor_get_type ("float64"), _NNS_FLOAT64);
+  EXPECT_EQ (gst_tensor_get_type ("FLOAT64"), _NNS_FLOAT64);
+  EXPECT_EQ (gst_tensor_get_type ("float64"), _NNS_FLOAT64);
+  EXPECT_EQ (gst_tensor_get_type ("FloaT64"), _NNS_FLOAT64);
+  EXPECT_EQ (gst_tensor_get_type ("FloaT642"), _NNS_END);
+  EXPECT_EQ (gst_tensor_get_type ("float6"), _NNS_END);
 }
 
 /**
@@ -126,12 +126,12 @@ TEST (common_get_tensor_type, float64)
  */
 TEST (common_get_tensor_type, int64)
 {
-  EXPECT_EQ (get_tensor_type ("int64"), _NNS_INT64);
-  EXPECT_EQ (get_tensor_type ("INT64"), _NNS_INT64);
-  EXPECT_EQ (get_tensor_type ("iNt64"), _NNS_INT64);
-  EXPECT_EQ (get_tensor_type ("InT64"), _NNS_INT64);
-  EXPECT_EQ (get_tensor_type ("InT642"), _NNS_END);
-  EXPECT_EQ (get_tensor_type ("int6"), _NNS_END);
+  EXPECT_EQ (gst_tensor_get_type ("int64"), _NNS_INT64);
+  EXPECT_EQ (gst_tensor_get_type ("INT64"), _NNS_INT64);
+  EXPECT_EQ (gst_tensor_get_type ("iNt64"), _NNS_INT64);
+  EXPECT_EQ (gst_tensor_get_type ("InT64"), _NNS_INT64);
+  EXPECT_EQ (gst_tensor_get_type ("InT642"), _NNS_END);
+  EXPECT_EQ (gst_tensor_get_type ("int6"), _NNS_END);
 }
 
 /**
@@ -139,12 +139,12 @@ TEST (common_get_tensor_type, int64)
  */
 TEST (common_get_tensor_type, uint64)
 {
-  EXPECT_EQ (get_tensor_type ("uint64"), _NNS_UINT64);
-  EXPECT_EQ (get_tensor_type ("UINT64"), _NNS_UINT64);
-  EXPECT_EQ (get_tensor_type ("uiNt64"), _NNS_UINT64);
-  EXPECT_EQ (get_tensor_type ("UInT64"), _NNS_UINT64);
-  EXPECT_EQ (get_tensor_type ("UInT642"), _NNS_END);
-  EXPECT_EQ (get_tensor_type ("uint6"), _NNS_END);
+  EXPECT_EQ (gst_tensor_get_type ("uint64"), _NNS_UINT64);
+  EXPECT_EQ (gst_tensor_get_type ("UINT64"), _NNS_UINT64);
+  EXPECT_EQ (gst_tensor_get_type ("uiNt64"), _NNS_UINT64);
+  EXPECT_EQ (gst_tensor_get_type ("UInT64"), _NNS_UINT64);
+  EXPECT_EQ (gst_tensor_get_type ("UInT642"), _NNS_END);
+  EXPECT_EQ (gst_tensor_get_type ("uint6"), _NNS_END);
 }
 
 /**
@@ -177,14 +177,14 @@ TEST (common_get_tensor_dimension, case1)
   gchar *dim_str;
   guint rank;
 
-  rank = get_tensor_dimension ("345:123:433:177", dim);
+  rank = gst_tensor_parse_dimension ("345:123:433:177", dim);
   EXPECT_EQ (rank, 4);
   EXPECT_EQ (dim[0], 345);
   EXPECT_EQ (dim[1], 123);
   EXPECT_EQ (dim[2], 433);
   EXPECT_EQ (dim[3], 177);
 
-  dim_str = get_tensor_dimension_string (dim);
+  dim_str = gst_tensor_get_dimension_string (dim);
   EXPECT_TRUE (g_str_equal (dim_str, "345:123:433:177"));
   g_free (dim_str);
 }
@@ -198,14 +198,14 @@ TEST (common_get_tensor_dimension, case2)
   gchar *dim_str;
   guint rank;
 
-  rank = get_tensor_dimension ("345:123:433", dim);
+  rank = gst_tensor_parse_dimension ("345:123:433", dim);
   EXPECT_EQ (rank, 3);
   EXPECT_EQ (dim[0], 345);
   EXPECT_EQ (dim[1], 123);
   EXPECT_EQ (dim[2], 433);
   EXPECT_EQ (dim[3], 1);
 
-  dim_str = get_tensor_dimension_string (dim);
+  dim_str = gst_tensor_get_dimension_string (dim);
   EXPECT_TRUE (g_str_equal (dim_str, "345:123:433:1"));
   g_free (dim_str);
 }
@@ -219,14 +219,14 @@ TEST (common_get_tensor_dimension, case3)
   gchar *dim_str;
   guint rank;
 
-  rank = get_tensor_dimension ("345:123", dim);
+  rank = gst_tensor_parse_dimension ("345:123", dim);
   EXPECT_EQ (rank, 2);
   EXPECT_EQ (dim[0], 345);
   EXPECT_EQ (dim[1], 123);
   EXPECT_EQ (dim[2], 1);
   EXPECT_EQ (dim[3], 1);
 
-  dim_str = get_tensor_dimension_string (dim);
+  dim_str = gst_tensor_get_dimension_string (dim);
   EXPECT_TRUE (g_str_equal (dim_str, "345:123:1:1"));
   g_free (dim_str);
 }
@@ -240,14 +240,14 @@ TEST (common_get_tensor_dimension, case4)
   gchar *dim_str;
   guint rank;
 
-  rank = get_tensor_dimension ("345", dim);
+  rank = gst_tensor_parse_dimension ("345", dim);
   EXPECT_EQ (rank, 1);
   EXPECT_EQ (dim[0], 345);
   EXPECT_EQ (dim[1], 1);
   EXPECT_EQ (dim[2], 1);
   EXPECT_EQ (dim[3], 1);
 
-  dim_str = get_tensor_dimension_string (dim);
+  dim_str = gst_tensor_get_dimension_string (dim);
   EXPECT_TRUE (g_str_equal (dim_str, "345:1:1:1"));
   g_free (dim_str);
 }

diff --git a/tests/nnstreamer_plugins/unittest_plugins.cpp b/tests/nnstreamer_plugins/unittest_plugins.cpp
index ec3538f..1a053ad 100644 (file)
--- a/tests/nnstreamer_plugins/unittest_plugins.cpp
+++ b/tests/nnstreamer_plugins/unittest_plugins.cpp
@@ -50,7 +50,7 @@ TEST (test_tensor_transform, typecast_1)
 
   /* input tensor info */
   config.info.type = _NNS_UINT8;
-  get_tensor_dimension ("5", config.info.dimension);
+  gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
@@ -123,7 +123,7 @@ TEST (test_tensor_transform, typecast_1_accel)
 
   /* input tensor info */
   config.info.type = _NNS_UINT8;
-  get_tensor_dimension ("5", config.info.dimension);
+  gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
@@ -196,7 +196,7 @@ TEST (test_tensor_transform, typecast_2)
 
   /* input tensor info */
   config.info.type = _NNS_UINT32;
-  get_tensor_dimension ("5", config.info.dimension);
+  gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
@@ -269,7 +269,7 @@ TEST (test_tensor_transform, typecast_2_accel)
 
   /* input tensor info */
   config.info.type = _NNS_UINT32;
-  get_tensor_dimension ("5", config.info.dimension);
+  gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
@@ -342,7 +342,7 @@ TEST (test_tensor_transform, typecast_3)
 
   /* input tensor info */
   config.info.type = _NNS_INT32;
-  get_tensor_dimension ("5", config.info.dimension);
+  gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
@@ -415,7 +415,7 @@ TEST (test_tensor_transform, typecast_3_accel)
 
   /* input tensor info */
   config.info.type = _NNS_INT32;
-  get_tensor_dimension ("5", config.info.dimension);
+  gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
@@ -488,7 +488,7 @@ TEST (test_tensor_transform, typecast_4)
 
   /* input tensor info */
   config.info.type = _NNS_INT8;
-  get_tensor_dimension ("5", config.info.dimension);
+  gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
@@ -561,7 +561,7 @@ TEST (test_tensor_transform, typecast_4_accel)
 
   /* input tensor info */
   config.info.type = _NNS_INT8;
-  get_tensor_dimension ("5", config.info.dimension);
+  gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
@@ -634,7 +634,7 @@ TEST (test_tensor_transform, typecast_5)
 
   /* input tensor info */
   config.info.type = _NNS_UINT8;
-  get_tensor_dimension ("5", config.info.dimension);
+  gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
@@ -707,7 +707,7 @@ TEST (test_tensor_transform, typecast_5_accel)
 
   /* input tensor info */
   config.info.type = _NNS_UINT8;
-  get_tensor_dimension ("5", config.info.dimension);
+  gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
@@ -780,7 +780,7 @@ TEST (test_tensor_transform, typecast_6)
 
   /* input tensor info */
   config.info.type = _NNS_INT16;
-  get_tensor_dimension ("5", config.info.dimension);
+  gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
@@ -853,7 +853,7 @@ TEST (test_tensor_transform, typecast_6_accel)
 
   /* input tensor info */
   config.info.type = _NNS_INT16;
-  get_tensor_dimension ("5", config.info.dimension);
+  gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
@@ -926,7 +926,7 @@ TEST (test_tensor_transform, typecast_7)
 
   /* input tensor info */
   config.info.type = _NNS_UINT16;
-  get_tensor_dimension ("5", config.info.dimension);
+  gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
@@ -999,7 +999,7 @@ TEST (test_tensor_transform, typecast_7_accel)
 
   /* input tensor info */
   config.info.type = _NNS_UINT16;
-  get_tensor_dimension ("5", config.info.dimension);
+  gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
@@ -1072,7 +1072,7 @@ TEST (test_tensor_transform, arithmetic_1)
 
   /* input tensor info */
   config.info.type = _NNS_FLOAT32;
-  get_tensor_dimension ("5", config.info.dimension);
+  gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
@@ -1142,7 +1142,7 @@ TEST (test_tensor_transform, arithmetic_1_accel)
 
   /* input tensor info */
   config.info.type = _NNS_FLOAT32;
-  get_tensor_dimension ("5", config.info.dimension);
+  gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
@@ -1212,7 +1212,7 @@ TEST (test_tensor_transform, arithmetic_2)
 
   /* input tensor info */
   config.info.type = _NNS_FLOAT64;
-  get_tensor_dimension ("5", config.info.dimension);
+  gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
@@ -1282,7 +1282,7 @@ TEST (test_tensor_transform, arithmetic_2_accel)
 
   /* input tensor info */
   config.info.type = _NNS_FLOAT64;
-  get_tensor_dimension ("5", config.info.dimension);
+  gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
@@ -1353,7 +1353,7 @@ TEST (test_tensor_transform, arithmetic_3)
 
   /* input tensor info */
   config.info.type = _NNS_UINT8;
-  get_tensor_dimension ("5", config.info.dimension);
+  gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
@@ -1427,7 +1427,7 @@ TEST (test_tensor_transform, arithmetic_3_accel)
 
   /* input tensor info */
   config.info.type = _NNS_UINT8;
-  get_tensor_dimension ("5", config.info.dimension);
+  gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
@@ -1501,7 +1501,7 @@ TEST (test_tensor_transform, arithmetic_4)
 
   /* input tensor info */
   config.info.type = _NNS_UINT8;
-  get_tensor_dimension ("5", config.info.dimension);
+  gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
@@ -1575,7 +1575,7 @@ TEST (test_tensor_transform, arithmetic_4_accel)
 
   /* input tensor info */
   config.info.type = _NNS_UINT8;
-  get_tensor_dimension ("5", config.info.dimension);
+  gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
@@ -1649,7 +1649,7 @@ TEST (test_tensor_transform, arithmetic_5)
 
   /* input tensor info */
   config.info.type = _NNS_UINT8;
-  get_tensor_dimension ("5", config.info.dimension);
+  gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
@@ -1723,7 +1723,7 @@ TEST (test_tensor_transform, arithmetic_5_accel)
 
   /* input tensor info */
   config.info.type = _NNS_UINT8;
-  get_tensor_dimension ("5", config.info.dimension);
+  gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
@@ -1810,14 +1810,14 @@ TEST (test_tensor_aggregator, aggregate_1)
 
   /* input tensor info */
   config.info.type = _NNS_INT32;
-  get_tensor_dimension ("3:4:2:2", config.info.dimension);
+  gst_tensor_parse_dimension ("3:4:2:2", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
   gst_harness_set_src_caps (h, gst_tensor_caps_from_config (&config));
   data_in_size = gst_tensor_info_get_size (&config.info);
 
-  get_tensor_dimension ("3:4:2:4", config.info.dimension);
+  gst_tensor_parse_dimension ("3:4:2:4", config.info.dimension);
   data_out_size = gst_tensor_info_get_size (&config.info);
 
   /* push buffers */
@@ -1886,14 +1886,14 @@ TEST (test_tensor_aggregator, aggregate_2)
 
   /* input tensor info */
   config.info.type = _NNS_INT32;
-  get_tensor_dimension ("3:4:2:2", config.info.dimension);
+  gst_tensor_parse_dimension ("3:4:2:2", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
   gst_harness_set_src_caps (h, gst_tensor_caps_from_config (&config));
   data_in_size = gst_tensor_info_get_size (&config.info);
 
-  get_tensor_dimension ("3:4:4:2", config.info.dimension);
+  gst_tensor_parse_dimension ("3:4:4:2", config.info.dimension);
   data_out_size = gst_tensor_info_get_size (&config.info);
 
   /* push buffers */
@@ -1962,14 +1962,14 @@ TEST (test_tensor_aggregator, aggregate_3)
 
   /* input tensor info */
   config.info.type = _NNS_INT32;
-  get_tensor_dimension ("3:4:2:2", config.info.dimension);
+  gst_tensor_parse_dimension ("3:4:2:2", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
   gst_harness_set_src_caps (h, gst_tensor_caps_from_config (&config));
   data_in_size = gst_tensor_info_get_size (&config.info);
 
-  get_tensor_dimension ("3:8:2:2", config.info.dimension);
+  gst_tensor_parse_dimension ("3:8:2:2", config.info.dimension);
   data_out_size = gst_tensor_info_get_size (&config.info);
 
   /* push buffers */
@@ -2038,14 +2038,14 @@ TEST (test_tensor_aggregator, aggregate_4)
 
   /* input tensor info */
   config.info.type = _NNS_INT32;
-  get_tensor_dimension ("3:4:2:2", config.info.dimension);
+  gst_tensor_parse_dimension ("3:4:2:2", config.info.dimension);
   config.rate_n = 0;
   config.rate_d = 1;
 
   gst_harness_set_src_caps (h, gst_tensor_caps_from_config (&config));
   data_in_size = gst_tensor_info_get_size (&config.info);
 
-  get_tensor_dimension ("6:4:2:2", config.info.dimension);
+  gst_tensor_parse_dimension ("6:4:2:2", config.info.dimension);
   data_out_size = gst_tensor_info_get_size (&config.info);
 
   /* push buffers */