fix(sample): dispose OutputStream if only it exists (#564)

homuler · May 12, 2022 · dcee215 · dcee215
1 parent f4301af
commit dcee215
Show file tree

Hide file tree

Showing 14 changed files with 70 additions and 36 deletions.
diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Box Tracking/BoxTrackingGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Box Tracking/BoxTrackingGraph.cs
@@ -32,7 +32,7 @@ public override void StartRun(ImageSource imageSource)
 
     public override void Stop()
     {
-      _trackedDetectionsStream.RemoveAllListeners();
+      _trackedDetectionsStream?.Close();
       _trackedDetectionsStream = null;
       base.Stop();
     }

diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Face Detection/FaceDetectionGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Face Detection/FaceDetectionGraph.cs
@@ -50,7 +50,7 @@ public override void StartRun(ImageSource imageSource)
 
     public override void Stop()
     {
-      _faceDetectionsStream.RemoveAllListeners();
+      _faceDetectionsStream?.Close();
       _faceDetectionsStream = null;
       base.Stop();
     }

diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Face Mesh/FaceMeshGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Face Mesh/FaceMeshGraph.cs
@@ -82,13 +82,13 @@ public override void StartRun(ImageSource imageSource)
 
     public override void Stop()
     {
-      _faceDetectionsStream.RemoveAllListeners();
+      _faceDetectionsStream?.Close();
       _faceDetectionsStream = null;
-      _multiFaceLandmarksStream.RemoveAllListeners();
+      _multiFaceLandmarksStream?.Close();
       _multiFaceLandmarksStream = null;
-      _faceRectsFromLandmarksStream.RemoveAllListeners();
+      _faceRectsFromLandmarksStream?.Close();
       _faceRectsFromLandmarksStream = null;
-      _faceRectsFromDetectionsStream.RemoveAllListeners();
+      _faceRectsFromDetectionsStream?.Close();
       _faceRectsFromDetectionsStream = null;
       base.Stop();
     }

diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Hair Segmentation/HairSegmentationGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Hair Segmentation/HairSegmentationGraph.cs
@@ -37,7 +37,7 @@ public override void StartRun(ImageSource imageSource)
 
     public override void Stop()
     {
-      _hairMaskStream.RemoveAllListeners();
+      _hairMaskStream?.Close();
       _hairMaskStream = null;
       base.Stop();
     }

diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Hand Tracking/HandTrackingGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Hand Tracking/HandTrackingGraph.cs
@@ -105,17 +105,17 @@ public override void StartRun(ImageSource imageSource)
 
     public override void Stop()
     {
-      _palmDetectionsStream.RemoveAllListeners();
+      _palmDetectionsStream?.Close();
       _palmDetectionsStream = null;
-      _handRectsFromPalmDetectionsStream.RemoveAllListeners();
+      _handRectsFromPalmDetectionsStream?.Close();
       _handRectsFromPalmDetectionsStream = null;
-      _handLandmarksStream.RemoveAllListeners();
+      _handLandmarksStream?.Close();
       _handLandmarksStream = null;
-      _handWorldLandmarksStream.RemoveAllListeners();
+      _handWorldLandmarksStream?.Close();
       _handWorldLandmarksStream = null;
-      _handRectsFromLandmarksStream.RemoveAllListeners();
+      _handRectsFromLandmarksStream?.Close();
       _handRectsFromLandmarksStream = null;
-      _handednessStream.RemoveAllListeners();
+      _handednessStream?.Close();
       _handednessStream = null;
       base.Stop();
     }

diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Holistic/HolisticTrackingGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Holistic/HolisticTrackingGraph.cs
@@ -128,21 +128,21 @@ public override void StartRun(ImageSource imageSource)
 
     public override void Stop()
     {
-      _poseDetectionStream.RemoveAllListeners();
+      _poseDetectionStream?.Close();
       _poseDetectionStream = null;
-      _poseLandmarksStream.RemoveAllListeners();
+      _poseLandmarksStream?.Close();
       _poseLandmarksStream = null;
-      _faceLandmarksStream.RemoveAllListeners();
+      _faceLandmarksStream?.Close();
       _faceLandmarksStream = null;
-      _leftHandLandmarksStream.RemoveAllListeners();
+      _leftHandLandmarksStream?.Close();
       _leftHandLandmarksStream = null;
-      _rightHandLandmarksStream.RemoveAllListeners();
+      _rightHandLandmarksStream?.Close();
       _rightHandLandmarksStream = null;
-      _poseWorldLandmarksStream.RemoveAllListeners();
+      _poseWorldLandmarksStream?.Close();
       _poseWorldLandmarksStream = null;
-      _segmentationMaskStream.RemoveAllListeners();
+      _segmentationMaskStream?.Close();
       _segmentationMaskStream = null;
-      _poseRoiStream.RemoveAllListeners();
+      _poseRoiStream?.Close();
       _poseRoiStream = null;
       base.Stop();
     }

diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Instant Motion Tracking/RegionTrackingGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Instant Motion Tracking/RegionTrackingGraph.cs
@@ -39,7 +39,7 @@ public override void StartRun(ImageSource imageSource)
 
     public override void Stop()
     {
-      _trackedAnchorDataStream.RemoveAllListeners();
+      _trackedAnchorDataStream?.Close();
       _trackedAnchorDataStream = null;
       base.Stop();
     }

diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Iris Tracking/IrisTrackingGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Iris Tracking/IrisTrackingGraph.cs
@@ -52,11 +52,11 @@ public override void StartRun(ImageSource imageSource)
 
     public override void Stop()
     {
-      _faceDetectionsStream.RemoveAllListeners();
+      _faceDetectionsStream?.Close();
       _faceDetectionsStream = null;
-      _faceRectStream.RemoveAllListeners();
+      _faceRectStream?.Close();
       _faceRectStream = null;
-      _faceLandmarksWithIrisStream.RemoveAllListeners();
+      _faceLandmarksWithIrisStream?.Close();
       _faceLandmarksWithIrisStream = null;
       base.Stop();
     }

diff --git a/Assets/MediaPipeUnity/Samples/Scenes/MediaPipe Video/MediaPipeVideoGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/MediaPipe Video/MediaPipeVideoGraph.cs
@@ -41,7 +41,7 @@ public override void StartRun(ImageSource imageSource)
 
     public override void Stop()
     {
-      _outputVideoStream.RemoveAllListeners();
+      _outputVideoStream?.Close();
       _outputVideoStream = null;
       base.Stop();
     }

diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Object Detection/ObjectDetectionGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Object Detection/ObjectDetectionGraph.cs
@@ -33,7 +33,7 @@ public override void StartRun(ImageSource imageSource)
 
     public override void Stop()
     {
-      _outputDetectionsStream.RemoveAllListeners();
+      _outputDetectionsStream?.Close();
       _outputDetectionsStream = null;
       base.Stop();
     }

diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Objectron/ObjectronGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Objectron/ObjectronGraph.cs
@@ -100,11 +100,11 @@ public override void StartRun(ImageSource imageSource)
 
     public override void Stop()
     {
-      _liftedObjectsStream.RemoveAllListeners();
+      _liftedObjectsStream?.Close();
       _liftedObjectsStream = null;
-      _multiBoxRectsStream.RemoveAllListeners();
+      _multiBoxRectsStream?.Close();
       _multiBoxRectsStream = null;
-      _multiBoxLandmarksStream.RemoveAllListeners();
+      _multiBoxLandmarksStream?.Close();
       _multiBoxLandmarksStream = null;
       base.Stop();
     }

diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Pose Tracking/PoseTrackingGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Pose Tracking/PoseTrackingGraph.cs
@@ -99,15 +99,15 @@ public override void StartRun(ImageSource imageSource)
 
     public override void Stop()
     {
-      _poseDetectionStream.RemoveAllListeners();
+      _poseDetectionStream?.Close();
       _poseDetectionStream = null;
-      _poseLandmarksStream.RemoveAllListeners();
+      _poseLandmarksStream?.Close();
       _poseLandmarksStream = null;
-      _poseWorldLandmarksStream.RemoveAllListeners();
+      _poseWorldLandmarksStream?.Close();
       _poseWorldLandmarksStream = null;
-      _segmentationMaskStream.RemoveAllListeners();
+      _segmentationMaskStream?.Close();
       _segmentationMaskStream = null;
-      _roiFromLandmarksStream.RemoveAllListeners();
+      _roiFromLandmarksStream?.Close();
       _roiFromLandmarksStream = null;
       base.Stop();
     }

diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Selfie Segmentation/SelfieSegmentationGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Selfie Segmentation/SelfieSegmentationGraph.cs
@@ -33,7 +33,7 @@ public override void StartRun(ImageSource imageSource)
 
     public override void Stop()
     {
-      _segmentationMaskStream.RemoveAllListeners();
+      _segmentationMaskStream?.Close();
       _segmentationMaskStream = null;
       base.Stop();
     }

diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Unity/OutputStream.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Unity/OutputStream.cs
@@ -178,6 +178,25 @@ public void RemoveAllListeners()
       OnReceived = null;
     }
 
+    public void Close()
+    {
+      RemoveAllListeners();
+      RemoveCallbackStatus();
+
+      _poller?.Dispose();
+      _poller = null;
+      _outputPacket?.Dispose();
+      _outputPacket = null;
+
+      _presencePoller?.Dispose();
+      _presencePoller = null;
+      _presencePacket?.Dispose();
+      _presencePacket = null;
+
+      _referencePacket?.Dispose();
+      _referencePacket = null;
+    }
+
     /// <summary>
     ///   Gets the next value from the stream.
     ///   This method drops a packet whose timestamp is less than <paramref name="timestampThreshold" />.
@@ -432,6 +451,21 @@ protected IntPtr GetPinnedStatusPtr(Status status)
       return _callbackStatus.mpPtr;
     }
 
+    protected void RemoveCallbackStatus()
+    {
+      _callbackStatus?.Dispose();
+      _callbackStatus = null;
+
+      lock (((ICollection)_CallbackStatus).SyncRoot)
+      {
+        if (_CallbackStatus.TryGetValue(_id, out var status))
+        {
+          status.Dispose();
+        }
+        var _ = _CallbackStatus.Remove(_id);
+      }
+    }
+
     protected static void CompressCallbackStatus()
     {
       lock (((ICollection)_CallbackStatus).SyncRoot)