[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 4f6ff00a61aa02def7eccee6ae5146f7a02c6412..39382dc52b4b62270393ff59f1ee0abde39185f8 100644 (file)
--- 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 0c30ad3d40a25ba91fd6f3ccef9fb524e48131a2..0f2148c8249931d25819aba6efa65de5305f5ae2 100644 (file)
--- 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 3bee725af532756e870577ae5b565edb44a1c573..1b243784bbdff5651995d0e111fb2282c9b0b8c7 100644 (file)
--- 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 0c30ad3d40a25ba91fd6f3ccef9fb524e48131a2..0f2148c8249931d25819aba6efa65de5305f5ae2 100644 (file)
--- 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 3bee725af532756e870577ae5b565edb44a1c573..1b243784bbdff5651995d0e111fb2282c9b0b8c7 100644 (file)
--- 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 2ba1707ff1a50c5a2b4bbffb5b31dd90db49a088..09baa39dfa2bc2f2220f80baaf76c470da0ef791 100755 (executable)
--- 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;