[Src/IIO] dimension in tensorsrc-iio

0-init dims, data in src-iio has format of [ch-number][capacity].

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

diff --git a/gst/nnstreamer/elements/gsttensor_srciio.c b/gst/nnstreamer/elements/gsttensor_srciio.c
index 3ec46fa..f3c7c5e 100644 (file)
--- a/gst/nnstreamer/elements/gsttensor_srciio.c
+++ b/gst/nnstreamer/elements/gsttensor_srciio.c
@@ -1536,7 +1536,7 @@ gst_tensor_src_iio_create_config (GstTensorSrcIIO * tensor_src_iio)
   GList *list;
   GstTensorSrcIIOChannelProperties *channel_prop;
   gint tensor_info_merged_size;
-  guint info_idx = 0, dim_idx = 0;
+  guint info_idx = 0;
   GstTensorInfo *info;
   GstTensorsConfig *config;
 
@@ -1559,9 +1559,7 @@ gst_tensor_src_iio_create_config (GstTensorSrcIIO * tensor_src_iio)
       continue;
     info[info_idx].name = channel_prop->name;
     info[info_idx].type = _NNS_FLOAT32;
-    for (dim_idx = 0; dim_idx < NNS_TENSOR_RANK_LIMIT; dim_idx++) {
-      info[info_idx].dimension[dim_idx] = 1;
-    }
+    info[info_idx].dimension[0] = 1;
     info[info_idx].dimension[1] = tensor_src_iio->buffer_capacity;
     info_idx += 1;
   }

diff --git a/tests/nnstreamer_source/unittest_src_iio.cc b/tests/nnstreamer_source/unittest_src_iio.cc
index 3e83a8e..c75b143 100644 (file)
--- a/tests/nnstreamer_source/unittest_src_iio.cc
+++ b/tests/nnstreamer_source/unittest_src_iio.cc
@@ -1290,8 +1290,7 @@ TEST (testTensorSrcIio, dataVerifyTrigger)
   EXPECT_EQ (config.info.info[0].type, _NNS_FLOAT32);
   EXPECT_EQ (config.info.info[0].dimension[0], (guint) num_scan_elements);
   EXPECT_EQ (config.info.info[0].dimension[1], 1U);
-  EXPECT_EQ (config.info.info[0].dimension[2], 1U);
-  EXPECT_EQ (config.info.info[0].dimension[3], 1U);
+  EXPECT_EQ (config.info.info[0].dimension[2], 0U);
 
   gst_object_unref (src_iio);
   gst_object_unref (src_pad);
@@ -1373,8 +1372,7 @@ TEST (testTensorSrcIio, dataVerifyCustomChannels)
   EXPECT_EQ (config.info.info[0].type, _NNS_FLOAT32);
   EXPECT_EQ (config.info.info[0].dimension[0], 2U);
   EXPECT_EQ (config.info.info[0].dimension[1], 1U);
-  EXPECT_EQ (config.info.info[0].dimension[2], 1U);
-  EXPECT_EQ (config.info.info[0].dimension[3], 1U);
+  EXPECT_EQ (config.info.info[0].dimension[2], 0U);
 
   gst_object_unref (src_iio);
   gst_object_unref (src_pad);
@@ -1478,14 +1476,7 @@ TEST (testTensorSrcIio, dataVerifyFreqGenericType)
     EXPECT_EQ (config.info.info[idx].type, _NNS_FLOAT32);
     EXPECT_EQ (config.info.info[idx].dimension[0], 1U);
     EXPECT_EQ (config.info.info[idx].dimension[1], 1U);
-    EXPECT_EQ (config.info.info[idx].dimension[2], 1U);
-    EXPECT_EQ (config.info.info[idx].dimension[3], 1U);
-  }
-  for (int idx = num_scan_elements; idx < NNS_TENSOR_SIZE_LIMIT; idx++) {
-    EXPECT_EQ (config.info.info[idx].dimension[0], 0U);
-    EXPECT_EQ (config.info.info[idx].dimension[1], 0U);
     EXPECT_EQ (config.info.info[idx].dimension[2], 0U);
-    EXPECT_EQ (config.info.info[idx].dimension[3], 0U);
   }
 
   gst_object_unref (src_iio);