[Common] move common tensor-info functions to api header

move the functions about tensor-info and caps negotiation into plugin api

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

diff --git a/gst/nnstreamer/nnstreamer_plugin_api.h b/gst/nnstreamer/nnstreamer_plugin_api.h
index 73efea6..ff07c5f 100644 (file)
--- a/gst/nnstreamer/nnstreamer_plugin_api.h
+++ b/gst/nnstreamer/nnstreamer_plugin_api.h
@@ -118,6 +118,43 @@ gst_tensors_info_parse_types_string (GstTensorsInfo * info,
     const gchar * type_string);
 
 /**
+ * @brief Parse the string of names
+ * @param info tensors info structure
+ * @param name_string string of names
+ * @return number of parsed names
+ */
+extern guint
+gst_tensors_info_parse_names_string (GstTensorsInfo * info,
+    const gchar * name_string);
+
+/**
+ * @brief Get the string of dimensions in tensors info
+ * @param info tensors info structure
+ * @return string of dimensions in tensors info (NULL if the number of tensors is 0)
+ * @note The returned value should be freed with g_free()
+ */
+extern gchar *
+gst_tensors_info_get_dimensions_string (const GstTensorsInfo * info);
+
+/**
+ * @brief Get the string of types in tensors info
+ * @param info tensors info structure
+ * @return string of types in tensors info (NULL if the number of tensors is 0)
+ * @note The returned value should be freed with g_free()
+ */
+extern gchar *
+gst_tensors_info_get_types_string (const GstTensorsInfo * info);
+
+/**
+ * @brief Get the string of tensor names in tensors info
+ * @param info tensors info structure
+ * @return string of names in tensors info (NULL if the number of tensors is 0)
+ * @note The returned value should be freed with g_free()
+ */
+extern gchar *
+gst_tensors_info_get_names_string (const GstTensorsInfo * info);
+
+/**
  * @brief Check the tensors info is valid
  * @param info tensors info structure
  * @return TRUE if info is valid
@@ -155,6 +192,14 @@ extern gboolean
 gst_tensor_config_validate (const GstTensorConfig * config);
 
 /**
+ * @brief Compare tensor config info
+ * @param TRUE if equal
+ */
+extern gboolean
+gst_tensor_config_is_equal (const GstTensorConfig * c1,
+    const GstTensorConfig * c2);
+
+/**
  * @brief Get media type from structure
  * @param structure structure to be interpreted
  * @return corresponding media type (returns _NNS_MEDIA_END for unsupported type)
@@ -199,6 +244,30 @@ extern gboolean
 gst_tensors_config_validate (const GstTensorsConfig * config);
 
 /**
+ * @brief Compare tensor config info (for other/tensors)
+ * @param TRUE if equal
+ */
+extern gboolean
+gst_tensors_config_is_equal (const GstTensorsConfig * c1,
+    const GstTensorsConfig * c2);
+
+/**
+ * @brief Get tensor caps from tensor config (for other/tensor)
+ * @param config tensor config info
+ * @return caps for given config
+ */
+extern GstCaps *
+gst_tensor_caps_from_config (const GstTensorConfig * config);
+
+/**
+ * @brief Get caps from tensors config (for other/tensors)
+ * @param config tensors config info
+ * @return caps for given config
+ */
+extern GstCaps *
+gst_tensors_caps_from_config (const GstTensorsConfig * config);
+
+/**
  * @brief Check the tensor dimension is valid
  * @param dim tensor dimension
  * @return TRUE if dimension is valid

diff --git a/gst/nnstreamer/tensor_common.h b/gst/nnstreamer/tensor_common.h
index 7f6a6b9..4a6782e 100644 (file)
--- a/gst/nnstreamer/tensor_common.h
+++ b/gst/nnstreamer/tensor_common.h
@@ -32,10 +32,7 @@
 #include <glib.h>
 #include <stdint.h>
 #include <gst/gst.h>
-#include <gst/video/video-format.h>
-#include <gst/audio/audio-format.h>
 #include <gst/base/gstcollectpads.h>
-#include <gst/gstplugin.h>
 
 #include "tensor_typedef.h"
 #include "nnstreamer_plugin_api.h"
@@ -99,75 +96,6 @@ typedef struct
 } GstTensorCollectPadData;
 
 /**
- * @brief Parse the string of names
- * @param info tensors info structure
- * @param name_string string of names
- * @return number of parsed names
- */
-extern guint
-gst_tensors_info_parse_names_string (GstTensorsInfo * info,
-    const gchar * name_string);
-
-/**
- * @brief Get the string of dimensions in tensors info
- * @param info tensors info structure
- * @return string of dimensions in tensors info (NULL if the number of tensors is 0)
- * @note The returned value should be freed with g_free()
- */
-extern gchar *
-gst_tensors_info_get_dimensions_string (const GstTensorsInfo * info);
-
-/**
- * @brief Get the string of types in tensors info
- * @param info tensors info structure
- * @return string of types in tensors info (NULL if the number of tensors is 0)
- * @note The returned value should be freed with g_free()
- */
-extern gchar *
-gst_tensors_info_get_types_string (const GstTensorsInfo * info);
-
-/**
- * @brief Get the string of tensor names in tensors info
- * @param info tensors info structure
- * @return string of names in tensors info (NULL if the number of tensors is 0)
- * @note The returned value should be freed with g_free()
- */
-extern gchar *
-gst_tensors_info_get_names_string (const GstTensorsInfo * info);
-
-/**
- * @brief Compare tensor config info
- * @param TRUE if equal
- */
-extern gboolean
-gst_tensor_config_is_equal (const GstTensorConfig * c1,
-    const GstTensorConfig * c2);
-
-/**
- * @brief Get tensor caps from tensor config (for other/tensor)
- * @param config tensor config info
- * @return caps for given config
- */
-extern GstCaps *
-gst_tensor_caps_from_config (const GstTensorConfig * config);
-
-/**
- * @brief Compare tensor config info (for other/tensors)
- * @param TRUE if equal
- */
-extern gboolean
-gst_tensors_config_is_equal (const GstTensorsConfig * c1,
-    const GstTensorsConfig * c2);
-
-/**
- * @brief Get caps from tensors config (for other/tensors)
- * @param config tensors config info
- * @return caps for given config
- */
-extern GstCaps *
-gst_tensors_caps_from_config (const GstTensorsConfig * config);
-
-/**
  * @brief A callback for typefind, trying to find whether a file is other/tensors or not.
  * For the concrete definition of headers, please look at the wiki page of nnstreamer:
  * https://github.com/nnsuite/nnstreamer/wiki/Design-External-Save-Format-for-other-tensor-and-other-tensors-Stream-for-TypeFind