[Code Clean] Type naming & constify

1. We still had "uint32_t *", which should've been replaced by "tensor_dim"
2. Constify input tensor. Incorrect usage will generate compiler errors later :)

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

diff --git a/gst/tensor_filter/tensor_filter.h b/gst/tensor_filter/tensor_filter.h
index 4b0f720..10f9561 100644 (file)
--- a/gst/tensor_filter/tensor_filter.h
+++ b/gst/tensor_filter/tensor_filter.h
@@ -131,9 +131,9 @@ struct _GstTensor_Filter_Framework
 {
   gchar *name; /**< Name of the neural network framework, searchable by FRAMEWORK property */
   gboolean allow_in_place; /**< TRUE if InPlace transfer of input-to-output is allowed. Not supported in main, yet */
-  int (*invoke_NN)(GstTensor_Filter *filter, uint8_t *inputptr, uint8_t *outputptr); /**< Mandatory callback. Invoke the given network model. */
-  int (*getInputDimension)(GstTensor_Filter *filter, uint32_t *inputDimension, tensor_type *type); /**< Optional. Set NULL if not supported. Get dimension of input tensor */
-  int (*getOutputDimension)(GstTensor_Filter *filter, uint32_t *outputDimension, tensor_type *type); /**< Optional. Set NULL if not supported. Get dimension of output tensor */
+  int (*invoke_NN)(GstTensor_Filter *filter, const uint8_t *inputptr, uint8_t *outputptr); /**< Mandatory callback. Invoke the given network model. */
+  int (*getInputDimension)(GstTensor_Filter *filter, tensor_dim inputDimension, tensor_type *type); /**< Optional. Set NULL if not supported. Get dimension of input tensor */
+  int (*getOutputDimension)(GstTensor_Filter *filter, tensor_dim outputDimension, tensor_type *type); /**< Optional. Set NULL if not supported. Get dimension of output tensor */
   void (*close)(GstTensor_Filter *filter); /**< Optional. Close this instance! */
 };
 

diff --git a/gst/tensor_filter/tensor_filter_custom.c b/gst/tensor_filter/tensor_filter_custom.c
index 450261b..ed9a771 100644 (file)
--- a/gst/tensor_filter/tensor_filter_custom.c
+++ b/gst/tensor_filter/tensor_filter_custom.c
@@ -119,7 +119,8 @@ custom_loadlib (GstTensor_Filter * filter)
  * @param[out] outptr The output tensor
  */
 static int
-custom_invoke (GstTensor_Filter * filter, uint8_t * inptr, uint8_t * outptr)
+custom_invoke (GstTensor_Filter * filter, const uint8_t * inptr,
+    uint8_t * outptr)
 {
   int retval = custom_loadlib (filter);
   internal_data *ptr;
@@ -141,7 +142,7 @@ custom_invoke (GstTensor_Filter * filter, uint8_t * inptr, uint8_t * outptr)
  * @brief The optional callback for GstTensor_Filter_Framework
  */
 static int
-custom_getInputDim (GstTensor_Filter * filter, uint32_t * inputDimension,
+custom_getInputDim (GstTensor_Filter * filter, tensor_dim inputDimension,
     tensor_type * type)
 {
   int retval = custom_loadlib (filter);
@@ -161,7 +162,7 @@ custom_getInputDim (GstTensor_Filter * filter, uint32_t * inputDimension,
  * @brief The optional callback for GstTensor_Filter_Framework
  */
 static int
-custom_getOutputDim (GstTensor_Filter * filter, uint32_t * outputDimension,
+custom_getOutputDim (GstTensor_Filter * filter, tensor_dim outputDimension,
     tensor_type * type)
 {
   int retval = custom_loadlib (filter);

diff --git a/gst/tensor_filter/tensor_filter_tensorflow_lite.c b/gst/tensor_filter/tensor_filter_tensorflow_lite.c
index 5713703..75f07f3 100644 (file)
--- a/gst/tensor_filter/tensor_filter_tensorflow_lite.c
+++ b/gst/tensor_filter/tensor_filter_tensorflow_lite.c
@@ -58,7 +58,8 @@
  * @brief The mandatory callback for GstTensor_Filter_Framework
  */
 static int
-tflite_invoke (GstTensor_Filter * filter, uint8_t * inptr, uint8_t * outptr)
+tflite_invoke (GstTensor_Filter * filter, const uint8_t * inptr,
+    uint8_t * outptr)
 {
   return 0;                     /* NYI */
 }
@@ -67,7 +68,7 @@ tflite_invoke (GstTensor_Filter * filter, uint8_t * inptr, uint8_t * outptr)
  * @brief The optional callback for GstTensor_Filter_Framework
  */
 static int
-tflite_getInputDim (GstTensor_Filter * filter, uint32_t * inputDimension,
+tflite_getInputDim (GstTensor_Filter * filter, tensor_dim inputDimension,
     tensor_type * type)
 {
   /* @TODO fill in *inputDimension (uint32_t[MAX_RANK]), *type */
@@ -78,7 +79,7 @@ tflite_getInputDim (GstTensor_Filter * filter, uint32_t * inputDimension,
  * @brief The optional callback for GstTensor_Filter_Framework
  */
 static int
-tflite_getOutputDim (GstTensor_Filter * filter, uint32_t * outputDimension,
+tflite_getOutputDim (GstTensor_Filter * filter, tensor_dim outputDimension,
     tensor_type * type)
 {
   /* @TODO fill in *outputDimension (uint32_t[MAX_RANK]), *type */

diff --git a/include/tensor_filter_custom.h b/include/tensor_filter_custom.h
index da01fc3..86bd14f 100644 (file)
--- a/include/tensor_filter_custom.h
+++ b/include/tensor_filter_custom.h
@@ -105,7 +105,7 @@ typedef int (*NNS_custom_get_output_dimension)(void *private_data, const GstTens
  * @param[in] inputPtr pointer to output tensor, size = dim1 x dim2 x dim3 x dim4 x typesize, allocated by caller
  */
 typedef int (*NNS_custom_invoke)(void *private_data, const GstTensor_Filter_Properties *prop,
-    uint8_t *inputPtr, uint8_t *outputPtr);
+    const uint8_t *inputPtr, uint8_t *outputPtr);
 
 /**
  * @brief Custom Filter Class

diff --git a/nnstreamer_example/custom_example_passthrough/nnstreamer_customfilter_example_passthrough.c b/nnstreamer_example/custom_example_passthrough/nnstreamer_customfilter_example_passthrough.c
index da2aa3f..d65a5d3 100644 (file)
--- a/nnstreamer_example/custom_example_passthrough/nnstreamer_customfilter_example_passthrough.c
+++ b/nnstreamer_example/custom_example_passthrough/nnstreamer_customfilter_example_passthrough.c
@@ -92,7 +92,7 @@ get_outputDim (void *private_data, const GstTensor_Filter_Properties * prop,
 
 static int
 pt_invoke (void *private_data, const GstTensor_Filter_Properties * prop,
-    uint8_t * inptr, uint8_t * outptr)
+    const uint8_t * inptr, uint8_t * outptr)
 {
   pt_data *data = private_data;
   size_t size;