diff --git a/Mediapipe.Net.Examples.FaceMeshGpu/Program.cs b/Mediapipe.Net.Examples.FaceMeshGpu/Program.cs index e9f7e14a..bf1c78a0 100644 --- a/Mediapipe.Net.Examples.FaceMeshGpu/Program.cs +++ b/Mediapipe.Net.Examples.FaceMeshGpu/Program.cs @@ -82,7 +82,6 @@ public static void Main(string[] args) cFrame.Width, cFrame.Height, cFrame.WidthStep, cFrame.RawData); using ImageFrame img = calculator.Send(imgframe); - imgframe.Dispose(); } } diff --git a/Mediapipe.Net.Examples.OsuFrameworkVisualTests/MediapipeDrawable.cs b/Mediapipe.Net.Examples.OsuFrameworkVisualTests/MediapipeDrawable.cs index 34bc2037..6caa8f65 100644 --- a/Mediapipe.Net.Examples.OsuFrameworkVisualTests/MediapipeDrawable.cs +++ b/Mediapipe.Net.Examples.OsuFrameworkVisualTests/MediapipeDrawable.cs @@ -64,7 +64,6 @@ protected override unsafe void Update() ImageFrame imgFrame = new ImageFrame(ImageFormat.Srgba, cFrame.Width, cFrame.Height, cFrame.WidthStep, cFrame.RawData); using ImageFrame outImgFrame = calculator.Send(imgFrame); - imgFrame.Dispose(); var span = new ReadOnlySpan(outImgFrame.MutablePixelData, outImgFrame.Height * outImgFrame.WidthStep); var pixelData = Image.LoadPixelData(span, cFrame.Width, cFrame.Height); diff --git a/Mediapipe.Net/Calculators/Calculator.cs b/Mediapipe.Net/Calculators/Calculator.cs index c94a9699..f7d75675 100644 --- a/Mediapipe.Net/Calculators/Calculator.cs +++ b/Mediapipe.Net/Calculators/Calculator.cs @@ -29,7 +29,7 @@ public abstract class Calculator : Disposable protected readonly string? SecondaryOutputStream; protected readonly CalculatorGraph Graph; - private GCHandle observeStreamHandle; + private GCHandle? observeStreamHandle; /// /// Triggered every time the calculator returns a secondary output. @@ -53,7 +53,8 @@ protected Calculator(string graphPath, string? secondaryOutputStream = null) T secondaryOutput = packet.Get(); OnResult?.Invoke(this, secondaryOutput); return Status.Ok(); - }, out observeStreamHandle).AssertOk(); + }, out GCHandle handle).AssertOk(); + observeStreamHandle = handle; } } @@ -70,12 +71,18 @@ protected Calculator(string graphPath, string? secondaryOutputStream = null) /// /// If the input doesn't get disposed after being sent, MediaPipe will crash. /// The frame that MediaPipe should process. + /// Whether or not to dispose the source frame. /// An with the contents of the source and the MediaPipe solution drawn. - public ImageFrame Send(ImageFrame frame) + public ImageFrame Send(ImageFrame frame, bool disposeSourceFrame = true) { - ImageFrame outFrame = SendFrame(frame); - CurrentFrame++; - return outFrame; + lock (frame) + { + ImageFrame outFrame = SendFrame(frame); + CurrentFrame++; + if (disposeSourceFrame) + frame.Dispose(); + return outFrame; + } } /// @@ -89,7 +96,7 @@ protected override void DisposeManaged() Graph.WaitUntilDone(); Graph.Dispose(); - observeStreamHandle.Free(); + observeStreamHandle?.Free(); } } } diff --git a/Mediapipe.Net/Calculators/HolisticCpuCalculator.cs b/Mediapipe.Net/Calculators/HolisticCpuCalculator.cs new file mode 100644 index 00000000..e482fe9b --- /dev/null +++ b/Mediapipe.Net/Calculators/HolisticCpuCalculator.cs @@ -0,0 +1,16 @@ +// Copyright (c) homuler and The Vignette Authors +// This file is part of MediaPipe.NET. +// MediaPipe.NET is licensed under the MIT License. See LICENSE for details. + +using Mediapipe.Net.Framework.Packet; + +namespace Mediapipe.Net.Calculators +{ + public sealed class HolisticCpuCalculator : CpuCalculator + { + public HolisticCpuCalculator() : base( + graphPath: "mediapipe/graphs/holistic_tracking/holistic_tracking_cpu.pbtxt") + { + } + } +} diff --git a/Mediapipe.Net/Calculators/HolisticGpuCalculator.cs b/Mediapipe.Net/Calculators/HolisticGpuCalculator.cs new file mode 100644 index 00000000..b8c213be --- /dev/null +++ b/Mediapipe.Net/Calculators/HolisticGpuCalculator.cs @@ -0,0 +1,16 @@ +// Copyright (c) homuler and The Vignette Authors +// This file is part of MediaPipe.NET. +// MediaPipe.NET is licensed under the MIT License. See LICENSE for details. + +using Mediapipe.Net.Framework.Packet; + +namespace Mediapipe.Net.Calculators +{ + public sealed class HolisticGpuCalculator : CpuCalculator + { + public HolisticGpuCalculator() : base( + graphPath: "mediapipe/graphs/holistic_tracking/holistic_tracking_gpu.pbtxt") + { + } + } +}