fix: acquire a lock when drawing DetectionResult annotations (#1306)

homuler · Jan 12, 2025 · c8f61ce · c8f61ce
1 parent d80f33a
commit c8f61ce
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 3 deletions.
diff --git a/...m.github.homuler.mediapipe/Runtime/Scripts/Tasks/Components/Containers/DetectionResult.cs b/...m.github.homuler.mediapipe/Runtime/Scripts/Tasks/Components/Containers/DetectionResult.cs
@@ -113,6 +113,29 @@ internal static void Copy(in NativeDetection source, ref Detection destination)
       destination = new Detection(categories, boundingBox, keypoints);
     }
 
+    public void CloneTo(ref Detection destination)
+    {
+      if (categories == null)
+      {
+        destination = default;
+        return;
+      }
+
+      var dstCategories = destination.categories ?? new List<Category>(categories.Count);
+      dstCategories.Clear();
+      dstCategories.AddRange(categories);
+
+      var dstKeypoints = destination.keypoints;
+      if (keypoints != null)
+      {
+        dstKeypoints ??= new List<NormalizedKeypoint>(keypoints.Count);
+        dstKeypoints.Clear();
+        dstKeypoints.AddRange(keypoints);
+      }
+
+      destination = new Detection(dstCategories, boundingBox, dstKeypoints);
+    }
+
     public override string ToString()
       => $"{{ \"categories\": {Util.Format(categories)}, \"boundingBox\": {boundingBox}, \"keypoints\": {Util.Format(keypoints)} }}";
   }
@@ -173,6 +196,20 @@ internal static void Copy(NativeDetectionResult source, ref DetectionResult dest
       destination = new DetectionResult(detections);
     }
 
+    public void CloneTo(ref DetectionResult destination)
+    {
+      if (detections == null)
+      {
+        destination = default;
+        return;
+      }
+
+      var dstDetections = destination.detections ?? new List<Detection>(detections.Count);
+      dstDetections.CopyFrom(detections);
+
+      destination = new DetectionResult(dstDetections);
+    }
+
     public override string ToString() => $"{{ \"detections\": {Util.Format(detections)} }}";
   }
 }
diff --git a/...com.github.homuler.mediapipe/Runtime/Scripts/Tasks/Components/Containers/ListExtension.cs b/...com.github.homuler.mediapipe/Runtime/Scripts/Tasks/Components/Containers/ListExtension.cs
@@ -23,6 +23,19 @@ public static void CopyFrom(this List<Classifications> target, List<Classificati
       }
     }
 
+    public static void CopyFrom(this List<Detection> target, List<Detection> source)
+    {
+      target.ResizeTo(source.Count);
+
+      var i = 0;
+      foreach (var x in source)
+      {
+        var v = target[i];
+        x.CloneTo(ref v);
+        target[i++] = v;
+      }
+    }
+
     public static void CopyFrom(this List<Landmarks> target, List<Landmarks> source)
     {
       target.ResizeTo(source.Count);

diff --git a/...homuler.mediapipe/Runtime/Scripts/Unity/Annotation/DetectionResultAnnotationController.cs b/...homuler.mediapipe/Runtime/Scripts/Unity/Annotation/DetectionResultAnnotationController.cs
@@ -14,6 +14,7 @@ public class DetectionResultAnnotationController : AnnotationController<Detectio
   {
     [SerializeField, Range(0, 1)] private float _threshold = 0.0f;
 
+    private readonly object _currentTargetLock = new object();
     private mptcc.DetectionResult _currentTarget;
 
     public void DrawNow(mptcc.DetectionResult target)
@@ -22,12 +23,24 @@ public void DrawNow(mptcc.DetectionResult target)
       SyncNow();
     }
 
-    public void DrawLater(mptcc.DetectionResult target) => UpdateCurrentTarget(target, ref _currentTarget);
+    public void DrawLater(mptcc.DetectionResult target) => UpdateCurrentTarget(target);
+
+    protected void UpdateCurrentTarget(mptcc.DetectionResult newTarget)
+    {
+      lock (_currentTargetLock)
+      {
+        newTarget.CloneTo(ref _currentTarget);
+        isStale = true;
+      }
+    }
 
     protected override void SyncNow()
     {
-      isStale = false;
-      annotation.Draw(_currentTarget, imageSize, _threshold);
+      lock (_currentTargetLock)
+      {
+        isStale = false;
+        annotation.Draw(_currentTarget, imageSize, _threshold);
+      }
     }
   }
 }