fix: modelAssetBuffer cannot be specified (#1084)

* fix: model asset path is always set

* test: add basic FaceDetector tests

* refactor: DetectionResult.Empty

* refactor: set ImageProcessingOptions null by default if possible

* ci: cache PackageResources

* test: read textures synchronously

* refactor: cache an empty result on the caller site

.github/workflows/linux-test.yml

@@ -19,8 +19,6 @@ jobs:
         with:
           ref: ${{ inputs.ref }}
 
-
-
       # Cache built libraries
       - name: Concat native library source files
         run: |
@@ -34,6 +32,8 @@ jobs:
             Packages/com.github.homuler.mediapipe/Runtime/Plugins/libmediapipe_c.so
             Packages/com.github.homuler.mediapipe/Runtime/Plugins/Protobuf/*.dll
             Packages/com.github.homuler.mediapipe/Runtime/Scripts/Protobuf/**/*.cs
+            Packages/com.github.homuler.mediapipe/PackageResources/MediaPipe/*.bytes
+            Packages/com.github.homuler.mediapipe/PackageResources/MediaPipe/*.txt
           key: libs-ubuntu-20.04-v1-${{ hashFiles('cache_key.txt') }}
 
       # Setup build tools

.github/workflows/macos-test.yml

@@ -32,6 +32,8 @@ jobs:
             Packages/com.github.homuler.mediapipe/Runtime/Plugins/libmediapipe_c.dylib
             Packages/com.github.homuler.mediapipe/Runtime/Plugins/Protobuf/*.dll
             Packages/com.github.homuler.mediapipe/Runtime/Scripts/Protobuf/**/*.cs
+            Packages/com.github.homuler.mediapipe/PackageResources/MediaPipe/*.bytes
+            Packages/com.github.homuler.mediapipe/PackageResources/MediaPipe/*.txt
           key: libs-macos-11-v1-${{ hashFiles('cache_key.txt') }}
 
       # Setup build tools

.github/workflows/windows-test.yml

@@ -33,6 +33,8 @@ jobs:
             Packages/com.github.homuler.mediapipe/Runtime/Plugins/mediapipe_c.dll
             Packages/com.github.homuler.mediapipe/Runtime/Plugins/Protobuf/*.dll
             Packages/com.github.homuler.mediapipe/Runtime/Scripts/Protobuf/**/*.cs
+            Packages/com.github.homuler.mediapipe/PackageResources/MediaPipe/*.bytes
+            Packages/com.github.homuler.mediapipe/PackageResources/MediaPipe/*.txt
           key: libs-windows-2019-v1-${{ hashFiles('cache_key.txt') }}
 
       - name: Remove cache_key.txt

Assets/MediaPipeUnity/Samples/Scenes/Tasks/Face Detection/FaceDetectorRunner.cs

@@ -101,7 +101,7 @@ protected override IEnumerator Run()
             else
             {
               // clear the annotation
-              _detectionResultAnnotationController.DrawNow(FaceDetectionResult.Empty);
+              _detectionResultAnnotationController.DrawNow(default);
             }
             break;
           case Tasks.Vision.Core.RunningMode.VIDEO:
@@ -112,7 +112,7 @@ protected override IEnumerator Run()
             else
             {
               // clear the annotation
-              _detectionResultAnnotationController.DrawNow(FaceDetectionResult.Empty);
+              _detectionResultAnnotationController.DrawNow(default);
             }
             break;
           case Tasks.Vision.Core.RunningMode.LIVE_STREAM:

Packages/com.github.homuler.mediapipe/Runtime/Scripts/Tasks/Components/Containers/DetectionResult.cs

@@ -117,18 +117,18 @@ internal DetectionResult(List<Detection> detections)
 
     public void Clear() => detections.Clear();
 
-    public static readonly DetectionResult Empty = new DetectionResult(new List<Detection>());
+    public static DetectionResult Empty => Alloc(0);
 
     public static DetectionResult Alloc(int capacity) => new DetectionResult(new List<Detection>(capacity));
 
-    public static DetectionResult CreateFrom(List<Mediapipe.Detection> detectionsProto)
+    internal static DetectionResult CreateFrom(List<Mediapipe.Detection> detectionsProto)
     {
       var result = Alloc(detectionsProto.Count);
       Copy(detectionsProto, ref result);
       return result;
     }
 
-    public static void Copy(List<Mediapipe.Detection> source, ref DetectionResult destination)
+    internal static void Copy(List<Mediapipe.Detection> source, ref DetectionResult destination)
     {
       var detections = destination.detections;
       if (source.Count < detections.Count)

Packages/com.github.homuler.mediapipe/Runtime/Scripts/Tasks/Core/BaseOptions.cs

@@ -18,7 +18,7 @@ public enum Delegate
     public string modelAssetPath { get; } = string.Empty;
     public byte[] modelAssetBuffer { get; } = null;
 
-    public BaseOptions(Delegate delegateCase = Delegate.CPU, string modelAssetPath = "", byte[] modelAssetBuffer = null)
+    public BaseOptions(Delegate delegateCase = Delegate.CPU, string modelAssetPath = null, byte[] modelAssetBuffer = null)
     {
       this.delegateCase = delegateCase;
       this.modelAssetPath = modelAssetPath;

Packages/com.github.homuler.mediapipe/Runtime/Scripts/Tasks/Vision/FaceDetector/FaceDetector.cs

@@ -32,6 +32,8 @@ public sealed class FaceDetector : Core.BaseVisionTaskApi
     private readonly NormalizedRect _normalizedRect = new NormalizedRect();
     private readonly List<Detection> _detectionsForRead;
 
+    private readonly FaceDetectionResult _emptyResult = FaceDetectionResult.Alloc(0);
+
     private FaceDetector(
       CalculatorGraphConfig graphConfig,
       Core.RunningMode runningMode,
@@ -99,12 +101,13 @@ public static FaceDetector CreateFromOptions(FaceDetectorOptions options)
     ///   frame of reference coordinates system, i.e. in `[0,image_width) x [0,
     ///   image_height)`, which are the dimensions of the underlying image data.
     /// </returns>
-    public FaceDetectionResult Detect(Image image, Core.ImageProcessingOptions? imageProcessingOptions)
+    public FaceDetectionResult Detect(Image image, Core.ImageProcessingOptions? imageProcessingOptions = null)
     {
       using var outDetectionsPacket = DetectInternal(image, imageProcessingOptions);
       if (outDetectionsPacket.IsEmpty())
       {
-        return FaceDetectionResult.Empty;
+        _emptyResult.Clear();
+        return _emptyResult;
       }
       outDetectionsPacket.GetDetectionList(_detectionsForRead);
       return FaceDetectionResult.CreateFrom(_detectionsForRead);
@@ -167,12 +170,13 @@ private Packet DetectInternal(Image image, Core.ImageProcessingOptions? imagePro
     ///   frame of reference coordinates system, i.e. in `[0,image_width) x [0,
     ///   image_height)`, which are the dimensions of the underlying image data.
     /// </returns>
-    public FaceDetectionResult DetectForVideo(Image image, int timestampMs, Core.ImageProcessingOptions? imageProcessingOptions)
+    public FaceDetectionResult DetectForVideo(Image image, int timestampMs, Core.ImageProcessingOptions? imageProcessingOptions = null)
     {
       using var outDetectionsPacket = DetectVideoInternal(image, timestampMs, imageProcessingOptions);
       if (outDetectionsPacket.IsEmpty())
       {
-        return FaceDetectionResult.Empty;
+        _emptyResult.Clear();
+        return _emptyResult;
       }
       outDetectionsPacket.GetDetectionList(_detectionsForRead);
       return FaceDetectionResult.CreateFrom(_detectionsForRead);
@@ -258,6 +262,7 @@ private static Tasks.Core.TaskRunner.PacketsCallback BuildPacketsCallback(FaceDe
       }
 
       var result = FaceDetectionResult.Alloc(options.numFaces);
+      var emptyResult = FaceDetectionResult.Alloc(0);
 
       return (PacketMap outputPackets) =>
       {
@@ -277,8 +282,9 @@ private static Tasks.Core.TaskRunner.PacketsCallback BuildPacketsCallback(FaceDe
 
         if (outDetectionsPacket.IsEmpty())
         {
+          emptyResult.Clear();
           resultCallback(
-            FaceDetectionResult.Empty,
+            emptyResult,
             image,
             (int)timestamp);
           return;