[Common] add init-config

Before updating tensor config, initialize config struct.

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

diff --git a/gst/nnstreamer/tensor_aggregator/tensor_aggregator.c b/gst/nnstreamer/tensor_aggregator/tensor_aggregator.c
index db47ab3..3e8c405 100644 (file)
--- a/gst/nnstreamer/tensor_aggregator/tensor_aggregator.c
+++ b/gst/nnstreamer/tensor_aggregator/tensor_aggregator.c
@@ -992,17 +992,17 @@ gst_tensor_aggregator_query_caps (GstTensorAggregator * self, GstPad * pad,
     GstCaps * filter)
 {
   GstCaps *caps;
-  GstTensorConfig config;
+  GstTensorConfig *config;
 
   /* tensor config info for given pad */
   if (pad == self->sinkpad) {
-    config = self->in_config;
+    config = &self->in_config;
   } else {
-    config = self->out_config;
+    config = &self->out_config;
   }
 
   /* caps from tensor config info */
-  caps = gst_tensor_caps_from_config (&config);
+  caps = gst_tensor_caps_from_config (config);
 
   silent_debug_caps (caps, "caps");
   silent_debug_caps (filter, "filter");

diff --git a/gst/nnstreamer/tensor_common.c b/gst/nnstreamer/tensor_common.c
index b4e2219..ffa36e1 100644 (file)
--- a/gst/nnstreamer/tensor_common.c
+++ b/gst/nnstreamer/tensor_common.c
@@ -907,9 +907,12 @@ gst_tensors_get_caps (GstPad * pad, const GstTensorsConfig * config)
 
   if (config->info.num_tensors == 1 && gst_pad_peer_has_tensor_caps (pad)) {
     GstTensorConfig tensor_config;
+
+    gst_tensor_config_init (&tensor_config);
     tensor_config.info = config->info.info[0];
     tensor_config.rate_n = config->rate_n;
     tensor_config.rate_d = config->rate_d;
+
     caps = gst_tensor_caps_from_config (&tensor_config);
   } else {
     caps = gst_tensors_caps_from_config (config);

diff --git a/gst/nnstreamer/tensor_merge/gsttensormerge.c b/gst/nnstreamer/tensor_merge/gsttensormerge.c
index 7b36ed3..d1a808e 100644 (file)
--- a/gst/nnstreamer/tensor_merge/gsttensormerge.c
+++ b/gst/nnstreamer/tensor_merge/gsttensormerge.c
@@ -375,12 +375,15 @@ gst_tensor_merge_sink_event (GstCollectPads * pads, GstCollectData * data,
  */
 static gboolean
 gst_tensor_merge_get_merged_config (GstTensorMerge * tensor_merge,
-    GstTensorsConfig * configs, GstTensorConfig * config)
+    const GstTensorsConfig * configs, GstTensorConfig * config)
 {
   gboolean ret = FALSE;
   int i, j;
   tensor_dim dim;
   tensor_type type;
+
+  gst_tensor_config_init (config);
+
   type = configs->info.info[0].type;
   memcpy (&dim, &configs->info.info[0].dimension, sizeof (tensor_dim));
 

diff --git a/gst/nnstreamer/tensor_source/tensor_src_iio.c b/gst/nnstreamer/tensor_source/tensor_src_iio.c
index daa3ce6..a8b61fd 100644 (file)
--- a/gst/nnstreamer/tensor_source/tensor_src_iio.c
+++ b/gst/nnstreamer/tensor_source/tensor_src_iio.c
@@ -1558,6 +1558,7 @@ gst_tensor_src_iio_create_config (GstTensorSrcIIO * tensor_src_iio)
   }
 
   /** compile tensor info data */
+  gst_tensor_info_init (info);
   for (list = tensor_src_iio->channels; list != NULL; list = list->next) {
     channel_prop = (GstTensorSrcIIOChannelProperties *) list->data;
     if (!channel_prop->enabled)
@@ -2208,6 +2209,8 @@ gst_tensor_src_iio_fixate (GstBaseSrc * src, GstCaps * caps)
 
   if (self->is_tensor) {
     GstTensorConfig tensor_config;
+
+    gst_tensor_config_init (&tensor_config);
     gst_tensor_info_copy (&tensor_config.info,
         &(self->tensors_config->info.info[0]));
     tensor_config.rate_n = self->tensors_config->rate_n;

diff --git a/tests/nnstreamer_plugins/unittest_plugins.cc b/tests/nnstreamer_plugins/unittest_plugins.cc
index e618019..cfc76b6 100644 (file)
--- a/tests/nnstreamer_plugins/unittest_plugins.cc
+++ b/tests/nnstreamer_plugins/unittest_plugins.cc
@@ -75,6 +75,7 @@
     g_object_set (h->element, "mode", GTT_TYPECAST, "option", str_to_t, NULL); \
     g_object_set (h->element, "acceleration", (gboolean)accel, NULL);          \
     /** input tensor info */                                                   \
+    gst_tensor_config_init (&config);                                          \
     config.info.type = from_nns_t;                                             \
     gst_tensor_parse_dimension (str (size), config.info.dimension);            \
     config.rate_n = 0;                                                         \
@@ -1095,6 +1096,7 @@ TEST (testTensorTransform, arithmetic1)
   g_object_set (h->element, "acceleration", (gboolean)FALSE, NULL);
 
   /* input tensor info */
+  gst_tensor_config_init (&config);
   config.info.type = _NNS_FLOAT32;
   gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
@@ -1165,6 +1167,7 @@ TEST (testTensorTransform, arithmetic1Accel)
   g_object_set (h->element, "acceleration", (gboolean)TRUE, NULL);
 
   /* input tensor info */
+  gst_tensor_config_init (&config);
   config.info.type = _NNS_FLOAT32;
   gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
@@ -1235,6 +1238,7 @@ TEST (testTensorTransform, arithmetic2)
   g_object_set (h->element, "acceleration", (gboolean)FALSE, NULL);
 
   /* input tensor info */
+  gst_tensor_config_init (&config);
   config.info.type = _NNS_FLOAT64;
   gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
@@ -1305,6 +1309,7 @@ TEST (testTensorTransform, arithmetic2Accel)
   g_object_set (h->element, "acceleration", (gboolean)TRUE, NULL);
 
   /* input tensor info */
+  gst_tensor_config_init (&config);
   config.info.type = _NNS_FLOAT64;
   gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
@@ -1376,6 +1381,7 @@ TEST (testTensorTransform, arithmetic3)
   g_object_set (h->element, "acceleration", (gboolean)FALSE, NULL);
 
   /* input tensor info */
+  gst_tensor_config_init (&config);
   config.info.type = _NNS_UINT8;
   gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
@@ -1450,6 +1456,7 @@ TEST (testTensorTransform, arithmetic3Accel)
   g_object_set (h->element, "acceleration", (gboolean)TRUE, NULL);
 
   /* input tensor info */
+  gst_tensor_config_init (&config);
   config.info.type = _NNS_UINT8;
   gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
@@ -1524,6 +1531,7 @@ TEST (testTensorTransform, arithmetic4)
   g_object_set (h->element, "acceleration", (gboolean)FALSE, NULL);
 
   /* input tensor info */
+  gst_tensor_config_init (&config);
   config.info.type = _NNS_UINT8;
   gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
@@ -1598,6 +1606,7 @@ TEST (testTensorTransform, arithmetic4Accel)
   g_object_set (h->element, "acceleration", (gboolean)TRUE, NULL);
 
   /* input tensor info */
+  gst_tensor_config_init (&config);
   config.info.type = _NNS_UINT8;
   gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
@@ -1672,6 +1681,7 @@ TEST (testTensorTransform, arithmetic5)
   g_object_set (h->element, "acceleration", (gboolean)FALSE, NULL);
 
   /* input tensor info */
+  gst_tensor_config_init (&config);
   config.info.type = _NNS_UINT8;
   gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
@@ -1746,6 +1756,7 @@ TEST (testTensorTransform, arithmetic5Accel)
   g_object_set (h->element, "acceleration", (gboolean)TRUE, NULL);
 
   /* input tensor info */
+  gst_tensor_config_init (&config);
   config.info.type = _NNS_UINT8;
   gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
@@ -1817,6 +1828,7 @@ TEST (testTensorTransform, arithmeticChangeOptionString)
   g_object_set (h->element, "acceleration", (gboolean)FALSE, NULL);
 
   /* input tensor info */
+  gst_tensor_config_init (&config);
   config.info.type = _NNS_FLOAT32;
   gst_tensor_parse_dimension ("5", config.info.dimension);
   config.rate_n = 0;
@@ -1992,6 +2004,7 @@ TEST (testTensorAggregator, aggregate1)
   g_object_set (h->element, "frames-out", 2, "frames-dim", 3, NULL);
 
   /* input tensor info */
+  gst_tensor_config_init (&config);
   config.info.type = _NNS_INT32;
   gst_tensor_parse_dimension ("3:4:2:2", config.info.dimension);
   config.rate_n = 0;
@@ -2066,6 +2079,7 @@ TEST (testTensorAggregator, aggregate2)
   g_object_set (h->element, "frames-out", 2, "frames-dim", 2, NULL);
 
   /* input tensor info */
+  gst_tensor_config_init (&config);
   config.info.type = _NNS_INT32;
   gst_tensor_parse_dimension ("3:4:2:2", config.info.dimension);
   config.rate_n = 0;
@@ -2140,6 +2154,7 @@ TEST (testTensorAggregator, aggregate3)
   g_object_set (h->element, "frames-out", 2, "frames-dim", 1, NULL);
 
   /* input tensor info */
+  gst_tensor_config_init (&config);
   config.info.type = _NNS_INT32;
   gst_tensor_parse_dimension ("3:4:2:2", config.info.dimension);
   config.rate_n = 0;
@@ -2214,6 +2229,7 @@ TEST (testTensorAggregator, aggregate4)
   g_object_set (h->element, "frames-out", 2, "frames-dim", 0, NULL);
 
   /* input tensor info */
+  gst_tensor_config_init (&config);
   config.info.type = _NNS_INT32;
   gst_tensor_parse_dimension ("3:4:2:2", config.info.dimension);
   config.rate_n = 0;
@@ -2288,6 +2304,7 @@ TEST (testTensorAggregator, aggregate5)
   g_object_set (h->element, "concat", (gboolean)FALSE, NULL);
 
   /* in/out tensor info */
+  gst_tensor_config_init (&config);
   config.info.type = _NNS_INT32;
   gst_tensor_parse_dimension ("3:4:2:2", config.info.dimension);
   config.rate_n = 0;
@@ -4263,6 +4280,7 @@ TEST_REQUIRE_TFLITE (test_tensor_filter, reopen_tflite_01_p)
   g_free (str_launch_line);
 
   /* input tensor info */
+  gst_tensor_config_init (&config);
   config.info.type = _NNS_UINT8;
   gst_tensor_parse_dimension ("3:224:224:1", config.info.dimension);
   config.rate_n = 0;
@@ -4395,6 +4413,7 @@ TEST_REQUIRE_TFLITE (test_tensor_filter, reload_tflite_set_property)
   g_free (str_launch_line);
 
   /* input tensor info */
+  gst_tensor_config_init (&config);
   config.info.type = _NNS_UINT8;
   gst_tensor_parse_dimension ("3:224:224:1", config.info.dimension);
   config.rate_n = 0;