From 4140d51fc18634079f5ed62e78830ca8b02f65f3 Mon Sep 17 00:00:00 2001 From: Jaeyun Date: Tue, 3 Sep 2019 21:47:33 +0900 Subject: [PATCH] [Filter/Transform] code clean 1. remove unnecessary code to get output size in tensor-filter. 2. set null to find operator in tensor-transform. Signed-off-by: Jaeyun Jung --- gst/nnstreamer/tensor_filter/tensor_filter.c | 23 ++++++---------------- gst/nnstreamer/tensor_transform/tensor_transform.c | 4 ++-- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/gst/nnstreamer/tensor_filter/tensor_filter.c b/gst/nnstreamer/tensor_filter/tensor_filter.c index d3577ff..cabddaa 100644 --- a/gst/nnstreamer/tensor_filter/tensor_filter.c +++ b/gst/nnstreamer/tensor_filter/tensor_filter.c @@ -525,28 +525,16 @@ gst_tensors_parse_modelpaths_string (GstTensorFilterProperties * prop, * @return output buffer size */ static gsize -gst_tensor_filter_out_size (GstTensorFilter * self, gint index) +gst_tensor_filter_get_output_size (GstTensorFilter * self, guint index) { GstTensorsInfo *info; - guint i; - gsize out_size = 0; g_assert (self->configured); info = &self->prop.output_meta; + g_assert (index < info->num_tensors); - if (index < 0) { - /** calculate all output tensors */ - for (i = 0; i < info->num_tensors; i++) { - out_size += gst_tensor_info_get_size (&info->info[i]); - } - } else { - g_assert (index < info->num_tensors); - - out_size = gst_tensor_info_get_size (&info->info[index]); - } - - return out_size; + return gst_tensor_info_get_size (&info->info[index]); } /** @@ -929,7 +917,8 @@ gst_tensor_filter_transform (GstBaseTransform * trans, GstMapInfo out_info[NNS_TENSOR_SIZE_LIMIT]; GstTensorMemory in_tensors[NNS_TENSOR_SIZE_LIMIT]; GstTensorMemory out_tensors[NNS_TENSOR_SIZE_LIMIT]; - gint i, ret; + guint i; + gint ret; self = GST_TENSOR_FILTER_CAST (trans); prop = &self->prop; @@ -966,7 +955,7 @@ gst_tensor_filter_transform (GstBaseTransform * trans, for (i = 0; i < prop->output_meta.num_tensors; i++) { out_tensors[i].data = NULL; - out_tensors[i].size = gst_tensor_filter_out_size (self, i); + out_tensors[i].size = gst_tensor_filter_get_output_size (self, i); out_tensors[i].type = prop->output_meta.info[i].type; /* allocate memory if allocate_in_invoke is FALSE */ diff --git a/gst/nnstreamer/tensor_transform/tensor_transform.c b/gst/nnstreamer/tensor_transform/tensor_transform.c index 8b001f0..d317260 100644 --- a/gst/nnstreamer/tensor_transform/tensor_transform.c +++ b/gst/nnstreamer/tensor_transform/tensor_transform.c @@ -121,7 +121,7 @@ enum static const gchar *gst_tensor_transform_stand_string[] = { [STAND_DEFAULT] = "default", - [STAND_END] = "error" + [STAND_END] = NULL }; static const gchar *gst_tensor_transform_operator_string[] = { @@ -129,7 +129,7 @@ static const gchar *gst_tensor_transform_operator_string[] = { [GTT_OP_ADD] = "add", [GTT_OP_MUL] = "mul", [GTT_OP_DIV] = "div", - [GTT_OP_UNKNOWN] = "unknown" + [GTT_OP_UNKNOWN] = NULL }; /** -- 2.7.4