feat(sdk): implement path resolver for unity

homuler · Oct 10, 2020 · 468d444 · 468d444
1 parent 81ff269
commit 468d444
Show file tree

Hide file tree

Showing 20 changed files with 207 additions and 766 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,8 +14,6 @@ obj/
 
 bazel-*
 
-Assets/MediaPipe/SDK/Models/*
-!Assets/MediaPipe/SDK/Models/.gitkeep
+Assets/StreamingAssets*
 Assets/MediaPipe/SDK/Plugins/Protobuf*
-
 Assets/MediaPipe/SDK/Scripts/Protobuf/**/*.cs
diff --git a/Assets/MediaPipe/Examples/Resources/face_detection_desktop_live.txt b/Assets/MediaPipe/Examples/Resources/face_detection_desktop_live.txt
@@ -73,7 +73,7 @@ node {
   output_stream: "TENSORS:detection_tensors"
   node_options: {
     [type.googleapis.com/mediapipe.TfLiteInferenceCalculatorOptions] {
-      model_path: "Assets/MediaPipe/SDK/Models/face_detection_front.tflite"
+      model_path: "mediapipe/models/face_detection_front.tflite"
     }
   }
 }
@@ -154,7 +154,7 @@ node {
   output_stream: "labeled_detections"
   node_options: {
     [type.googleapis.com/mediapipe.DetectionLabelIdToTextCalculatorOptions] {
-      label_map_path: "Assets/MediaPipe/SDK/Models/face_detection_front_labelmap.txt"
+      label_map_path: "mediapipe/models/face_detection_front_labelmap.txt"
     }
   }
 }

diff --git a/Assets/MediaPipe/Examples/Resources/face_detection_mobile_gpu.txt b/Assets/MediaPipe/Examples/Resources/face_detection_mobile_gpu.txt
@@ -73,7 +73,7 @@ node {
   output_stream: "TENSORS_GPU:detection_tensors"
   node_options: {
     [type.googleapis.com/mediapipe.TfLiteInferenceCalculatorOptions] {
-      model_path: "Assets/MediaPipe/SDK/Models/face_detection_front.tflite"
+      model_path: "mediapipe/models/face_detection_front.tflite"
     }
   }
 }
@@ -154,7 +154,7 @@ node {
   output_stream: "labeled_detections"
   node_options: {
     [type.googleapis.com/mediapipe.DetectionLabelIdToTextCalculatorOptions] {
-      label_map_path: "Assets/MediaPipe/SDK/Models/face_detection_front_labelmap.txt"
+      label_map_path: "mediapipe/models/face_detection_front_labelmap.txt"
     }
   }
 }

diff --git a/Assets/MediaPipe/Examples/Resources/hair_segmentation_mobile_gpu.txt b/Assets/MediaPipe/Examples/Resources/hair_segmentation_mobile_gpu.txt
@@ -124,7 +124,7 @@ node {
   input_side_packet: "CUSTOM_OP_RESOLVER:op_resolver"
   node_options: {
     [type.googleapis.com/mediapipe.TfLiteInferenceCalculatorOptions] {
-      model_path: "Assets/MediaPipe/SDK/Models/hair_segmentation.tflite"
+      model_path: "mediapipe/models/hair_segmentation.tflite"
       use_gpu: true
     }
   }

diff --git a/Assets/MediaPipe/Examples/Resources/object_detection_desktop_live.txt b/Assets/MediaPipe/Examples/Resources/object_detection_desktop_live.txt
@@ -77,7 +77,7 @@ node {
   output_stream: "TENSORS:detection_tensors"
   node_options: {
     [type.googleapis.com/mediapipe.TfLiteInferenceCalculatorOptions] {
-      model_path: "Assets/MediaPipe/SDK/Models/ssdlite_object_detection.tflite"
+      model_path: "mediapipe/models/ssdlite_object_detection.tflite"
     }
   }
 }
@@ -160,7 +160,7 @@ node {
   output_stream: "output_detections"
   node_options: {
     [type.googleapis.com/mediapipe.DetectionLabelIdToTextCalculatorOptions] {
-      label_map_path: "Assets/MediaPipe/SDK/Models/ssdlite_object_detection_labelmap.txt"
+      label_map_path: "mediapipe/models/ssdlite_object_detection_labelmap.txt"
     }
   }
 }
diff --git a/Assets/MediaPipe/Examples/Resources/object_detection_mobile_gpu.txt b/Assets/MediaPipe/Examples/Resources/object_detection_mobile_gpu.txt
@@ -78,7 +78,7 @@ node {
   output_stream: "TENSORS_GPU:detection_tensors"
   node_options: {
     [type.googleapis.com/mediapipe.TfLiteInferenceCalculatorOptions] {
-      model_path: "Assets/MediaPipe/SDK/Models/ssdlite_object_detection.tflite"
+      model_path: "mediapipe/models/ssdlite_object_detection.tflite"
     }
   }
 }
@@ -161,7 +161,7 @@ node {
   output_stream: "output_detections"
   node_options: {
     [type.googleapis.com/mediapipe.DetectionLabelIdToTextCalculatorOptions] {
-      label_map_path: "Assets/MediaPipe/SDK/Models/ssdlite_object_detection_labelmap.txt"
+      label_map_path: "mediapipe/models/ssdlite_object_detection_labelmap.txt"
     }
   }
 }
diff --git a/Assets/MediaPipe/Examples/Scripts/SceneDirector.cs b/Assets/MediaPipe/Examples/Scripts/SceneDirector.cs
@@ -34,6 +34,7 @@ public class SceneDirector : MonoBehaviour {
     }
 
     UnsafeNativeMethods.InitGoogleLogging(nameForGlog, logDir);
+    ResourceUtil.SetResourceRootPath(Application.streamingAssetsPath);
   }
 
   void Start() {

diff --git a/Assets/MediaPipe/SDK/Models.meta b/Assets/MediaPipe/SDK/Models.meta
diff --git a/Assets/MediaPipe/SDK/Models/.gitkeep b/Assets/MediaPipe/SDK/Models/.gitkeep
diff --git a/Assets/MediaPipe/SDK/Scripts/ResourceUtil.cs b/Assets/MediaPipe/SDK/Scripts/ResourceUtil.cs
@@ -0,0 +1,7 @@
+namespace Mediapipe {
+  public class ResourceUtil {
+    public static void SetResourceRootPath(string path) {
+      UnsafeNativeMethods.MpSetResourceRootPath(path);
+    }
+  }
+}
diff --git a/Assets/MediaPipe/SDK/Scripts/ResourceUtil.cs.meta b/Assets/MediaPipe/SDK/Scripts/ResourceUtil.cs.meta
diff --git a/Assets/MediaPipe/SDK/Scripts/UnsafeNativeMethods.cs b/Assets/MediaPipe/SDK/Scripts/UnsafeNativeMethods.cs
@@ -344,6 +344,11 @@ internal static class UnsafeNativeMethods {
     public static extern unsafe MpNormalizedRectVector MpPacketGetNormalizedRectVector(MpPacket packet);
 
 
+    /// Resource Util API
+    [DllImport (MediaPipeLibrary)]
+    public static extern unsafe void MpSetResourceRootPath(string path);
+
+
     /// SidePacket API
 
     [DllImport (MediaPipeLibrary)]

diff --git a/C/mediapipe_api/BUILD b/C/mediapipe_api/BUILD
@@ -12,6 +12,7 @@ cc_library(
         "//mediapipe_api/framework/formats:landmark",
         "//mediapipe_api/framework/formats:rect",
         "//mediapipe_api/framework/port:logging",
+        "//mediapipe_api/util:resource_util",
     ] + select({
         "@com_google_mediapipe//mediapipe/gpu:disable_gpu": [],
         "//conditions:default": [

diff --git a/C/mediapipe_api/util/BUILD b/C/mediapipe_api/util/BUILD
@@ -0,0 +1,11 @@
+cc_library(
+    name = "resource_util",
+    srcs = ["resource_util.cc"],
+    hdrs = ["resource_util.h"],
+    deps = [
+      "@com_google_mediapipe//mediapipe/util:resource_util",
+      "//mediapipe_api:common",
+    ],
+    visibility = ["//visibility:public"],
+    alwayslink = True,
+)
diff --git a/C/mediapipe_api/util/resource_util.cc b/C/mediapipe_api/util/resource_util.cc
@@ -0,0 +1,6 @@
+#include <string>
+#include "mediapipe_api/util/resource_util.h"
+
+void MpSetResourceRootPath(const char* path) {
+  mediapipe::SetResourceRootPath(std::string(path));
+}
diff --git a/C/mediapipe_api/util/resource_util.h b/C/mediapipe_api/util/resource_util.h
@@ -0,0 +1,13 @@
+#ifndef C_MEDIAPIPE_API_UTIL_RESOURCE_UTIL_H_
+#define C_MEDIAPIPE_API_UTIL_RESOURCE_UTIL_H_
+
+#include "mediapipe/util/resource_util.h"
+#include "mediapipe_api/common.h"
+
+extern "C" {
+
+MP_CAPI_EXPORT extern void MpSetResourceRootPath(const char* path);
+
+}  // extern "C"
+
+#endif  // C_MEDIAPIPE_API_UTIL_RESOURCE_UTIL_H_