[Sparse] change util function param

Change param - gst-memory to convert tensor data.

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

diff --git a/gst/nnstreamer/tensor_sparse/tensor_sparse_dec.c b/gst/nnstreamer/tensor_sparse/tensor_sparse_dec.c
index d2277c8..561619d 100644 (file)
--- a/gst/nnstreamer/tensor_sparse/tensor_sparse_dec.c
+++ b/gst/nnstreamer/tensor_sparse/tensor_sparse_dec.c
@@ -360,8 +360,7 @@ gst_tensor_sparse_dec_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
   GstFlowReturn ret = GST_FLOW_ERROR;
   GstTensorSparseDec *self = GST_TENSOR_SPARSE_DEC (parent);
   GstTensorMetaInfo meta;
-  GstMemory *mem, *out_mem;
-  GstMapInfo map;
+  GstMemory *mem;
   GstBuffer *outbuf;
   GstTensorsInfo info;
   guint i;
@@ -374,27 +373,13 @@ gst_tensor_sparse_dec_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
 
   for (i = 0; i < info.num_tensors; ++i) {
     mem = gst_buffer_peek_memory (buf, i);
-
-    if (!gst_memory_map (mem, &map, GST_MAP_READ)) {
-      nns_loge ("failed to map given buffer");
-      goto done;
-    }
-
-    if (!gst_tensor_meta_info_parse_header (&meta, map.data)) {
-      nns_loge ("failed to parse meta info from given buffer");
-      gst_memory_unmap (mem, &map);
-      goto done;
-    }
-
-    out_mem = gst_tensor_sparse_to_dense (&meta, map.data);
-    gst_memory_unmap (mem, &map);
-
-    if (!out_mem) {
+    mem = gst_tensor_sparse_to_dense (&meta, mem);
+    if (!mem) {
       nns_loge ("failed to convert to dense tensor");
       goto done;
     }
 
-    gst_buffer_append_memory (outbuf, out_mem);
+    gst_buffer_append_memory (outbuf, mem);
     gst_tensor_meta_info_convert (&meta, &info.info[i]);
   }
 

diff --git a/gst/nnstreamer/tensor_sparse/tensor_sparse_enc.c b/gst/nnstreamer/tensor_sparse/tensor_sparse_enc.c
index f88e6ed..b3105ab 100644 (file)
--- a/gst/nnstreamer/tensor_sparse/tensor_sparse_enc.c
+++ b/gst/nnstreamer/tensor_sparse/tensor_sparse_enc.c
@@ -370,8 +370,7 @@ gst_tensor_sparse_enc_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
 {
   GstFlowReturn ret = GST_FLOW_OK;
   GstTensorSparseEnc *self = GST_TENSOR_SPARSE_ENC (parent);
-  GstMemory *mem, *out_mem;
-  GstMapInfo map;
+  GstMemory *mem;
   GstBuffer *outbuf;
   GstTensorsInfo *info;
   guint i;
@@ -391,22 +390,14 @@ gst_tensor_sparse_enc_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
 
     /* do real encoding here */
     mem = gst_buffer_peek_memory (buf, i);
-    if (!gst_memory_map (mem, &map, GST_MAP_READ)) {
-      ml_loge ("Cannot map input buffer to gst-buffer at sparse_enc.");
-      ret = GST_FLOW_ERROR;
-      goto done;
-    }
-
-    out_mem = gst_tensor_sparse_from_dense (&meta, map.data);
-    gst_memory_unmap (mem, &map);
-
-    if (!out_mem) {
+    mem = gst_tensor_sparse_from_dense (&meta, mem);
+    if (!mem) {
       nns_loge ("failed to convert to sparse tensor");
       ret = GST_FLOW_ERROR;
       goto done;
     }
 
-    gst_buffer_append_memory (outbuf, out_mem);
+    gst_buffer_append_memory (outbuf, mem);
   }
 
   ret = gst_pad_push (self->srcpad, outbuf);

diff --git a/gst/nnstreamer/tensor_sparse/tensor_sparse_util.c b/gst/nnstreamer/tensor_sparse/tensor_sparse_util.c
index 1443c99..9d9f313 100644 (file)
--- a/gst/nnstreamer/tensor_sparse/tensor_sparse_util.c
+++ b/gst/nnstreamer/tensor_sparse/tensor_sparse_util.c
@@ -20,17 +20,29 @@
 /**
  * @brief Make dense tensor with input sparse tensor.
  * @param[in,out] meta tensor meta structure to be updated
- * @param[in] in pointer of input sparse tensor data
+ * @param[in] mem gst-memory of sparse tensor data
  * @return pointer of GstMemory with dense tensor data or NULL on error. Caller should handle this newly allocated memory.
  */
 GstMemory *
-gst_tensor_sparse_to_dense (GstTensorMetaInfo * meta, gpointer in)
+gst_tensor_sparse_to_dense (GstTensorMetaInfo * meta, GstMemory * mem)
 {
+  GstMemory *dense = NULL;
+  GstMapInfo map;
   guint i, nnz;
   guint8 *output, *input;
   guint *indices;
   gsize output_size, element_size;
 
+  if (!gst_memory_map (mem, &map, GST_MAP_READ)) {
+    nns_loge ("Failed to map given memory");
+    return NULL;
+  }
+
+  if (!gst_tensor_meta_info_parse_header (meta, map.data)) {
+    nns_loge ("Failed to parse meta info from given memory");
+    goto done;
+  }
+
   meta->format = _NNS_TENSOR_FORMAT_STATIC;
 
   element_size = gst_tensor_get_element_size (meta->type);
@@ -38,14 +50,14 @@ gst_tensor_sparse_to_dense (GstTensorMetaInfo * meta, gpointer in)
 
   if (element_size == 0 || output_size == 0) {
     nns_loge ("Got invalid meta info");
-    return NULL;
+    goto done;
   }
 
   output = (guint8 *) g_malloc0 (output_size);
 
   nnz = meta->sparse_info.nnz;
-  input = (guint8 *) in + gst_tensor_meta_info_get_header_size (meta);
-  indices = ((guint *) ((guint8 *) input + element_size * nnz));
+  input = map.data + gst_tensor_meta_info_get_header_size (meta);
+  indices = (guint *) (input + element_size * nnz);
 
   for (i = 0; i < nnz; ++i) {
     switch (meta->type) {
@@ -82,37 +94,49 @@ gst_tensor_sparse_to_dense (GstTensorMetaInfo * meta, gpointer in)
       default:
         nns_loge ("Error occured during get tensor value");
         g_free (output);
-
-        return NULL;
+        goto done;
     }
   }
 
-  return gst_memory_new_wrapped (0, output, output_size, 0,
-      output_size, output, g_free);
+  dense = gst_memory_new_wrapped (0, output, output_size, 0, output_size,
+      output, g_free);
+
+done:
+  gst_memory_unmap (mem, &map);
+  return dense;
 }
 
 /**
  * @brief Make sparse tensor with input dense tensor.
  * @param[in,out] meta tensor meta structure to be updated
- * @param[in] in pointer of input dense tensor data
+ * @param[in] mem gst-memory of dense tensor data
  * @return pointer of GstMemory with sparse tensor data or NULL on error. Caller should handle this newly allocated memory.
  */
 GstMemory *
-gst_tensor_sparse_from_dense (GstTensorMetaInfo * meta, gpointer in)
+gst_tensor_sparse_from_dense (GstTensorMetaInfo * meta, GstMemory * mem)
 {
+  GstMemory *sparse = NULL;
+  GstMapInfo map;
   guint i, nnz = 0;
   guint8 *output;
   tensor_type data_type;
   void *values;
   guint *indices;
-  gsize output_size;
-  gsize header_size = gst_tensor_meta_info_get_header_size (meta);
-  gsize element_size = gst_tensor_get_element_size (meta->type);
-  gulong element_count = gst_tensor_get_element_count (meta->dimension);
+  gsize output_size, header_size, element_size;
+  gulong element_count;
+
+  if (!gst_memory_map (mem, &map, GST_MAP_READ)) {
+    nns_loge ("Failed to map given memory");
+    return NULL;
+  }
+
+  header_size = gst_tensor_meta_info_get_header_size (meta);
+  element_size = gst_tensor_get_element_size (meta->type);
+  element_count = gst_tensor_get_element_count (meta->dimension);
 
   if (element_size == 0 || element_count == 0) {
     nns_loge ("Got invalid meta info");
-    return NULL;
+    goto done;
   }
 
   /** alloc maximum possible size of memory */
@@ -125,71 +149,71 @@ gst_tensor_sparse_from_dense (GstTensorMetaInfo * meta, gpointer in)
   for (i = 0; i < element_count; ++i) {
     switch (data_type) {
       case _NNS_INT32:
-        if (((int32_t *) in)[i] != 0) {
-          ((int32_t *) values)[nnz] = ((int32_t *) in)[i];
+        if (((int32_t *) map.data)[i] != 0) {
+          ((int32_t *) values)[nnz] = ((int32_t *) map.data)[i];
           indices[nnz] = i;
           nnz += 1;
         }
         break;
       case _NNS_UINT32:
-        if (((uint32_t *) in)[i] != 0) {
-          ((uint32_t *) values)[nnz] = ((uint32_t *) in)[i];
+        if (((uint32_t *) map.data)[i] != 0) {
+          ((uint32_t *) values)[nnz] = ((uint32_t *) map.data)[i];
           indices[nnz] = i;
           nnz += 1;
         }
         break;
       case _NNS_INT16:
-        if (((int16_t *) in)[i] != 0) {
-          ((int16_t *) values)[nnz] = ((int16_t *) in)[i];
+        if (((int16_t *) map.data)[i] != 0) {
+          ((int16_t *) values)[nnz] = ((int16_t *) map.data)[i];
           indices[nnz] = i;
           nnz += 1;
         }
         break;
       case _NNS_UINT16:
-        if (((uint16_t *) in)[i] != 0) {
-          ((uint16_t *) values)[nnz] = ((uint16_t *) in)[i];
+        if (((uint16_t *) map.data)[i] != 0) {
+          ((uint16_t *) values)[nnz] = ((uint16_t *) map.data)[i];
           indices[nnz] = i;
           nnz += 1;
         }
         break;
       case _NNS_INT8:
-        if (((int8_t *) in)[i] != 0) {
-          ((int8_t *) values)[nnz] = ((int8_t *) in)[i];
+        if (((int8_t *) map.data)[i] != 0) {
+          ((int8_t *) values)[nnz] = ((int8_t *) map.data)[i];
           indices[nnz] = i;
           nnz += 1;
         }
         break;
       case _NNS_UINT8:
-        if (((uint8_t *) in)[i] != 0) {
-          ((uint8_t *) values)[nnz] = ((uint8_t *) in)[i];
+        if (((uint8_t *) map.data)[i] != 0) {
+          ((uint8_t *) values)[nnz] = ((uint8_t *) map.data)[i];
           indices[nnz] = i;
           nnz += 1;
         }
         break;
       case _NNS_FLOAT64:
-        if (((double *) in)[i] != 0) {
-          ((double *) values)[nnz] = ((double *) in)[i];
+        if (((double *) map.data)[i] != 0) {
+          ((double *) values)[nnz] = ((double *) map.data)[i];
           indices[nnz] = i;
           nnz += 1;
         }
         break;
       case _NNS_FLOAT32:
-        if (((float *) in)[i] != 0) {
-          ((float *) values)[nnz] = ((float *) in)[i];
+        if (((float *) map.data)[i] != 0) {
+          ((float *) values)[nnz] = ((float *) map.data)[i];
           indices[nnz] = i;
           nnz += 1;
         }
         break;
       case _NNS_INT64:
-        if (((int64_t *) in)[i] != 0) {
-          ((int64_t *) values)[nnz] = ((int64_t *) in)[i];
+        if (((int64_t *) map.data)[i] != 0) {
+          ((int64_t *) values)[nnz] = ((int64_t *) map.data)[i];
           indices[nnz] = i;
           nnz += 1;
         }
         break;
       case _NNS_UINT64:
-        if (((uint64_t *) in)[i] != 0) {
-          ((uint64_t *) values)[nnz] = ((uint64_t *) in)[i];
+        if (((uint64_t *) map.data)[i] != 0) {
+          ((uint64_t *) values)[nnz] = ((uint64_t *) map.data)[i];
           indices[nnz] = i;
           nnz += 1;
         }
@@ -198,12 +222,12 @@ gst_tensor_sparse_from_dense (GstTensorMetaInfo * meta, gpointer in)
         nns_loge ("Error occured during get tensor value");
         g_free (values);
         g_free (indices);
-
-        return NULL;
+        goto done;
     }
   }
 
   /** update meta nnz info */
+  meta->format = _NNS_TENSOR_FORMAT_SPARSE;
   meta->sparse_info.nnz = nnz;
 
   /** write to output buffer */
@@ -222,6 +246,10 @@ gst_tensor_sparse_from_dense (GstTensorMetaInfo * meta, gpointer in)
   g_free (values);
   g_free (indices);
 
-  return gst_memory_new_wrapped (0, output, output_size, 0,
-      output_size, output, g_free);
+  sparse = gst_memory_new_wrapped (0, output, output_size, 0, output_size,
+      output, g_free);
+
+done:
+  gst_memory_unmap (mem, &map);
+  return sparse;
 }

diff --git a/gst/nnstreamer/tensor_sparse/tensor_sparse_util.h b/gst/nnstreamer/tensor_sparse/tensor_sparse_util.h
index 09b471b..a822586 100644 (file)
--- a/gst/nnstreamer/tensor_sparse/tensor_sparse_util.h
+++ b/gst/nnstreamer/tensor_sparse/tensor_sparse_util.h
@@ -23,20 +23,20 @@ G_BEGIN_DECLS
 /**
  * @brief Make dense tensor with input sparse tensor.
  * @param[in,out] meta tensor meta structure to be updated
- * @param[in] in pointer of input sparse tensor data
+ * @param[in] mem gst-memory of sparse tensor data
  * @return pointer of GstMemory with dense tensor data or NULL on error. Caller should handle this newly allocated memory.
  */
 extern GstMemory *
-gst_tensor_sparse_to_dense (GstTensorMetaInfo * meta, gpointer in);
+gst_tensor_sparse_to_dense (GstTensorMetaInfo * meta, GstMemory * mem);
 
 /**
  * @brief Make sparse tensor with input dense tensor.
  * @param[in,out] meta tensor meta structure to be updated
- * @param[in] in pointer of input dense tensor data
+ * @param[in] mem gst-memory of dense tensor data
  * @return pointer of GstMemory with sparse tensor data or NULL on error. Caller should handle this newly allocated memory.
  */
 extern GstMemory *
-gst_tensor_sparse_from_dense (GstTensorMetaInfo * meta, gpointer in);
+gst_tensor_sparse_from_dense (GstTensorMetaInfo * meta, GstMemory * mem);
 
 G_END_DECLS
 #endif /* __GST_TENSOR_SPARSE_UTIL_H__ */