[Code Clean] Use common function / Remove unnecessary code

- Use get_tensor_from_padcap to read tensor info from padcap.
- Expand the capability of get-tensor_from_padcap for framerate.
- Remove nnfw_support_status

This is start of #169

Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>

diff --git a/common/tensor_common.c b/common/tensor_common.c
index 5d7b079..f34dd66 100644 (file)
--- a/common/tensor_common.c
+++ b/common/tensor_common.c
@@ -166,7 +166,7 @@ get_tensor_element_count (const uint32_t dim[NNS_TENSOR_RANK_LIMIT])
  */
 GstTensor_Filter_CheckStatus
 get_tensor_from_padcap (const GstCaps * caps, tensor_dim dim,
-    tensor_type * type)
+    tensor_type * type, int *framerate_num, int *framerate_denum)
 {
   GstTensor_Filter_CheckStatus ret = _TFC_INIT;
   tensor_dim backup_dim;
@@ -175,6 +175,7 @@ get_tensor_from_padcap (const GstCaps * caps, tensor_dim dim,
   const GstStructure *str;
   int rank;
   const gchar *strval;
+  gint fn, fd;
 
   if (!caps)
     return ret;
@@ -184,18 +185,14 @@ get_tensor_from_padcap (const GstCaps * caps, tensor_dim dim,
     str = gst_caps_get_structure (caps, i);
     g_assert (NNS_TENSOR_RANK_LIMIT == 4);      /* This code assumes rank limit is 4 */
 
+    /**
+     * Already cofnigured and more cap info is coming.
+     * I'm not sure how this happens, but let's be ready for this.
+     */
     if ((i > 1) && (ret & _TFC_DIMENSION)) {
-      /**
-       * Already cofnigured and more cap info is coming.
-       * I'm not sure how this happens, but let's be ready for this.
-       */
       memcpy (backup_dim, dim, sizeof (uint32_t) * NNS_TENSOR_RANK_LIMIT);
     }
     if ((i > 1) && (ret & _TFC_TYPE)) {
-      /**
-       * Already cofnigured and more cap info is coming.
-       * I'm not sure how this happens, but let's be ready for this.
-       */
       backup_type = *type;
     }
 
@@ -227,6 +224,18 @@ get_tensor_from_padcap (const GstCaps * caps, tensor_dim dim,
       }
       ret |= _TFC_TYPE;
     }
+    if (gst_structure_get_fraction (str, "framerate", &fn, &fd)) {
+      if ((ret & _TFC_FRAMERATE) && framerate_num)
+        g_assert (fn == *framerate_num);
+      if ((ret & _TFC_FRAMERATE) && framerate_denum)
+        g_assert (fd == *framerate_denum);
+
+      if (framerate_num)
+        *framerate_num = fn;
+      if (framerate_denum)
+        *framerate_denum = fd;
+      ret |= _TFC_FRAMERATE;
+    }
   }
   return ret;
 }

diff --git a/gst/tensor_converter/tensor_converter.c b/gst/tensor_converter/tensor_converter.c
index ce0828e..951328a 100644 (file)
--- a/gst/tensor_converter/tensor_converter.c
+++ b/gst/tensor_converter/tensor_converter.c
@@ -851,7 +851,7 @@ gst_tensor_converter_transform_size (GstBaseTransform * trans,
   tensor_dim dim;
   tensor_type type;
   GstTensor_Filter_CheckStatus ret =
-      get_tensor_from_padcap (srccap, dim, &type);
+      get_tensor_from_padcap (srccap, dim, &type, NULL, NULL);
 
   g_assert ((ret & _TFC_ALL) == _TFC_ALL);
 

diff --git a/gst/tensor_filter/tensor_filter.c b/gst/tensor_filter/tensor_filter.c
index c6c9ed7..b911e93 100644 (file)
--- a/gst/tensor_filter/tensor_filter.c
+++ b/gst/tensor_filter/tensor_filter.c
@@ -512,7 +512,7 @@ gst_tensor_filter_set_property (GObject * object, guint prop_id,
       silent_debug ("Framework = %s\n", g_value_get_string (value));
       g_assert (prop->nnfw != -1);
       g_assert (prop->nnfw != _T_F_UNDEFINED);
-      g_assert (nnfw_support_status[prop->nnfw] == TRUE);
+      g_assert (tensor_filter_supported[prop->nnfw] != NULL);
       prop->fw = tensor_filter_supported[prop->nnfw];
       fw = prop->fw;
       g_assert (prop->fw != NULL);
@@ -1197,7 +1197,7 @@ gst_tensor_filter_transform_size (GstBaseTransform * trans,
   tensor_dim dim;
   tensor_type type;
   GstTensor_Filter_CheckStatus ret =
-      get_tensor_from_padcap (srccap, dim, &type);
+      get_tensor_from_padcap (srccap, dim, &type, NULL, NULL);
 
   if (filter->prop.fw->allocate_in_invoke == TRUE) {
     *othersize = 0;             /* Do not allocate outbuf. invoke_NN will allocate! */

diff --git a/gst/tensor_filter/tensor_filter.h b/gst/tensor_filter/tensor_filter.h
index dce380b..44e9a5b 100644 (file)
--- a/gst/tensor_filter/tensor_filter.h
+++ b/gst/tensor_filter/tensor_filter.h
@@ -57,23 +57,6 @@ typedef struct _GstTensor_FilterClass GstTensor_FilterClass;
 extern const char* nnfw_names[];
 
 /**
- * @brief NN Framework Support Status
- *
- * TRUE: Supported
- * FALSE: Scaffoldings are there, but not supported, yet. (NYI)
- */
-static const gboolean nnfw_support_status[] = {
-  FALSE,
-
-  TRUE,
-  TRUE,
-  FALSE,
-  FALSE,
-
-  FALSE,
-};
-
-/**
  * @brief Internal data structure for tensor_filter instances.
  */
 struct _GstTensor_Filter

diff --git a/gst/tensor_transform/tensor_transform.c b/gst/tensor_transform/tensor_transform.c
index 6552458..a326dfc 100644 (file)
--- a/gst/tensor_transform/tensor_transform.c
+++ b/gst/tensor_transform/tensor_transform.c
@@ -469,60 +469,14 @@ gst_tensor_transform_transform (GstBaseTransform * trans,
  * @param[out] frate_den Framerate, denomincator
  * @return TRUE if successful (both dim/type read). FALSE if not.
  */
-static gboolean
+static gboolean inline
 gst_tensor_read_cap (GstCaps * caps, tensor_dim dim, tensor_type * type,
     gint * frate_num, gint * frate_den)
 {
-  unsigned int i, capsize;
-  const GstStructure *str;
-  int rank, j;
-  const gchar *strval;
-  gboolean dimset = FALSE, typeset = FALSE;
-  gint fn, fd;
-
-  if (!caps)
-    return FALSE;
+  GstTensor_Filter_CheckStatus ret = get_tensor_from_padcap (caps, dim, type,
+      frate_num, frate_den);
 
-  capsize = gst_caps_get_size (caps);
-  for (i = 0; i < capsize; i++) {
-    str = gst_caps_get_structure (caps, i);
-    if (dimset == TRUE) {
-      tensor_dim dim2;
-      if (gst_structure_get_int (str, "dim1", (int *) &dim2[0]) &&
-          gst_structure_get_int (str, "dim2", (int *) &dim2[1]) &&
-          gst_structure_get_int (str, "dim3", (int *) &dim2[2]) &&
-          gst_structure_get_int (str, "dim4", (int *) &dim2[3])) {
-        for (j = 0; j < NNS_TENSOR_RANK_LIMIT; j++)
-          g_assert (dim[j] == dim2[j]);
-      }
-    } else {
-      if (gst_structure_get_int (str, "dim1", (int *) &dim[0]) &&
-          gst_structure_get_int (str, "dim2", (int *) &dim[1]) &&
-          gst_structure_get_int (str, "dim3", (int *) &dim[2]) &&
-          gst_structure_get_int (str, "dim4", (int *) &dim[3])) {
-        dimset = TRUE;
-        if (gst_structure_get_int (str, "rank", &rank)) {
-          for (j = rank; j < NNS_TENSOR_RANK_LIMIT; j++)
-            g_assert (dim[j] == 1);
-        }
-      }
-    }
-    strval = gst_structure_get_string (str, "type");
-    if (strval) {
-      tensor_type type2;
-      type2 = get_tensor_type (strval);
-      g_assert (type2 != _NNS_END);
-      if (typeset == TRUE)
-        g_assert (*type == type2);
-      *type = type2;
-      typeset = TRUE;
-    }
-    if (gst_structure_get_fraction (str, "framerate", &fn, &fd)) {
-      *frate_num = fn;
-      *frate_den = fd;
-    }
-  }
-  return dimset && typeset;
+  return (ret & (_TFC_ALL | _TFC_FRAMERATE)) == (_TFC_ALL | _TFC_FRAMERATE);
 }
 
 /**

diff --git a/include/tensor_common.h b/include/tensor_common.h
index ccf4058..7540e9c 100644 (file)
--- a/include/tensor_common.h
+++ b/include/tensor_common.h
@@ -116,9 +116,12 @@ extern size_t get_tensor_element_count(const tensor_dim dim);
  * @param[in] caps the pad-cap to be interpreted.
  * @param[out] dim the corresponging dimension info from the cap.
  * @param[out] type the corresponding element type from the cap.
+ * @param[out] framerate_num Numerator of framerate. Set null to not use this.
+ * @param[out] framerate_denum Denumerator of framerate. Set null to not use this.
  */
 extern GstTensor_Filter_CheckStatus
-get_tensor_from_padcap(const GstCaps * caps, tensor_dim dim, tensor_type *type);
+get_tensor_from_padcap(const GstCaps * caps, tensor_dim dim, tensor_type *type,
+    int *framerate_num, int *framerate_denum);
 
 /**
  * @brief Make str(xyz) ==> "xyz" with macro expansion

diff --git a/include/tensor_typedef.h b/include/tensor_typedef.h
index 70f5cd8..37af3f3 100644 (file)
--- a/include/tensor_typedef.h
+++ b/include/tensor_typedef.h
@@ -87,6 +87,8 @@ typedef enum {
   _TFC_TYPE = 2,
   _TFC_ALL = _TFC_DIMENSION | _TFC_TYPE,
 
+  _TFC_FRAMERATE = 4,
+
   /* @TODO Add "consistency checked. don't check it again" and implement .c accordingly. */
 } GstTensor_Filter_CheckStatus;