[aggregator/converter] Fix when GST_EVENT_FLUSH_*

- Do not reset tensor config when flush event occurs, just clear the buffers

Signed-off-by: Yongjoo Ahn <yongjoo1.ahn@samsung.com>

diff --git a/gst/nnstreamer/tensor_aggregator/tensor_aggregator.c b/gst/nnstreamer/tensor_aggregator/tensor_aggregator.c
index 3e1e175..0e6f710 100644 (file)
--- a/gst/nnstreamer/tensor_aggregator/tensor_aggregator.c
+++ b/gst/nnstreamer/tensor_aggregator/tensor_aggregator.c
@@ -292,6 +292,10 @@ gst_tensor_aggregator_init (GstTensorAggregator * self)
   self->frames_dim = DEFAULT_FRAMES_DIMENSION;
   self->concat = DEFAULT_CONCAT;
 
+  self->tensor_configured = FALSE;
+  gst_tensor_config_init (&self->in_config);
+  gst_tensor_config_init (&self->out_config);
+
   self->adapter = gst_adapter_new ();
   gst_tensor_aggregator_reset (self);
 }
@@ -308,6 +312,9 @@ gst_tensor_aggregator_finalize (GObject * object)
 
   gst_tensor_aggregator_reset (self);
 
+  gst_tensor_info_free (&self->in_config.info);
+  gst_tensor_info_free (&self->out_config.info);
+
   if (self->adapter) {
     g_object_unref (self->adapter);
     self->adapter = NULL;
@@ -971,13 +978,10 @@ gst_tensor_aggregator_change_state (GstElement * element,
 static void
 gst_tensor_aggregator_reset (GstTensorAggregator * self)
 {
+  /* remove all buffers from adapter */
   if (self->adapter) {
     gst_adapter_clear (self->adapter);
   }
-
-  self->tensor_configured = FALSE;
-  gst_tensor_config_init (&self->in_config);
-  gst_tensor_config_init (&self->out_config);
 }
 
 /**

diff --git a/gst/nnstreamer/tensor_converter/tensor_converter.c b/gst/nnstreamer/tensor_converter/tensor_converter.c
index ea37f9c..fb948b4 100644 (file)
--- a/gst/nnstreamer/tensor_converter/tensor_converter.c
+++ b/gst/nnstreamer/tensor_converter/tensor_converter.c
@@ -371,9 +371,10 @@ gst_tensor_converter_init (GstTensorConverter * self)
   self->custom.data = NULL;
 
   gst_tensors_info_init (&self->tensors_info);
+  gst_tensors_config_init (&self->tensors_config);
+  self->tensors_configured = FALSE;
 
   self->adapter = gst_adapter_new ();
-  g_assert (self->adapter != NULL);
   gst_tensor_converter_reset (self);
 }
 
@@ -389,6 +390,9 @@ gst_tensor_converter_finalize (GObject * object)
 
   gst_tensor_converter_reset (self);
 
+  gst_tensors_info_free (&self->tensors_config.info);
+  gst_tensors_info_free (&self->tensors_info);
+
   if (self->adapter) {
     g_object_unref (self->adapter);
     self->adapter = NULL;
@@ -1153,14 +1157,11 @@ gst_tensor_converter_change_state (GstElement * element,
 static void
 gst_tensor_converter_reset (GstTensorConverter * self)
 {
+  /* remove all buffers from adapter */
   if (self->adapter) {
     gst_adapter_clear (self->adapter);
   }
 
-  self->tensors_configured = FALSE;
-  gst_tensors_info_free (&self->tensors_config.info);
-  gst_tensors_config_init (&self->tensors_config);
-
   self->have_segment = FALSE;
   self->need_segment = FALSE;
   gst_segment_init (&self->segment, GST_FORMAT_TIME);