fix: the sync mode fails when trying to get the ImageFrame result (#1142

) * fix: failed to get ImageFrame * refactor: remove the fallback Packet.Get method
homuler · Jan 30, 2024 · b6961e5 · b6961e5
1 parent 3753fdf
commit b6961e5
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 12 deletions.
diff --git a/Assets/MediaPipeUnity/Samples/Common/Scripts/GraphRunner.cs b/Assets/MediaPipeUnity/Samples/Common/Scripts/GraphRunner.cs
@@ -206,11 +206,6 @@ protected void AddTextureFrameToInputStream(string streamName, TextureFrame text
       AddPacketToInputStream(streamName, Packet.CreateImageFrameAt(imageFrame, latestTimestamp));
     }
 
-    protected bool TryGetValue<T>(Packet<T> packet, out T value)
-    {
-      return TryGetValue(packet, out value, (packet) => packet.Get());
-    }
-
     protected bool TryGetValue<T>(Packet<T> packet, out T value, Func<Packet<T>, T> getter)
     {
       if (packet == null)

diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Hair Segmentation/HairSegmentationGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Hair Segmentation/HairSegmentationGraph.cs
@@ -54,7 +54,10 @@ public async Task<ImageFrame> WaitNext()
       var result = await _hairMaskStream.WaitNextAsync();
       AssertResult(result);
 
-      _ = TryGetValue(result.packet, out var hairMask);
+      _ = TryGetValue(result.packet, out var hairMask, (packet) =>
+      {
+        return packet.Get();
+      });
       return hairMask;
     }
 

diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Holistic/HolisticTrackingGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Holistic/HolisticTrackingGraph.cs
@@ -216,7 +216,10 @@ public async Task<HolisticTrackingResult> WaitNextAsync()
       {
         return packet.Get(LandmarkList.Parser);
       });
-      _ = TryGetValue(results.Item7.packet, out var segmentationMask);
+      _ = TryGetValue(results.Item7.packet, out var segmentationMask, (packet) =>
+      {
+        return packet.Get();
+      });
       _ = TryGetValue(results.Item8.packet, out var poseRoi, (packet) =>
       {
         return packet.Get(NormalizedRect.Parser);

diff --git a/Assets/MediaPipeUnity/Samples/Scenes/MediaPipe Video/MediaPipeVideoGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/MediaPipe Video/MediaPipeVideoGraph.cs
@@ -71,7 +71,10 @@ public async Task<ImageFrame> WaitNextAsync()
       var result = await _outputVideoStream.WaitNextAsync();
       AssertResult(result);
 
-      _ = TryGetValue(result.packet, out var outputVideo);
+      _ = TryGetValue(result.packet, out var outputVideo, (packet) =>
+      {
+        return packet.Get();
+      });
       return outputVideo;
     }
 

diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Pose Tracking/PoseTrackingGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Pose Tracking/PoseTrackingGraph.cs
@@ -159,7 +159,10 @@ public async Task<PoseTrackingResult> WaitNextAsync()
       {
         return packet.Get(LandmarkList.Parser);
       });
-      _ = TryGetValue(results.Item4.packet, out var segmentationMask);
+      _ = TryGetValue(results.Item4.packet, out var segmentationMask, (packet) =>
+      {
+        return packet.Get();
+      });
       _ = TryGetValue(results.Item5.packet, out var roiFromLandmarks, (packet) =>
       {
         return packet.Get(NormalizedRect.Parser);

diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Selfie Segmentation/SelfieSegmentationGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Selfie Segmentation/SelfieSegmentationGraph.cs
@@ -50,7 +50,10 @@ public async Task<ImageFrame> WaitNextAsync()
       var result = await _segmentationMaskStream.WaitNextAsync();
       AssertResult(result);
 
-      _ = TryGetValue(result.packet, out var segmentationMask);
+      _ = TryGetValue(result.packet, out var segmentationMask, (packet) =>
+      {
+        return packet.Get();
+      });
       return segmentationMask;
     }
 

diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/PacketGetterExtension.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/PacketGetterExtension.cs
@@ -505,7 +505,5 @@ public static string Get(this Packet<string> packet)
 
     [Obsolete("Use Get instead")]
     public static string GetString(this Packet<string> packet) => Get(packet);
-
-    public static T Get<T>(this Packet<T> packet) => throw new NotImplementedException();
   }
 }