From: Tae-Young Chung <ty83.chung@samsung.com>
Date: Tue, 14 Sep 2021 09:47:28 +0000 (+0900)
Subject: [UTC|ITC][capi-media-vision][Non-ACR][Fix tc failure and meta files]
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b64baa6fc1ffb353acd657dec2083161fb519d76;p=test%2Ftct%2Fnative%2Fapi.git

[UTC|ITC][capi-media-vision][Non-ACR][Fix tc failure and meta files]

Change-Id: Id73233228e334407d5e3c4d13b007dd3ec9386be
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
---

diff --git a/src/itc/media-vision/ITs-media-vision-inference.c b/src/itc/media-vision/ITs-media-vision-inference.c
index 4f6ff00a6..39382dc52 100644
--- a/src/itc/media-vision/ITs-media-vision-inference.c
+++ b/src/itc/media-vision/ITs-media-vision-inference.c
@@ -1300,7 +1300,7 @@ int ITc_mediavision_mv_inference_pose_get_label_p(void)
 		FPRINTF("[Line : %d][%s] Invalid value of  g_nNumberOfPoses, g_nNumberOfPoses = %d \\n", __LINE__, API_NAMESPACE, g_nNumberOfPoses);
 		return 1;
 	}
-	if(g_nLabel >= 0)
+	if(g_nLabel > 0)
 	{
 		FPRINTF("[Line : %d][%s] Invalid value of  g_nLabel, g_nLabel = %d \\n", __LINE__, API_NAMESPACE, g_nLabel);
 		return 1;
diff --git a/src/itc/media-vision/res/inference/models/fld_tflite_model1_meta.json b/src/itc/media-vision/res/inference/models/fld_tflite_model1_meta.json
index 0c30ad3d4..0f2148c82 100644
--- a/src/itc/media-vision/res/inference/models/fld_tflite_model1_meta.json
+++ b/src/itc/media-vision/res/inference/models/fld_tflite_model1_meta.json
@@ -29,17 +29,17 @@
                 "index" : [-1, -1, -1, -1],
                 "top_number" : 1,
                 "threshold" : 0.0,
-                "score_type" : 0
+                "score_type" : "NORMAL"
             }
         ],
         "landmark" : [
             {
                 "name" : "fanet8ss_inference/fully_connected_1/Sigmoid",
                 "index" : [-1, 1],
-                "landmark_type" : 0,
-                "landmark_coordinate" : 0,
+                "landmark_type" : "2D_SINGLE",
+                "landmark_coordinate" : "RATIO",
                 "landmark_offset" : 2,
-                "decoding_type" : 0
+                "decoding_type" : "BYPASS"
             }
         ]
     }
diff --git a/src/itc/media-vision/res/inference/models/pld_tflite_model_meta.json b/src/itc/media-vision/res/inference/models/pld_tflite_model_meta.json
index 3bee725af..1b243784b 100644
--- a/src/itc/media-vision/res/inference/models/pld_tflite_model_meta.json
+++ b/src/itc/media-vision/res/inference/models/pld_tflite_model_meta.json
@@ -29,21 +29,21 @@
                 "index" : [-1, 1, 1, 1],
                 "top_number" : 1 ,
                 "threshold" : 0.3,
-                "score_type" : 0
+                "score_type" : "NORMAL"
             }
         ],
         "landmark" : [
             {
                 "name" : "Convolutional_Pose_Machine/stage_5_out",
                 "index" : [-1, 1, 1, 1],
-                "landmark_type" : 0,
-                "landmark_coordinate" : 1,
-                "decoding_type" : 1,
+                "landmark_type" : "2D_SINGLE",
+                "landmark_coordinate" : "PIXEL",
+                "decoding_type" : "HEATMAP",
                 "decoding_info" :
                 {
                     "heatmap" :
                      {
-                         "shape_type": 1
+                         "shape_type": "NHWC"
                      }
                 }
             }
diff --git a/src/utc/capi-media-vision/res/inference/models/fld_tflite_model1_meta.json b/src/utc/capi-media-vision/res/inference/models/fld_tflite_model1_meta.json
index 0c30ad3d4..0f2148c82 100644
--- a/src/utc/capi-media-vision/res/inference/models/fld_tflite_model1_meta.json
+++ b/src/utc/capi-media-vision/res/inference/models/fld_tflite_model1_meta.json
@@ -29,17 +29,17 @@
                 "index" : [-1, -1, -1, -1],
                 "top_number" : 1,
                 "threshold" : 0.0,
-                "score_type" : 0
+                "score_type" : "NORMAL"
             }
         ],
         "landmark" : [
             {
                 "name" : "fanet8ss_inference/fully_connected_1/Sigmoid",
                 "index" : [-1, 1],
-                "landmark_type" : 0,
-                "landmark_coordinate" : 0,
+                "landmark_type" : "2D_SINGLE",
+                "landmark_coordinate" : "RATIO",
                 "landmark_offset" : 2,
-                "decoding_type" : 0
+                "decoding_type" : "BYPASS"
             }
         ]
     }
diff --git a/src/utc/capi-media-vision/res/inference/models/pld_tflite_model_meta.json b/src/utc/capi-media-vision/res/inference/models/pld_tflite_model_meta.json
index 3bee725af..1b243784b 100644
--- a/src/utc/capi-media-vision/res/inference/models/pld_tflite_model_meta.json
+++ b/src/utc/capi-media-vision/res/inference/models/pld_tflite_model_meta.json
@@ -29,21 +29,21 @@
                 "index" : [-1, 1, 1, 1],
                 "top_number" : 1 ,
                 "threshold" : 0.3,
-                "score_type" : 0
+                "score_type" : "NORMAL"
             }
         ],
         "landmark" : [
             {
                 "name" : "Convolutional_Pose_Machine/stage_5_out",
                 "index" : [-1, 1, 1, 1],
-                "landmark_type" : 0,
-                "landmark_coordinate" : 1,
-                "decoding_type" : 1,
+                "landmark_type" : "2D_SINGLE",
+                "landmark_coordinate" : "PIXEL",
+                "decoding_type" : "HEATMAP",
                 "decoding_info" :
                 {
                     "heatmap" :
                      {
-                         "shape_type": 1
+                         "shape_type": "NHWC"
                      }
                 }
             }
diff --git a/src/utc/capi-media-vision/utc-mv_inference.c b/src/utc/capi-media-vision/utc-mv_inference.c
index 2ba1707ff..09baa39df 100755
--- a/src/utc/capi-media-vision/utc-mv_inference.c
+++ b/src/utc/capi-media-vision/utc-mv_inference.c
@@ -2120,7 +2120,7 @@ int utc_mediavision_mv_inference_get_label_p(void)
     assert_eq(true, gIsPoseLandmarkDetectCallBackInvoked);
     assert_eq(MEDIA_VISION_ERROR_NONE, gPldResultErr);
     assert_gt(gPldResultNumberOfPoses, 0);
-    assert_lt(gPldResultLabel, 0);
+    assert_leq(gPldResultLabel, 0);
 
     printf("Before return mv_inference_pose_get_label_p\n");
     return 0;