Change score name to array in meta json

outputmetadata score name was single string, but needs to change to
handle yolo models.(multiple names)
`before`
"score" :
    {
        "name" : "some name",
        ...
    }
`after`
"score" :
    {
        "name" : ["some name"],
        ...
    }

Change-Id: Ie76b38ad6eb7665300b556c2d9ce0be576a537f3
Signed-off-by: Kwanghoon Son <k.son@samsung.com>

1 files changed, 16 insertions, 6 deletions

diff --git a/mv_machine_learning/inference/include/ScoreInfo.h b/mv_machine_learning/inference/include/ScoreInfo.h
index 97e0c52d..5810324b 100644
--- a/mv_machine_learning/inference/include/ScoreInfo.h
+++ b/mv_machine_learning/inference/include/ScoreInfo.h
@@ -23,6 +23,7 @@
 #include <memory>
 
 #include <mv_inference_type.h>
+#include <mv_private.h>
 #include "DimInfo.h"
 #include "Utils.h"
 
@@ -42,7 +43,7 @@ struct DeQuantization
 class ScoreInfo
 {
 private:
-	std::string name;
+	std::vector<std::string> names;
 	DimInfo dimInfo;
 	double threshold;
 	int topNumber;
@@ -52,7 +53,7 @@ private:
 
 public:
 	ScoreInfo()
-			: name()
+			: names()
 			, dimInfo()
 			, threshold(0.0)
 			, topNumber(1)
@@ -68,7 +69,7 @@ public:
 
 	std::string GetName()
 	{
-		return name;
+		return names[0];
 	}
 	DimInfo GetDimInfo()
 	{
@@ -108,10 +109,19 @@ public:
 		}
 		JsonObject *pObject = json_object_get_object_member(root, "score");
 
-		name = json_object_get_string_member(pObject, "name");
-		LOGI("layer: %s", name.c_str());
+		JsonArray *array = json_object_get_array_member(pObject, "name");
+		MEDIA_VISION_NULL_ARG_CHECK(array);
 
-		JsonArray *array = json_object_get_array_member(pObject, "index");
+		unsigned int elements1 = json_array_get_length(array);
+		MEDIA_VISION_CHECK_CONDITION(elements1 > 0,
+									 MEDIA_VISION_ERROR_INVALID_PARAMETER,
+									 "No name on meta file");
+
+		for (unsigned int elem1 = 0; elem1 < elements1; ++elem1) {
+			names.push_back(json_array_get_string_element(array, elem1));
+		}
+
+		array = json_object_get_array_member(pObject, "index");
 		unsigned int elements2 = json_array_get_length(array);
 		LOGI("range dim: size[%u]", elements2);
 		for (unsigned int elem2 = 0; elem2 < elements2; ++elem2) {