[Repo] move repo sources into one directory

tensor-repo is not a common header and can be built only in repo directory.
Move files about tensor-repo into tensor_repo directory and clean up sources.

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

diff --git a/gst/nnstreamer/meson.build b/gst/nnstreamer/meson.build
index 5b436a7..6c0ceea 100644 (file)
--- a/gst/nnstreamer/meson.build
+++ b/gst/nnstreamer/meson.build
@@ -27,8 +27,7 @@ nnst_common_sources = [
   'nnstreamer.c',
   'nnstreamer_conf.c',
   'nnstreamer_subplugin.c',
-  'tensor_common.c',
-  'tensor_repo.c'
+  'tensor_common.c'
 ]
 
 foreach s : nnst_common_sources
@@ -61,8 +60,7 @@ nnst_plugins = [
   'tensor_split',
   'tensor_transform',
   'tensor_filter',
-  'tensor_reposrc',
-  'tensor_reposink'
+  'tensor_repo'
 ]
 
 foreach p : nnst_plugins

diff --git a/gst/nnstreamer/nnstreamer.c b/gst/nnstreamer/nnstreamer.c
index 6ebf7ca..5dda363 100644 (file)
--- a/gst/nnstreamer/nnstreamer.c
+++ b/gst/nnstreamer/nnstreamer.c
@@ -54,8 +54,8 @@
 #include "tensor_filter/tensor_filter.h"
 #include "tensor_merge/gsttensormerge.h"
 #include "tensor_mux/gsttensormux.h"
-#include "tensor_reposink/tensor_reposink.h"
-#include "tensor_reposrc/tensor_reposrc.h"
+#include "tensor_repo/tensor_reposink.h"
+#include "tensor_repo/tensor_reposrc.h"
 #include "tensor_sink/tensor_sink.h"
 #include "tensor_source/tensor_src_iio.h"
 #include "tensor_split/gsttensorsplit.h"

diff --git a/gst/nnstreamer/tensor_reposrc/meson.build b/gst/nnstreamer/tensor_repo/meson.build
similarity index 50%
rename from gst/nnstreamer/tensor_reposrc/meson.build
rename to gst/nnstreamer/tensor_repo/meson.build
index d2ceb85..426fef2 100644 (file)
--- a/gst/nnstreamer/tensor_reposrc/meson.build
+++ b/gst/nnstreamer/tensor_repo/meson.build
@@ -1,7 +1,9 @@
-tensor_reposrc_sources = [
+tensor_repo_sources = [
+  'tensor_repo.c',
+  'tensor_reposink.c',
   'tensor_reposrc.c'
 ]
 
-foreach s : tensor_reposrc_sources
+foreach s : tensor_repo_sources
   nnstreamer_sources += join_paths(meson.current_source_dir(), s)
 endforeach

diff --git a/gst/nnstreamer/tensor_repo.c b/gst/nnstreamer/tensor_repo/tensor_repo.c
similarity index 100%
rename from gst/nnstreamer/tensor_repo.c
rename to gst/nnstreamer/tensor_repo/tensor_repo.c

diff --git a/gst/nnstreamer/tensor_repo.h b/gst/nnstreamer/tensor_repo/tensor_repo.h
similarity index 100%
rename from gst/nnstreamer/tensor_repo.h
rename to gst/nnstreamer/tensor_repo/tensor_repo.h

diff --git a/gst/nnstreamer/tensor_reposink/tensor_reposink.c b/gst/nnstreamer/tensor_repo/tensor_reposink.c
similarity index 97%
rename from gst/nnstreamer/tensor_reposink/tensor_reposink.c
rename to gst/nnstreamer/tensor_repo/tensor_reposink.c
index 1177cd5..beea302 100644 (file)
--- a/gst/nnstreamer/tensor_reposink/tensor_reposink.c
+++ b/gst/nnstreamer/tensor_repo/tensor_reposink.c
@@ -83,7 +83,6 @@ static gboolean gst_tensor_reposink_set_caps (GstBaseSink * sink,
 static GstCaps *gst_tensor_reposink_get_caps (GstBaseSink * sink,
     GstCaps * filter);
 
-
 #define gst_tensor_reposink_parent_class parent_class
 G_DEFINE_TYPE (GstTensorRepoSink, gst_tensor_reposink, GST_TYPE_BASE_SINK);
 
@@ -148,6 +147,7 @@ static void
 gst_tensor_reposink_init (GstTensorRepoSink * self)
 {
   GstBaseSink *basesink;
+
   basesink = GST_BASE_SINK (self);
 
   gst_tensor_repo_init ();
@@ -171,6 +171,7 @@ gst_tensor_reposink_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec)
 {
   GstTensorRepoSink *self;
+
   self = GST_TENSOR_REPOSINK (object);
 
   switch (prop_id) {
@@ -183,14 +184,16 @@ gst_tensor_reposink_set_property (GObject * object, guint prop_id,
     case PROP_SLOT:
       self->o_myid = self->myid;
       self->myid = g_value_get_uint (value);
+
       gst_tensor_repo_add_repodata (self->myid, TRUE);
+
       if (!self->set_startid) {
         self->o_myid = self->myid;
         self->set_startid = TRUE;
       }
+
       if (self->o_myid != self->myid)
         gst_tensor_repo_set_changed (self->o_myid, self->myid, TRUE);
-
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -206,7 +209,9 @@ gst_tensor_reposink_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec)
 {
   GstTensorRepoSink *self;
+
   self = GST_TENSOR_REPOSINK (object);
+
   switch (prop_id) {
     case PROP_SIGNAL_RATE:
       g_value_set_uint (value, self->signal_rate);
@@ -230,7 +235,9 @@ static void
 gst_tensor_reposink_dispose (GObject * object)
 {
   GstTensorRepoSink *self;
+
   self = GST_TENSOR_REPOSINK (object);
+
   if (self->in_caps)
     gst_caps_unref (self->in_caps);
 
@@ -275,10 +282,10 @@ gst_tensor_reposink_event (GstBaseSink * sink, GstEvent * event)
     case GST_EVENT_EOS:
       gst_tensor_repo_set_eos (self->myid);
       break;
-
     default:
       break;
   }
+
   return GST_BASE_SINK_CLASS (parent_class)->event (sink, event);
 }
 
@@ -296,12 +303,12 @@ gst_tensor_reposink_query (GstBaseSink * sink, GstQuery * query)
   type = GST_QUERY_TYPE (query);
 
   GST_DEBUG_OBJECT (self, "received query %s", GST_QUERY_TYPE_NAME (query));
+
   switch (type) {
     case GST_QUERY_SEEKING:
       gst_query_parse_seeking (query, &format, NULL, NULL, NULL);
       gst_query_set_seeking (query, format, FALSE, 0, -1);
       return TRUE;
-
     default:
       break;
   }
@@ -309,7 +316,6 @@ gst_tensor_reposink_query (GstBaseSink * sink, GstQuery * query)
   return GST_BASE_SINK_CLASS (parent_class)->query (sink, query);
 }
 
-
 /**
  * @brief Push GstBuffer
  */
@@ -326,14 +332,18 @@ gst_tensor_reposink_render_buffer (GstTensorRepoSink * self, GstBuffer * buffer)
   if (signal_rate) {
     GstClock *clock;
     GstClockTime render_time;
+
     clock = gst_element_get_clock (GST_ELEMENT (self));
 
     if (clock) {
       now = gst_clock_get_time (clock);
       render_time = (1000 / signal_rate) * GST_MSECOND + self->last_render_time;
+
       if (!GST_CLOCK_TIME_IS_VALID (self->last_render_time) ||
-          GST_CLOCK_DIFF (now, render_time) <= 0)
+          GST_CLOCK_DIFF (now, render_time) <= 0) {
         notify = TRUE;
+      }
+
       gst_object_unref (clock);
     }
   } else {
@@ -341,14 +351,13 @@ gst_tensor_reposink_render_buffer (GstTensorRepoSink * self, GstBuffer * buffer)
   }
 
   if (notify) {
-    gboolean ret = FALSE;
     self->last_render_time = now;
-    ret =
-        gst_tensor_repo_set_buffer (self->myid, self->o_myid, buffer,
-        self->in_caps);
-    if (!ret)
+
+    if (!gst_tensor_repo_set_buffer (self->myid, self->o_myid, buffer,
+            self->in_caps)) {
       GST_ELEMENT_ERROR (self, RESOURCE, WRITE,
           ("Cannot Set buffer into repo [key: %d]", self->myid), NULL);
+    }
   }
 }
 
@@ -359,8 +368,8 @@ static GstFlowReturn
 gst_tensor_reposink_render (GstBaseSink * sink, GstBuffer * buffer)
 {
   GstTensorRepoSink *self;
-  self = GST_TENSOR_REPOSINK (sink);
 
+  self = GST_TENSOR_REPOSINK (sink);
 
   gst_tensor_reposink_render_buffer (self, buffer);
   return GST_FLOW_OK;
@@ -400,15 +409,18 @@ gst_tensor_reposink_set_caps (GstBaseSink * sink, GstCaps * caps)
   self = GST_TENSOR_REPOSINK (sink);
   gst_caps_replace (&self->in_caps, caps);
 
+  /* debug print caps */
   if (!self->silent) {
+    GstStructure *structure;
+    gchar *str;
     guint caps_size, i;
 
     caps_size = gst_caps_get_size (caps);
     GST_DEBUG_OBJECT (self, "set caps, size is %d", caps_size);
 
     for (i = 0; i < caps_size; i++) {
-      GstStructure *structure = gst_caps_get_structure (caps, i);
-      gchar *str = gst_structure_to_string (structure);
+      structure = gst_caps_get_structure (caps, i);
+      str = gst_structure_to_string (structure);
 
       GST_DEBUG_OBJECT (self, "[%d] %s", i, str);
       g_free (str);

diff --git a/gst/nnstreamer/tensor_reposink/tensor_reposink.h b/gst/nnstreamer/tensor_repo/tensor_reposink.h
similarity index 100%
rename from gst/nnstreamer/tensor_reposink/tensor_reposink.h
rename to gst/nnstreamer/tensor_repo/tensor_reposink.h

diff --git a/gst/nnstreamer/tensor_reposrc/tensor_reposrc.c b/gst/nnstreamer/tensor_repo/tensor_reposrc.c
similarity index 97%
rename from gst/nnstreamer/tensor_reposrc/tensor_reposrc.c
rename to gst/nnstreamer/tensor_repo/tensor_reposrc.c
index 26ff0ca..bf84730 100644 (file)
--- a/gst/nnstreamer/tensor_reposrc/tensor_reposrc.c
+++ b/gst/nnstreamer/tensor_repo/tensor_reposrc.c
@@ -90,6 +90,7 @@ gst_tensor_reposrc_class_init (GstTensorRepoSrcClass * klass)
 
   gobject_class->set_property = gst_tensor_reposrc_set_property;
   gobject_class->get_property = gst_tensor_reposrc_get_property;
+  gobject_class->dispose = gst_tensor_reposrc_dispose;
 
   g_object_class_install_property (gobject_class, PROP_CAPS,
       g_param_spec_boxed ("caps", "Caps",
@@ -105,8 +106,6 @@ gst_tensor_reposrc_class_init (GstTensorRepoSrcClass * klass)
           0, UINT_MAX, DEFAULT_INDEX,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
-  gobject_class->dispose = gst_tensor_reposrc_dispose;
-
   basesrc_class->get_caps = gst_tensor_reposrc_getcaps;
   pushsrc_class->create = gst_tensor_reposrc_create;
 
@@ -139,11 +138,9 @@ gst_tensor_reposrc_init (GstTensorRepoSrc * self)
 static void
 gst_tensor_reposrc_dispose (GObject * object)
 {
-  gboolean ret;
   GstTensorRepoSrc *self = GST_TENSOR_REPOSRC (object);
 
-  ret = gst_tensor_repo_remove_repodata (self->myid);
-  if (!ret)
+  if (!gst_tensor_repo_remove_repodata (self->myid))
     GST_ELEMENT_ERROR (self, RESOURCE, WRITE,
         ("Cannot remove [key: %d] in repo", self->myid), NULL);
 
@@ -159,16 +156,15 @@ gst_tensor_reposrc_dispose (GObject * object)
 static GstCaps *
 gst_tensor_reposrc_getcaps (GstBaseSrc * src, GstCaps * filter)
 {
-  GstCaps *cap, *check, *result;
   GstTensorRepoSrc *self = GST_TENSOR_REPOSRC (src);
+  GstCaps *cap, *check, *result;
   GstStructure *st = NULL;
 
   GST_DEBUG_OBJECT (self, "returning %" GST_PTR_FORMAT, self->caps);
 
   if (self->caps) {
     if (filter) {
-      cap =
-          gst_caps_intersect_full (filter, self->caps,
+      cap = gst_caps_intersect_full (filter, self->caps,
           GST_CAPS_INTERSECT_FIRST);
     } else
       cap = gst_caps_ref (self->caps);
@@ -202,7 +198,6 @@ static void
 gst_tensor_reposrc_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec)
 {
-
   GstTensorRepoSrc *self = GST_TENSOR_REPOSRC (object);
 
   switch (prop_id) {
@@ -220,9 +215,9 @@ gst_tensor_reposrc_set_property (GObject * object, guint prop_id,
         self->o_myid = self->myid;
         self->set_startid = TRUE;
       }
+
       if (self->o_myid != self->myid)
         gst_tensor_repo_set_changed (self->o_myid, self->myid, FALSE);
-
       break;
     case PROP_CAPS:
     {
@@ -249,8 +244,8 @@ gst_tensor_reposrc_set_property (GObject * object, guint prop_id,
         self->fps_d = -1;
       }
       self->negotiation = FALSE;
-    }
       break;
+    }
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -289,20 +284,25 @@ static GstBuffer *
 gst_tensor_reposrc_gen_dummy_buffer (GstTensorRepoSrc * self)
 {
   GstBuffer *buf = NULL;
-  int i;
-  guint num_tensors = self->config.info.num_tensors;
+  GstMemory *mem;
+  GstMapInfo info;
+  guint i, num_tensors;
   gsize size = 0;
+
   buf = gst_buffer_new ();
+  num_tensors = self->config.info.num_tensors;
+
   for (i = 0; i < num_tensors; i++) {
-    GstMemory *mem;
-    GstMapInfo info;
     size = gst_tensor_info_get_size (&self->config.info.info[i]);
     mem = gst_allocator_alloc (NULL, size, NULL);
+
     gst_memory_map (mem, &info, GST_MAP_WRITE);
     memset (info.data, 0, size);
     gst_memory_unmap (mem, &info);
+
     gst_buffer_append_memory (buf, mem);
   }
+
   return buf;
 }
 
@@ -328,6 +328,7 @@ gst_tensor_reposrc_create (GstPushSrc * src, GstBuffer ** buffer)
     while (!buf && !eos) {
       buf = gst_tensor_repo_get_buffer (self->myid, self->o_myid, &eos, &newid);
     }
+
     if (eos)
       return GST_FLOW_EOS;
 
@@ -343,22 +344,23 @@ gst_tensor_reposrc_create (GstPushSrc * src, GstBuffer ** buffer)
       if (!gst_caps_can_intersect (self->caps, meta->caps)) {
         GST_ELEMENT_ERROR (GST_ELEMENT (self), CORE, NEGOTIATION,
             ("Negotiation Failed! : repo_sink & repos_src"), (NULL));
+
         if (!gst_buffer_remove_meta (buf, (GstMeta *) meta)) {
           GST_ELEMENT_ERROR (GST_ELEMENT (self), RESOURCE, WRITE,
               ("Cannot remove meta from buffer!"), (NULL));
         }
+
         gst_buffer_unref (buf);
         gst_tensor_repo_set_eos (self->myid);
         return GST_FLOW_EOS;
       }
 
       self->negotiation = TRUE;
-
     }
+
     gst_buffer_remove_meta (buf, (GstMeta *) meta);
   }
 
   *buffer = buf;
-
   return GST_FLOW_OK;
 }

diff --git a/gst/nnstreamer/tensor_reposrc/tensor_reposrc.h b/gst/nnstreamer/tensor_repo/tensor_reposrc.h
similarity index 100%
rename from gst/nnstreamer/tensor_reposrc/tensor_reposrc.h
rename to gst/nnstreamer/tensor_repo/tensor_reposrc.h

diff --git a/gst/nnstreamer/tensor_reposink/meson.build b/gst/nnstreamer/tensor_reposink/meson.build
deleted file mode 100644 (file)
index 5abc20d..0000000
--- a/gst/nnstreamer/tensor_reposink/meson.build
+++ /dev/null
@@ -1,7 +0,0 @@
-tensor_reposink_sources = [
-  'tensor_reposink.c'
-]
-
-foreach s : tensor_reposink_sources
-  nnstreamer_sources += join_paths(meson.current_source_dir(), s)
-endforeach

diff --git a/jni/nnstreamer.mk b/jni/nnstreamer.mk
index 9225333..0b0b634 100644 (file)
--- a/jni/nnstreamer.mk
+++ b/jni/nnstreamer.mk
@@ -18,8 +18,7 @@ NNSTREAMER_COMMON_SRCS := \
     $(NNSTREAMER_GST_HOME)/nnstreamer.c \
     $(NNSTREAMER_GST_HOME)/nnstreamer_conf.c \
     $(NNSTREAMER_GST_HOME)/nnstreamer_subplugin.c \
-    $(NNSTREAMER_GST_HOME)/tensor_common.c \
-    $(NNSTREAMER_GST_HOME)/tensor_repo.c
+    $(NNSTREAMER_GST_HOME)/tensor_common.c
 
 # nnstreamer plugins
 NNSTREAMER_PLUGINS_SRCS := \
@@ -31,8 +30,9 @@ NNSTREAMER_PLUGINS_SRCS := \
     $(NNSTREAMER_GST_HOME)/tensor_filter/tensor_filter_custom.c \
     $(NNSTREAMER_GST_HOME)/tensor_merge/gsttensormerge.c \
     $(NNSTREAMER_GST_HOME)/tensor_mux/gsttensormux.c \
-    $(NNSTREAMER_GST_HOME)/tensor_reposink/tensor_reposink.c \
-    $(NNSTREAMER_GST_HOME)/tensor_reposrc/tensor_reposrc.c \
+    $(NNSTREAMER_GST_HOME)/tensor_repo/tensor_repo.c \
+    $(NNSTREAMER_GST_HOME)/tensor_repo/tensor_reposink.c \
+    $(NNSTREAMER_GST_HOME)/tensor_repo/tensor_reposrc.c \
     $(NNSTREAMER_GST_HOME)/tensor_sink/tensor_sink.c \
     $(NNSTREAMER_GST_HOME)/tensor_source/tensor_src_iio.c \
     $(NNSTREAMER_GST_HOME)/tensor_split/gsttensorsplit.c \