[ITC][UTC][media_vision][ACR-1803] change feature key for face recognition

Change-Id: I6364f0a7bfda3bf8b7f27509801341291440903d
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/src/itc/media-vision-dl/ITs-media-vision-common.h b/src/itc/media-vision-dl/ITs-media-vision-common.h
index 3672000c6f3456409e74a36ffe73a3b30bedbbe2..401841111af72b0660892a5e967a5c5e166879d3 100644 (file)
--- a/src/itc/media-vision-dl/ITs-media-vision-common.h
+++ b/src/itc/media-vision-dl/ITs-media-vision-common.h
@@ -42,8 +42,10 @@
 //Add test package related defines here
 #define API_NAMESPACE                  "MEDIA_VISION_ITC"
 #define TIMEOUT_CB                             15000
-#define VISIONINFERENCEFEATURE         "http://tizen.org/feature/vision.inference"
-#define VISIONINFERENCEFACEFEATURE             "http://tizen.org/feature/vision.inference.face"
+#define VISIONINFERENCEFEATURE          "http://tizen.org/feature/vision.inference"
+#define VISIONTRAININGFEATURE           "http://tizen.org/feature/vision.training"
+#define VISIONINFERENCEFACERECOGNITIONFEATURE "http://tizen.org/feature/vision.inference.face_recognition"
+#define VISIONTRAININGFACERECOGNITIONFEATURE "http://tizen.org/feature/vision.training.face_recognition"
 
 #define PATHLEN                                        1024
 

diff --git a/src/itc/media-vision-dl/ITs-media-vision-face-recognition.c b/src/itc/media-vision-dl/ITs-media-vision-face-recognition.c
index 491486e45f7853fba607d937c99650f3fe9c630b..b8c70d42ddb5c3be90c56a28618ac39560a90fce 100644 (file)
--- a/src/itc/media-vision-dl/ITs-media-vision-face-recognition.c
+++ b/src/itc/media-vision-dl/ITs-media-vision-face-recognition.c
@@ -58,7 +58,10 @@ void ITs_media_vision_face_recognition_startup(void)
 
        g_bMediavisionFaceRecognitionModelCreation = false;
        g_bMismatch = false;
-       g_bIsFaceRecognitionFeatureSupported = TCTCheckSystemInfoFeatureSupported(VISIONINFERENCEFACEFEATURE, API_NAMESPACE);
+       g_bIsFaceRecognitionFeatureSupported = TCTCheckSystemInfoFeatureSupported(VISIONINFERENCEFEATURE, API_NAMESPACE) &&
+                                                                                  TCTCheckSystemInfoFeatureSupported(VISIONTRAININGFEATURE, API_NAMESPACE) &&
+                                                                                  TCTCheckSystemInfoFeatureSupported(VISIONINFERENCEFACERECOGNITIONFEATURE, API_NAMESPACE) &&
+                                                                                  TCTCheckSystemInfoFeatureSupported(VISIONTRAININGFACERECOGNITIONFEATURE, API_NAMESPACE);
 
        char pszValue[CONFIG_VALUE_LEN_MAX] = { 0, };
 

diff --git a/src/utc/capi-media-vision-dl/utc-mv_face_recognition.c b/src/utc/capi-media-vision-dl/utc-mv_face_recognition.c
index beac9918b0dba3b55547528d1ac61920f7cb76da..6c1d38b2db911db1bc9f483f90d2027879440359 100755 (executable)
--- a/src/utc/capi-media-vision-dl/utc-mv_face_recognition.c
+++ b/src/utc/capi-media-vision-dl/utc-mv_face_recognition.c
@@ -92,14 +92,20 @@ _LOAD_IMAGE_FAIL:
 
 static bool is_face_recognition_feature_supported(void)
 {
-       bool isFaceRecognitionSupported =false;
+       bool isInferenceSupported =false;
+       bool isTrainingSupported =false;
+       bool isInferenceFaceRecognitionSupported =false;
+       bool isTrainingFaceRecognitionSupported =false;
 
-       system_info_get_platform_bool("http://tizen.org/feature/vision.inference.face", &isFaceRecognitionSupported);
+       system_info_get_platform_bool("http://tizen.org/feature/vision.inference", &isInferenceSupported);
+       system_info_get_platform_bool("http://tizen.org/feature/vision.training", &isTrainingSupported);
+       system_info_get_platform_bool("http://tizen.org/feature/vision.inference.face_recognition", &isInferenceFaceRecognitionSupported);
+       system_info_get_platform_bool("http://tizen.org/feature/vision.training.face_recognition", &isTrainingFaceRecognitionSupported);
 
-       if (!isFaceRecognitionSupported)
+       if (!isInferenceSupported || !isTrainingSupported || !isInferenceFaceRecognitionSupported || !isTrainingFaceRecognitionSupported)
                printf("Not support face recognition feature.");
 
-       return isFaceRecognitionSupported;
+       return (isInferenceSupported && isTrainingSupported && isInferenceFaceRecognitionSupported && isTrainingFaceRecognitionSupported);
 }
 
 /**