[Repo] Change GstTensorData to GstTensorRepoData

In order not to confuse, change the name GstTensorData to
GstTensorRepoData.

**Self evaluation:**
1. Build test:	 [X]Passed [ ]Failed [ ]Skipped
2. Run test:	 [X]Passed [ ]Failed [ ]Skipped

Signed-off-by: jijoong.moon <jijoong.moon@samsung.com>

diff --git a/gst/nnstreamer/tensor_repo.c b/gst/nnstreamer/tensor_repo.c
index 55e020f..aba6d3c 100644 (file)
--- a/gst/nnstreamer/tensor_repo.c
+++ b/gst/nnstreamer/tensor_repo.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 
 #ifndef DBG
-#define DBG TRUE
+#define DBG FALSE
 #endif
 
 #define _print_log(...) if (DBG) g_message(__VA_ARGS__)
@@ -38,26 +38,26 @@
 GstTensorRepo _repo = {.num_data = 0,.initialized = FALSE };
 
 /**
- * @brief getter to get nth GstTensorData
+ * @brief getter to get nth GstTensorRepoData
  */
-GstTensorData *
-gst_tensor_repo_get_tensor (guint nth)
+GstTensorRepoData *
+gst_tensor_repo_get_repodata (guint nth)
 {
-  GstTensorData *data;
+  GstTensorRepoData *data;
   gpointer *p = g_hash_table_lookup (_repo.hash, GINT_TO_POINTER (nth));
-  data = (GstTensorData *) p;
+  data = (GstTensorRepoData *) p;
   g_return_val_if_fail (data != NULL, NULL);
   return data;
 }
 
 /**
- * @brief add GstTensorData into repo
+ * @brief add GstTensorRepoData into repo
  */
 gboolean
-gst_tensor_repo_add_data (guint nth)
+gst_tensor_repo_add_repodata (guint nth)
 {
   gboolean ret = FALSE;
-  GstTensorData *new;
+  GstTensorRepoData *new;
 
   GST_REPO_LOCK ();
   gpointer *check = g_hash_table_lookup (_repo.hash, GINT_TO_POINTER (nth));
@@ -66,7 +66,7 @@ gst_tensor_repo_add_data (guint nth)
     return TRUE;
   }
 
-  new = g_new (GstTensorData, 1);
+  new = g_new (GstTensorRepoData, 1);
   new->eos = FALSE;
   new->buffer = NULL;
   g_cond_init (&new->cond);
@@ -90,7 +90,7 @@ gst_tensor_repo_set_buffer (guint nth, GstBuffer * buffer)
 {
   GST_TENSOR_REPO_LOCK (nth);
 
-  GstTensorData *data = gst_tensor_repo_get_tensor (nth);
+  GstTensorRepoData *data = gst_tensor_repo_get_repodata (nth);
   g_return_val_if_fail (data != NULL, FALSE);
 
   data->buffer = buffer;
@@ -108,7 +108,7 @@ gst_tensor_repo_set_buffer (guint nth, GstBuffer * buffer)
 gboolean
 gst_tensor_repo_check_eos (guint nth)
 {
-  GstTensorData *data = gst_tensor_repo_get_tensor (nth);
+  GstTensorRepoData *data = gst_tensor_repo_get_repodata (nth);
   if (data == NULL || data->eos) {
     _print_log ("check eos done [%s]\n", data->eos ? "TRUE" : "FALSE");
   }
@@ -122,7 +122,7 @@ gboolean
 gst_tensor_repo_set_eos (guint nth)
 {
   GST_TENSOR_REPO_LOCK (nth);
-  GstTensorData *data = gst_tensor_repo_get_tensor (nth);
+  GstTensorRepoData *data = gst_tensor_repo_get_repodata (nth);
   data->eos = TRUE;
   if (data->buffer)
     gst_buffer_unref (data->buffer);
@@ -134,16 +134,16 @@ gst_tensor_repo_set_eos (guint nth)
 
 
 /**
- * @brief get GstTensorData from repo
+ * @brief get GstTensorRepoData from repo
  */
 GstBuffer *
 gst_tensor_repo_get_buffer (guint nth)
 {
-  GstTensorData *current_data;
+  GstTensorRepoData *current_data;
   GstBuffer *buf;
   gboolean eos = FALSE;
 
-  current_data = gst_tensor_repo_get_tensor (nth);
+  current_data = gst_tensor_repo_get_repodata (nth);
   GST_TENSOR_REPO_LOCK (nth);
   while (!current_data->buffer) {
     if (gst_tensor_repo_check_eos (nth)) {
@@ -165,10 +165,10 @@ gst_tensor_repo_get_buffer (guint nth)
 }
 
 /**
- * @brief remove nth GstTensorData from GstTensorRepo
+ * @brief remove nth GstTensorRepoData from GstTensorRepo
  */
 gboolean
-gst_tensor_repo_remove_data (guint nth)
+gst_tensor_repo_remove_repodata (guint nth)
 {
   gboolean ret;
   printf ("removeing .... \n");

diff --git a/gst/nnstreamer/tensor_repo.h b/gst/nnstreamer/tensor_repo.h
index 3f9ed08..9fb6215 100644 (file)
--- a/gst/nnstreamer/tensor_repo.h
+++ b/gst/nnstreamer/tensor_repo.h
@@ -36,7 +36,7 @@ G_BEGIN_DECLS
 /**
  * @brief GstTensorRepo internal data structure.
  *
- * GstTensorRepo has GSlist of GstTensorData.
+ * GstTensorRepo has GSlist of GstTensorRepoData.
  *
  */
 
@@ -46,7 +46,7 @@ typedef struct
   GCond cond;
   GMutex lock;
   gboolean eos;
-} GstTensorData;
+} GstTensorRepoData;
 
 /**
  * @brief GstTensorRepo data structure.
@@ -61,17 +61,17 @@ typedef struct
 } GstTensorRepo;
 
 /**
- * @brief getter to get nth GstTensorData
+ * @brief getter to get nth GstTensorRepoData
  */
-GstTensorData *
-gst_tensor_repo_get_tensor (guint nth);
+GstTensorRepoData *
+gst_tensor_repo_get_repodata (guint nth);
 
 /**
- * @brief add GstTensorData into repo
+ * @brief add GstTensorRepoData into repo
  */
 /* guint */
 gboolean
-gst_tensor_repo_add_data (guint myid);
+gst_tensor_repo_add_repodata (guint myid);
 
 /**
  * @brief push GstBuffer into repo
@@ -92,16 +92,16 @@ gboolean
 gst_tensor_repo_set_eos(guint nth);
 
 /**
- * @brief Get GstTensorData from repo
+ * @brief Get GstTensorRepoData from repo
  */
 GstBuffer *
 gst_tensor_repo_get_buffer (guint nth);
 
 /**
- * @brief remove nth GstTensorData from GstTensorRepo
+ * @brief remove nth GstTensorRepoData from GstTensorRepo
  */
 gboolean
-gst_tensor_repo_remove_data (guint nth);
+gst_tensor_repo_remove_repodata (guint nth);
 
 /**
  * @brief GstTensorRepo initialization
@@ -119,8 +119,8 @@ gst_tensor_repo_wait();
 /**
  * @brief Macro for Lock & Cond
  */
-#define GST_TENSOR_REPO_GET_LOCK(id) (&((GstTensorData*)(gst_tensor_repo_get_tensor(id)))->lock)
-#define GST_TENSOR_REPO_GET_COND(id) (&((GstTensorData*)(gst_tensor_repo_get_tensor(id)))->cond)
+#define GST_TENSOR_REPO_GET_LOCK(id) (&((GstTensorRepoData*)(gst_tensor_repo_get_repodata(id)))->lock)
+#define GST_TENSOR_REPO_GET_COND(id) (&((GstTensorRepoData*)(gst_tensor_repo_get_repodata(id)))->cond)
 #define GST_TENSOR_REPO_LOCK(id) (g_mutex_lock(GST_TENSOR_REPO_GET_LOCK(id)))
 #define GST_TENSOR_REPO_UNLOCK(id) (g_mutex_unlock(GST_TENSOR_REPO_GET_LOCK(id)))
 #define GST_TENSOR_REPO_WAIT(id) (g_cond_wait(GST_TENSOR_REPO_GET_COND(id), GST_TENSOR_REPO_GET_LOCK(id)))

diff --git a/gst/tensor_reposink/tensor_reposink.c b/gst/tensor_reposink/tensor_reposink.c
index 4fad1fd..29d5b84 100644 (file)
--- a/gst/tensor_reposink/tensor_reposink.c
+++ b/gst/tensor_reposink/tensor_reposink.c
@@ -182,7 +182,7 @@ gst_tensor_reposink_set_property (GObject * object, guint prop_id,
       break;
     case PROP_SLOT:
       self->myid = g_value_get_uint (value);
-      gst_tensor_repo_add_data (self->myid);
+      gst_tensor_repo_add_repodata (self->myid);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);

diff --git a/gst/tensor_reposrc/tensor_reposrc.c b/gst/tensor_reposrc/tensor_reposrc.c
index c5c95ab..2961a2e 100644 (file)
--- a/gst/tensor_reposrc/tensor_reposrc.c
+++ b/gst/tensor_reposrc/tensor_reposrc.c
@@ -152,7 +152,7 @@ gst_tensor_reposrc_dispose (GObject * object)
   gboolean ret;
   GstTensorRepoSrc *self = GST_TENSOR_REPOSRC (object);
 
-  ret = gst_tensor_repo_remove_data (self->myid);
+  ret = gst_tensor_repo_remove_repodata (self->myid);
   if (!ret)
     GST_ELEMENT_ERROR (self, RESOURCE, WRITE,
         ("Cannot remove [key: %d] in repo", self->myid), NULL);