Fix MV_INFERENCE_BACKEND_TYPE to 1 on DA

DA disable opencv backend(=0) and set default to 1

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6bb1e6f582178571821ad24c6e1169ea2268297..36036379e48a28a56c36830f086706fb5a67e8d3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -322,4 +322,15 @@ configure_file(
 )
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+
+if(WITH_DA_PROFILE)
+set(INFERENCE_BACKEND_TYPE "1")
+else()
+set(INFERENCE_BACKEND_TYPE "0")
+endif()
+configure_file(
+    media-vision-config.json.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/media-vision-config.json
+    @ONLY
+)
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/media-vision-config.json DESTINATION ${CMAKE_INSTALL_DATADIR}/${fw_name})

diff --git a/media-vision-config.json b/media-vision-config.json
deleted file mode 100644 (file)
index 83dc6bd..0000000
--- a/media-vision-config.json
+++ /dev/null
@@ -1,317 +0,0 @@
-{
-    "attributes":
-    [
-        {
-            "name"  : "MV_FACE_DETECTION_MODEL_FILE_PATH",
-            "type"  : "string",
-            "value" : "/usr/share/OpenCV/haarcascades/haarcascade_frontalface_alt2.xml"
-        },
-        {
-            "name"  : "MV_FACE_DETECTION_ROI_X",
-            "type"  : "integer",
-            "value" : -1
-        },
-        {
-            "name"  : "MV_FACE_DETECTION_ROI_Y",
-            "type"  : "integer",
-            "value" : -1
-        },
-        {
-            "name"  : "MV_FACE_DETECTION_ROI_WIDTH",
-            "type"  : "integer",
-            "value" : -1
-        },
-        {
-            "name"  : "MV_FACE_DETECTION_ROI_HEIGHT",
-            "type"  : "integer",
-            "value" : -1
-        },
-        {
-            "name"  : "MV_FACE_DETECTION_MIN_SIZE_WIDTH",
-            "type"  : "integer",
-            "value" : -1
-        },
-        {
-            "name"  : "MV_FACE_DETECTION_MIN_SIZE_HEIGHT",
-            "type"  : "integer",
-            "value" : -1
-        },
-        {
-             "name"  : "MV_BARCODE_GENERATE_ATTR_TEXT",
-             "type"  : "integer",
-             "value" : 0
-        },
-        {
-             "name"  : "MV_BARCODE_GENERATE_ATTR_COLOR_FRONT",
-             "type"  : "string",
-             "value" : "000000"
-        },
-        {
-             "name"  : "MV_BARCODE_GENERATE_ATTR_COLOR_BACK",
-             "type"  : "string",
-             "value" : "ffffff"
-        },
-        {
-            "name" : "MV_BARCODE_DETECT_ATTR_TARGET",
-            "type" : "integer",
-            "value" : 0
-        },
-        {
-            "name" : "MV_BARCODE_DETECT_ATTR_ROTATION_DEGREES",
-            "type" : "integer",
-            "value" : 0
-        },
-        {
-            "name" : "MV_BARCODE_DETECT_ATTR_ROTATION_COUNT",
-            "type" : "integer",
-            "value" : 0
-        },
-        {
-            "name" : "MV_BARCODE_DETECT_ATTR_ROTATION_DIRECTION",
-            "type" : "integer",
-            "value" : 0
-        },
-        {
-            "name" : "MV_BARCODE_DETECT_ATTR_USE_ENHANCEMENT",
-            "type" : "boolean",
-            "value" : false
-        },
-        {
-            "name"  : "MV_IMAGE_RECOGNITION_OBJECT_SCALE_FACTOR",
-            "type"  : "double",
-            "value" : 1.2
-        },
-        {
-            "name"  : "MV_IMAGE_RECOGNITION_OBJECT_MAX_KEYPOINTS_NUM",
-            "type"  : "integer",
-            "value" : 1000
-        },
-        {
-            "name"  : "MV_IMAGE_RECOGNITION_SCENE_SCALE_FACTOR",
-            "type"  : "double",
-            "value" : 1.2
-        },
-        {
-            "name"  : "MV_IMAGE_RECOGNITION_SCENE_MAX_KEYPOINTS_NUM",
-            "type"  : "integer",
-            "value" : 5000
-        },
-        {
-            "name"  : "MV_IMAGE_RECOGNITION_MIN_MATCH_NUM",
-            "type"  : "integer",
-            "value" : 30
-        },
-        {
-            "name"  : "MV_IMAGE_RECOGNITION_REQ_MATCH_PART",
-            "type"  : "double",
-            "value" : 0.05
-        },
-        {
-            "name"  : "MV_IMAGE_RECOGNITION_TOLERANT_MATCH_PART_ERR",
-            "type"  : "double",
-            "value" : 0.1
-        },
-        {
-            "name"  : "MV_IMAGE_TRACKING_HISTORY_AMOUNT",
-            "type"  : "integer",
-            "value" : 3
-        },
-        {
-            "name"  : "MV_IMAGE_TRACKING_EXPECTED_OFFSET",
-            "type"  : "double",
-            "value" : 0
-        },
-        {
-            "name"  : "MV_IMAGE_TRACKING_USE_STABLIZATION",
-            "type"  : "boolean",
-            "value" : true
-        },
-        {
-            "name"  : "MV_IMAGE_TRACKING_STABLIZATION_TOLERANT_SHIFT",
-            "type"  : "double",
-            "value" : 0.00006
-        },
-        {
-            "name"  : "MV_IMAGE_TRACKING_STABLIZATION_SPEED",
-            "type"  : "double",
-            "value" : 0.3
-        },
-        {
-            "name"  : "MV_IMAGE_TRACKING_STABLIZATION_ACCELERATION",
-            "type"  : "double",
-            "value" : 0.1
-        },
-        {
-            "name"  : "MV_FACE_RECOGNITION_MODEL_TYPE",
-            "type"  : "integer",
-            "value" : 3
-        },
-        {
-            "name"  : "MV_SURVEILLANCE_FACE_RECOGNITION_MODEL_FILE_PATH",
-            "type"  : "string",
-            "value" : ""
-        },
-        {
-            "name"  : "MV_SURVEILLANCE_MOVEMENT_DETECTION_THRESHOLD",
-            "type"  : "integer",
-            "value" : 10
-        },
-        {
-            "name"  : "MV_SURVEILLANCE_SKIP_FRAMES_COUNT",
-            "type"  : "integer",
-            "value" : 0
-        },
-        {
-            "name"  : "MV_INFERENCE_INPUT_TENSOR_WIDTH",
-            "type"  : "integer",
-            "value" : -1
-        },
-        {
-            "name"  : "MV_INFERENCE_INPUT_TENSOR_HEIGHT",
-            "type"  : "integer",
-            "value" : -1
-        },
-        {
-            "name"  : "MV_INFERENCE_INPUT_TENSOR_CHANNELS",
-            "type"  : "integer",
-            "value" : -1
-        },
-        {
-            "name" : "MV_INFERENCE_INPUT_DATA_TYPE",
-            "type" : "integer",
-            "value" : 0
-        },
-        {
-            "name"  : "MV_INFERENCE_MODEL_CONFIGURATION_FILE_PATH",
-            "type"  : "string",
-            "value" : ""
-        },
-        {
-            "name"  : "MV_INFERENCE_MODEL_WEIGHT_FILE_PATH",
-            "type"  : "string",
-            "value" : ""
-        },
-        {
-            "name"  : "MV_INFERENCE_MODEL_USER_FILE_PATH",
-            "type"  : "string",
-            "value" : ""
-        },
-        {
-            "name"  : "MV_INFERENCE_MODEL_MEAN_VALUE",
-            "type"  : "double",
-            "value" : 127.5
-        },
-        {
-            "name"  : "MV_INFERENCE_BACKEND_TYPE",
-            "type"  : "integer",
-            "value" : 0
-        },
-        {
-            "name"  : "MV_INFERENCE_TARGET_DEVICE_TYPE",
-            "type"  : "integer",
-            "value" : 1
-        },
-        {
-            "name"  : "MV_INFERENCE_MODEL_STD_VALUE",
-            "type"  : "double",
-            "value" : 1.0
-        },
-        {
-            "name"  : "MV_INFERENCE_OUTPUT_MAX_NUMBER",
-            "type"  : "integer",
-            "value" : 5
-        },
-        {
-            "name"  : "MV_INFERENCE_CONFIDENCE_THRESHOLD",
-            "type"  : "double",
-            "value" : 0.6
-        },
-        {
-            "name"  : "MV_INFERENCE_INPUT_NODE_NAME",
-            "type"  : "string",
-            "value" : "input"
-        },
-        {
-            "name" : "MV_INFERENCE_OUTPUT_NODE_NAMES",
-            "type" : "array",
-            "subtype" : "string",
-            "value" : [ "output"
-            ]
-        },
-        {
-            "name"  : "MV_INFERENCE_MODEL_META_FILE_PATH",
-            "type"  : "string",
-            "value" : ""
-        },
-        {
-            "name"  : "MV_ROI_TRACKER_TYPE",
-            "type"  : "integer",
-            "value" : 2
-        },
-        {
-            "name"  : "MV_3D_DEPTH_MODE",
-            "type"  : "integer",
-            "value" : 1
-        },
-        {
-            "name"  : "MV_3D_DEPTH_WIDTH",
-            "type"  : "integer",
-            "value" : 640
-        },
-        {
-            "name"  : "MV_3D_DEPTH_HEIGHT",
-            "type"  : "integer",
-            "value" : 480
-        },
-        {
-            "name"  : "MV_3D_DEPTH_MIN_DISPARITY",
-            "type"  : "integer",
-            "value" : 0
-        },
-        {
-            "name"  : "MV_3D_DEPTH_MAX_DISPARITY",
-            "type"  : "integer",
-            "value" : 64
-        },
-        {
-            "name" : "MV_3D_DEPTH_STEREO_CONFIG_FILE_PATH",
-            "type"  : "string",
-            "value" : ""
-        },
-        {
-            "name" : "MV_3D_POINTCLOUD_SAMPLING_RATIO",
-            "type"  : "double",
-            "value" : 1.0
-        },
-        {
-            "name" : "MV_3D_POINTCLOUD_OUTLIER_REMOVAL_POINTS",
-            "type"  : "integer",
-            "value" : 0
-        },
-        {
-            "name" : "MV_3D_POINTCLOUD_OUTLIER_REMOVAL_RADIUS",
-            "type"  : "double",
-            "value" : 0.0
-        },
-        {
-            "name" : "MV_3D_POINTCLOUD_OUTPUT_FILE_PATH",
-            "type"  : "string",
-            "value" : "/opt/usr/home/owner/media/Images"
-        },
-        {
-            "name" : "MV_BARCODE_GENERATE_ATTR_DATA_SHAPE",
-            "type"  : "integer",
-            "value" : 0
-        },
-        {
-            "name" : "MV_BARCODE_GENERATE_ATTR_FINDER_SHAPE",
-            "type"  : "integer",
-            "value" : 0
-        },
-        {
-            "name"  : "MV_BARCODE_GENERATE_ATTR_EMBED_IMG_PATH",
-            "type"  : "string",
-            "value" : ""
-        }
-    ]
-}

diff --git a/media-vision-config.json.in b/media-vision-config.json.in
new file mode 100644 (file)
index 0000000..710e531
--- /dev/null
+++ b/media-vision-config.json.in
@@ -0,0 +1,317 @@
+{
+    "attributes":
+    [
+        {
+            "name"  : "MV_FACE_DETECTION_MODEL_FILE_PATH",
+            "type"  : "string",
+            "value" : "/usr/share/OpenCV/haarcascades/haarcascade_frontalface_alt2.xml"
+        },
+        {
+            "name"  : "MV_FACE_DETECTION_ROI_X",
+            "type"  : "integer",
+            "value" : -1
+        },
+        {
+            "name"  : "MV_FACE_DETECTION_ROI_Y",
+            "type"  : "integer",
+            "value" : -1
+        },
+        {
+            "name"  : "MV_FACE_DETECTION_ROI_WIDTH",
+            "type"  : "integer",
+            "value" : -1
+        },
+        {
+            "name"  : "MV_FACE_DETECTION_ROI_HEIGHT",
+            "type"  : "integer",
+            "value" : -1
+        },
+        {
+            "name"  : "MV_FACE_DETECTION_MIN_SIZE_WIDTH",
+            "type"  : "integer",
+            "value" : -1
+        },
+        {
+            "name"  : "MV_FACE_DETECTION_MIN_SIZE_HEIGHT",
+            "type"  : "integer",
+            "value" : -1
+        },
+        {
+             "name"  : "MV_BARCODE_GENERATE_ATTR_TEXT",
+             "type"  : "integer",
+             "value" : 0
+        },
+        {
+             "name"  : "MV_BARCODE_GENERATE_ATTR_COLOR_FRONT",
+             "type"  : "string",
+             "value" : "000000"
+        },
+        {
+             "name"  : "MV_BARCODE_GENERATE_ATTR_COLOR_BACK",
+             "type"  : "string",
+             "value" : "ffffff"
+        },
+        {
+            "name" : "MV_BARCODE_DETECT_ATTR_TARGET",
+            "type" : "integer",
+            "value" : 0
+        },
+        {
+            "name" : "MV_BARCODE_DETECT_ATTR_ROTATION_DEGREES",
+            "type" : "integer",
+            "value" : 0
+        },
+        {
+            "name" : "MV_BARCODE_DETECT_ATTR_ROTATION_COUNT",
+            "type" : "integer",
+            "value" : 0
+        },
+        {
+            "name" : "MV_BARCODE_DETECT_ATTR_ROTATION_DIRECTION",
+            "type" : "integer",
+            "value" : 0
+        },
+        {
+            "name" : "MV_BARCODE_DETECT_ATTR_USE_ENHANCEMENT",
+            "type" : "boolean",
+            "value" : false
+        },
+        {
+            "name"  : "MV_IMAGE_RECOGNITION_OBJECT_SCALE_FACTOR",
+            "type"  : "double",
+            "value" : 1.2
+        },
+        {
+            "name"  : "MV_IMAGE_RECOGNITION_OBJECT_MAX_KEYPOINTS_NUM",
+            "type"  : "integer",
+            "value" : 1000
+        },
+        {
+            "name"  : "MV_IMAGE_RECOGNITION_SCENE_SCALE_FACTOR",
+            "type"  : "double",
+            "value" : 1.2
+        },
+        {
+            "name"  : "MV_IMAGE_RECOGNITION_SCENE_MAX_KEYPOINTS_NUM",
+            "type"  : "integer",
+            "value" : 5000
+        },
+        {
+            "name"  : "MV_IMAGE_RECOGNITION_MIN_MATCH_NUM",
+            "type"  : "integer",
+            "value" : 30
+        },
+        {
+            "name"  : "MV_IMAGE_RECOGNITION_REQ_MATCH_PART",
+            "type"  : "double",
+            "value" : 0.05
+        },
+        {
+            "name"  : "MV_IMAGE_RECOGNITION_TOLERANT_MATCH_PART_ERR",
+            "type"  : "double",
+            "value" : 0.1
+        },
+        {
+            "name"  : "MV_IMAGE_TRACKING_HISTORY_AMOUNT",
+            "type"  : "integer",
+            "value" : 3
+        },
+        {
+            "name"  : "MV_IMAGE_TRACKING_EXPECTED_OFFSET",
+            "type"  : "double",
+            "value" : 0
+        },
+        {
+            "name"  : "MV_IMAGE_TRACKING_USE_STABLIZATION",
+            "type"  : "boolean",
+            "value" : true
+        },
+        {
+            "name"  : "MV_IMAGE_TRACKING_STABLIZATION_TOLERANT_SHIFT",
+            "type"  : "double",
+            "value" : 0.00006
+        },
+        {
+            "name"  : "MV_IMAGE_TRACKING_STABLIZATION_SPEED",
+            "type"  : "double",
+            "value" : 0.3
+        },
+        {
+            "name"  : "MV_IMAGE_TRACKING_STABLIZATION_ACCELERATION",
+            "type"  : "double",
+            "value" : 0.1
+        },
+        {
+            "name"  : "MV_FACE_RECOGNITION_MODEL_TYPE",
+            "type"  : "integer",
+            "value" : 3
+        },
+        {
+            "name"  : "MV_SURVEILLANCE_FACE_RECOGNITION_MODEL_FILE_PATH",
+            "type"  : "string",
+            "value" : ""
+        },
+        {
+            "name"  : "MV_SURVEILLANCE_MOVEMENT_DETECTION_THRESHOLD",
+            "type"  : "integer",
+            "value" : 10
+        },
+        {
+            "name"  : "MV_SURVEILLANCE_SKIP_FRAMES_COUNT",
+            "type"  : "integer",
+            "value" : 0
+        },
+        {
+            "name"  : "MV_INFERENCE_INPUT_TENSOR_WIDTH",
+            "type"  : "integer",
+            "value" : -1
+        },
+        {
+            "name"  : "MV_INFERENCE_INPUT_TENSOR_HEIGHT",
+            "type"  : "integer",
+            "value" : -1
+        },
+        {
+            "name"  : "MV_INFERENCE_INPUT_TENSOR_CHANNELS",
+            "type"  : "integer",
+            "value" : -1
+        },
+        {
+            "name" : "MV_INFERENCE_INPUT_DATA_TYPE",
+            "type" : "integer",
+            "value" : 0
+        },
+        {
+            "name"  : "MV_INFERENCE_MODEL_CONFIGURATION_FILE_PATH",
+            "type"  : "string",
+            "value" : ""
+        },
+        {
+            "name"  : "MV_INFERENCE_MODEL_WEIGHT_FILE_PATH",
+            "type"  : "string",
+            "value" : ""
+        },
+        {
+            "name"  : "MV_INFERENCE_MODEL_USER_FILE_PATH",
+            "type"  : "string",
+            "value" : ""
+        },
+        {
+            "name"  : "MV_INFERENCE_MODEL_MEAN_VALUE",
+            "type"  : "double",
+            "value" : 127.5
+        },
+        {
+            "name"  : "MV_INFERENCE_BACKEND_TYPE",
+            "type"  : "integer",
+            "value" : @INFERENCE_BACKEND_TYPE@
+        },
+        {
+            "name"  : "MV_INFERENCE_TARGET_DEVICE_TYPE",
+            "type"  : "integer",
+            "value" : 1
+        },
+        {
+            "name"  : "MV_INFERENCE_MODEL_STD_VALUE",
+            "type"  : "double",
+            "value" : 1.0
+        },
+        {
+            "name"  : "MV_INFERENCE_OUTPUT_MAX_NUMBER",
+            "type"  : "integer",
+            "value" : 5
+        },
+        {
+            "name"  : "MV_INFERENCE_CONFIDENCE_THRESHOLD",
+            "type"  : "double",
+            "value" : 0.6
+        },
+        {
+            "name"  : "MV_INFERENCE_INPUT_NODE_NAME",
+            "type"  : "string",
+            "value" : "input"
+        },
+        {
+            "name" : "MV_INFERENCE_OUTPUT_NODE_NAMES",
+            "type" : "array",
+            "subtype" : "string",
+            "value" : [ "output"
+            ]
+        },
+        {
+            "name"  : "MV_INFERENCE_MODEL_META_FILE_PATH",
+            "type"  : "string",
+            "value" : ""
+        },
+        {
+            "name"  : "MV_ROI_TRACKER_TYPE",
+            "type"  : "integer",
+            "value" : 2
+        },
+        {
+            "name"  : "MV_3D_DEPTH_MODE",
+            "type"  : "integer",
+            "value" : 1
+        },
+        {
+            "name"  : "MV_3D_DEPTH_WIDTH",
+            "type"  : "integer",
+            "value" : 640
+        },
+        {
+            "name"  : "MV_3D_DEPTH_HEIGHT",
+            "type"  : "integer",
+            "value" : 480
+        },
+        {
+            "name"  : "MV_3D_DEPTH_MIN_DISPARITY",
+            "type"  : "integer",
+            "value" : 0
+        },
+        {
+            "name"  : "MV_3D_DEPTH_MAX_DISPARITY",
+            "type"  : "integer",
+            "value" : 64
+        },
+        {
+            "name" : "MV_3D_DEPTH_STEREO_CONFIG_FILE_PATH",
+            "type"  : "string",
+            "value" : ""
+        },
+        {
+            "name" : "MV_3D_POINTCLOUD_SAMPLING_RATIO",
+            "type"  : "double",
+            "value" : 1.0
+        },
+        {
+            "name" : "MV_3D_POINTCLOUD_OUTLIER_REMOVAL_POINTS",
+            "type"  : "integer",
+            "value" : 0
+        },
+        {
+            "name" : "MV_3D_POINTCLOUD_OUTLIER_REMOVAL_RADIUS",
+            "type"  : "double",
+            "value" : 0.0
+        },
+        {
+            "name" : "MV_3D_POINTCLOUD_OUTPUT_FILE_PATH",
+            "type"  : "string",
+            "value" : "/opt/usr/home/owner/media/Images"
+        },
+        {
+            "name" : "MV_BARCODE_GENERATE_ATTR_DATA_SHAPE",
+            "type"  : "integer",
+            "value" : 0
+        },
+        {
+            "name" : "MV_BARCODE_GENERATE_ATTR_FINDER_SHAPE",
+            "type"  : "integer",
+            "value" : 0
+        },
+        {
+            "name"  : "MV_BARCODE_GENERATE_ATTR_EMBED_IMG_PATH",
+            "type"  : "string",
+            "value" : ""
+        }
+    ]
+}

diff --git a/packaging/capi-media-vision.spec b/packaging/capi-media-vision.spec
index 94ed9e8669e03a4ec2ef3f239dd3772852870228..a9bf982ce16562871c8a96671f05e153863f2baa 100644 (file)
--- a/packaging/capi-media-vision.spec
+++ b/packaging/capi-media-vision.spec
@@ -279,6 +279,9 @@ mkdir -p build
 cd build
 %cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo %{build_options} %{task_group_options} \
  -DTEST_RES_PATH="%{TZ_SYS_HOME}/%{TZ_SYS_DEFAULT_USER}/media/Others/mv_test" \
+%if 0%{?_with_da_profile:1}
+ -DWITH_DA_PROFILE=ON \
+%endif
 %if 0%{?visualizer:1}
  -DBUILD_VISUALIZER=ON \
 %endif