[ITC][media-vision][Non-ACR]Feature fail case fixed

Change-Id: I20baa6a36eaea1714110bfe753df9e8673c44c60
Signed-off-by: Ankit Srivastava <ankit.sri1@samsung.com>

diff --git a/src/itc/media-vision/ITs-media-vision-common.h b/src/itc/media-vision/ITs-media-vision-common.h
index ac1e622dcc95ddf8d20f413543563c2950dace44..b94cfa45ff42daa7d6501d5840e3c50039970445 100644 (file)
--- a/src/itc/media-vision/ITs-media-vision-common.h
+++ b/src/itc/media-vision/ITs-media-vision-common.h
@@ -162,21 +162,6 @@ mv_point_s g_sPoint;
 
 #define START_TEST_ROI_TRACKER {\
        FPRINTF("[Line : %d][%s] Starting test : %s\\n", __LINE__, API_NAMESPACE, __FUNCTION__);\
-       if ( g_bMismatch )\
-       {\
-               FPRINTF("[Line : %d][%s]Featuer mismatch for  media-vision so leaving test\\n", __LINE__, API_NAMESPACE);\
-               return 1;\
-       }\
-       if( g_bIsVisionROITrackerFeatureSupported == false )\
-       {\
-               FPRINTF("[Line : %d][%s] ROI Tracker feature feature is not supported and api also returned not supported so leaving test\\n", __LINE__, API_NAMESPACE);\
-               return 0;\
-       }\
-       if ( g_bMediavisionROITrackerModelCreation == false )\
-       {\
-               FPRINTF("[Line : %d][%s] Precondition of media-vision failed so leaving test\\n", __LINE__, API_NAMESPACE);\
-               return 1;\
-       }\
 }
 
 #define CHECK_HANDLE_CLEANUP(Handle, API, FreeResource) {\
@@ -236,13 +221,11 @@ static const char *g_pszDataPath = NULL;
 static const char *g_pszCconfFile = "media-vision-barcodes.json";
 bool g_bMediavisionCreation;
 bool g_CallBackHit;
-bool g_bMediavisionFaceRecognitionModelCreation;
 int g_nTimeoutId;
 GMainLoop *g_pMainLoop;
 mv_face_recognition_model_h g_hRecognitionModel;
 mv_source_h g_hMvSource;
-bool g_bIsFaceRecognitionFeatureSupported;
-bool g_bIsImageRecognitionFeatureSupported;
+
 bool g_bMismatch;
 void *g_pBufferData;
 mv_engine_config_h g_hMvEngineConfig;
@@ -259,12 +242,14 @@ bool g_bIsBarcodeDetectionFeatureSupported;
 bool checkModelFile( const char *fSrcPath, const char *fDstPath);
 int image_load(const char *file_path, mv_source_h source);
 
+bool g_bIsFaceRecognitionFeatureSupported;
+bool g_bMediavisionFaceRecognitionModelCreation;
+bool g_bIsImageRecognitionFeatureSupported;
 bool g_bIsDetectionFeatureSupported;
 bool g_bIsGenerationFeatureSupported;
 bool g_bMediavisionInferenceModelCreation;
 bool g_bIsVisionInferenceFeatureSupported;
 bool g_bIsVisionROITrackerFeatureSupported;
-bool g_bMediavisionROITrackerModelCreation;
 
 media_packet_h g_hMediaPacket;
 media_format_h g_hMediaFormat;

diff --git a/src/itc/media-vision/ITs-media-vision-roi-tracker.c b/src/itc/media-vision/ITs-media-vision-roi-tracker.c
index a27617dc55904fddf902a4dda190625701f61bc3..08d6ada3ec0e7f679459ed85ba537f6d6a6a663c 100644 (file)
--- a/src/itc/media-vision/ITs-media-vision-roi-tracker.c
+++ b/src/itc/media-vision/ITs-media-vision-roi-tracker.c
@@ -76,8 +76,6 @@ void ITs_media_vision_roi_tracker_startup(void)
                remove(ERR_LOG);
        }
 
-       g_bMediavisionROITrackerModelCreation = false;
-       g_bMismatch = false;
        g_bIsVisionROITrackerFeatureSupported = TCTCheckSystemInfoFeatureSupported(VISIONROITRACKINGFEATURE, API_NAMESPACE);
 
        char pszValue[CONFIG_VALUE_LEN_MAX] = { 0, };
@@ -87,48 +85,11 @@ void ITs_media_vision_roi_tracker_startup(void)
 
                gROITrackerExampleDir = (char*)calloc(strlen(pszValue) + strlen("/res/res/roi_tracker") + 1, sizeof(char));
                snprintf(gROITrackerExampleDir, strlen(pszValue) + strlen("/res/res/roi_tracker") + 1, "%s/res/res/roi_tracker", pszValue);
-
        }
        else
        {
                FPRINTF("[Line : %d][%s] GetValueForTCTSetting returned error for 'DEVICE_SUITE_TARGET_30'\\n", __LINE__, API_NAMESPACE);
        }
-
-       int nRet = mv_create_engine_config(&gEngineConfigHandle);
-
-       if (!g_bIsVisionROITrackerFeatureSupported)
-       {
-               if (nRet != TIZEN_ERROR_NOT_SUPPORTED)
-               {
-                       FPRINTF("[%s:%d] mv_create_engine_config failed to return TIZEN_ERROR_NOT_SUPPORTED for unsupported feature, error returned = (%d)\\n", __FILE__, __LINE__, nRet);
-                       dlog_print(DLOG_ERROR, "NativeTCT", "[%s:%d] mv_create_engine_config failed to return TIZEN_ERROR_NOT_SUPPORTED for unsupported feature, error returned = (%d)", __FILE__, __LINE__, nRet);
-                       g_bMismatch = true;
-                       return;
-               }
-
-               FPRINTF("[%s:%d] mv_create_engine_config is unsupported\\n", __FILE__, __LINE__);
-               dlog_print(DLOG_ERROR, "NativeTCT", "[%s:%d] mv_create_engine_config is unsupported", __FILE__, __LINE__);
-               g_bMismatch = false;
-       }
-       else if (nRet != MEDIA_VISION_ERROR_NONE)
-       {
-               gEngineConfigHandle = NULL;
-               FPRINTF("[%s:%d] mv_create_engine_config failed, error returned =(%d)\\n", __FILE__, __LINE__, nRet);
-               dlog_print(DLOG_ERROR, "NativeTCT", "[%s:%d] mv_create_engine_config failed, error returned = (%d)", __FILE__, __LINE__, nRet);
-               g_bMediavisionROITrackerModelCreation = false;
-               return;
-       }
-       else
-       {
-               g_bMediavisionROITrackerModelCreation = true;
-       }
-
-       nRet = mv_create_source(&gSourceHandle);
-       if (MEDIA_VISION_ERROR_NONE != nRet) {
-               gSourceHandle = NULL;
-               FPRINTF("[%s:%d] mv_create_source failed, error returned =(%d)\\n", __FILE__, __LINE__, nRet);
-               g_bMediavisionROITrackerModelCreation = false;
-       }
        return;
 }\r
 \r
@@ -180,11 +141,23 @@ int ITc_mv_roi_tracker_create_destroy_p(void)
        START_TEST_ROI_TRACKER;
 
        int nRet = mv_roi_tracker_create(&g_hTrackerModel);
-       PRINT_RESULT(MEDIA_VISION_ERROR_NONE, nRet, "mv_roi_tracker_create", MediaVisionGetError(nRet));
-
+       if (g_bIsVisionROITrackerFeatureSupported == true)
+       {
+               PRINT_RESULT(MEDIA_VISION_ERROR_NONE, nRet, "mv_roi_tracker_create", MediaVisionGetError(nRet));
+       }
+       else
+       {
+               PRINT_RESULT(MEDIA_VISION_ERROR_NOT_SUPPORTED, nRet, "mv_roi_tracker_create", MediaVisionGetError(nRet));
+       }
        nRet = mv_roi_tracker_destroy(g_hTrackerModel);
-       PRINT_RESULT(MEDIA_VISION_ERROR_NONE, nRet, "mv_roi_tracker_destroy", MediaVisionGetError(nRet));
-
+       if (g_bIsVisionROITrackerFeatureSupported == true)
+       {
+               PRINT_RESULT(MEDIA_VISION_ERROR_NONE, nRet, "mv_roi_tracker_destroy", MediaVisionGetError(nRet));
+       }
+       else
+       {
+               PRINT_RESULT(MEDIA_VISION_ERROR_NOT_SUPPORTED, nRet, "mv_roi_tracker_destroy", MediaVisionGetError(nRet));
+       }
        return 0;
 }\r
 \r
@@ -211,14 +184,31 @@ int ITc_mv_roi_tracker_configure_prepare_p(void)
        int nRet = mv_roi_tracker_create(&g_hTrackerModel);
        PRINT_RESULT(MEDIA_VISION_ERROR_NONE, nRet, "mv_roi_tracker_create", MediaVisionGetError(nRet));
 
+       nRet = mv_create_engine_config(&gEngineConfigHandle);
+       PRINT_RESULT(MEDIA_VISION_ERROR_NONE, nRet, "mv_create_engine_config", MediaVisionGetError(nRet));
+
        nRet = SetROITrackerEngineConfig(gEngineConfigHandle);
        PRINT_RESULT(MEDIA_VISION_ERROR_NONE, nRet, "SetROITrackerEngineConfig", MediaVisionGetError(nRet));
 
        nRet = mv_roi_tracker_configure(g_hTrackerModel, gEngineConfigHandle);
-       PRINT_RESULT(MEDIA_VISION_ERROR_NONE, nRet, "mv_roi_tracker_configure", MediaVisionGetError(nRet));
+       if (g_bIsVisionROITrackerFeatureSupported == true)
+       {
+               PRINT_RESULT(MEDIA_VISION_ERROR_NONE, nRet, "mv_roi_tracker_configure", MediaVisionGetError(nRet));
+       }
+       else
+       {
+               PRINT_RESULT(MEDIA_VISION_ERROR_NOT_SUPPORTED, nRet, "mv_roi_tracker_configure", MediaVisionGetError(nRet));
+       }
 
        nRet = mv_roi_tracker_prepare(g_hTrackerModel, 50, 50, 50, 50);
-       PRINT_RESULT(MEDIA_VISION_ERROR_NONE, nRet, "mv_roi_tracker_prepare", MediaVisionGetError(nRet));
+       if (g_bIsVisionROITrackerFeatureSupported == true)
+       {
+               PRINT_RESULT(MEDIA_VISION_ERROR_NONE, nRet, "mv_roi_tracker_prepare", MediaVisionGetError(nRet));
+       }
+       else
+       {
+               PRINT_RESULT(MEDIA_VISION_ERROR_NOT_SUPPORTED, nRet, "mv_roi_tracker_prepare", MediaVisionGetError(nRet));
+       }
        FPRINTF("[Line : %d][%s] TC run successfully\\n", __LINE__, API_NAMESPACE);
 
        return 0;
@@ -247,6 +237,9 @@ int ITc_mv_roi_tracker_perform_p(void)
        int nRet = mv_roi_tracker_create(&g_hTrackerModel);
        PRINT_RESULT(MEDIA_VISION_ERROR_NONE, nRet, "mv_roi_tracker_create", MediaVisionGetError(nRet));\r
 \r
+       nRet = mv_create_engine_config(&gEngineConfigHandle);
+       PRINT_RESULT(MEDIA_VISION_ERROR_NONE, nRet, "mv_create_engine_config", MediaVisionGetError(nRet));\r
+\r
        nRet = SetROITrackerEngineConfig(gEngineConfigHandle);
        PRINT_RESULT(MEDIA_VISION_ERROR_NONE, nRet, "SetROITrackerEngineConfig", MediaVisionGetError(nRet));\r
 \r
@@ -269,7 +262,14 @@ int ITc_mv_roi_tracker_perform_p(void)
        g_CallBackHit = false;\r
 \r
        nRet = mv_roi_tracker_perform(g_hTrackerModel, gSourceHandle, MvROITrackedCB, NULL);\r
-       PRINT_RESULT(MEDIA_VISION_ERROR_NONE, nRet, "mv_roi_tracker_perform", MediaVisionGetError(nRet));\r
+       if (g_bIsVisionROITrackerFeatureSupported == true)
+       {
+               PRINT_RESULT(MEDIA_VISION_ERROR_NONE, nRet, "mv_roi_tracker_perform", MediaVisionGetError(nRet));
+       }
+       else
+       {
+               PRINT_RESULT(MEDIA_VISION_ERROR_NOT_SUPPORTED, nRet, "mv_roi_tracker_perform", MediaVisionGetError(nRet));
+       }\r
 \r
        if (g_CallBackHit == false)\r
        {\r