Add Memory<float> for ProcessAsync (#62)

sandrohanea · Jun 4, 2023 · 22576a6 · 22576a6
1 parent 09ae26a
commit 22576a6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Whisper.net/Whisper.net.csproj b/Whisper.net/Whisper.net.csproj
@@ -31,6 +31,7 @@
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
 		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
+    <PackageReference Include="System.Memory" Version="4.5.1" />
 	</ItemGroup>
 
 </Project>
diff --git a/Whisper.net/WhisperProcessor.cs b/Whisper.net/WhisperProcessor.cs
@@ -144,7 +144,7 @@ public async IAsyncEnumerable<SegmentData> ProcessAsync(Stream waveStream, [Enum
         }
     }
 
-    public async IAsyncEnumerable<SegmentData> ProcessAsync(float[] samples, [EnumeratorCancellation] CancellationToken cancellationToken = default)
+    public async IAsyncEnumerable<SegmentData> ProcessAsync(Memory<float> samples, [EnumeratorCancellation] CancellationToken cancellationToken = default)
     {
         var resetEvent = new AsyncAutoResetEvent();
         var buffer = new ConcurrentQueue<SegmentData>();
@@ -192,6 +192,11 @@ await Task.WhenAny(whisperTask, resetEvent.WaitAsync())
         }
     }
 
+#pragma warning disable IDE0022 // Use block body for method
+    public IAsyncEnumerable<SegmentData> ProcessAsync(float[] samples, [EnumeratorCancellation] CancellationToken cancellationToken = default) =>
+        ProcessAsync(new Memory<float>(samples), cancellationToken);
+#pragma warning restore IDE0022 // Use block body for method
+
     public void Dispose()
     {
         if (processingSemaphore.CurrentCount == 0)
@@ -216,15 +221,15 @@ public void Dispose()
         isDisposed = true;
     }
 
-    private unsafe Task ProcessInternalAsync(float[] samples, CancellationToken cancellationToken)
+    private unsafe Task ProcessInternalAsync(Memory<float> samples, CancellationToken cancellationToken)
     {
         if (isDisposed)
         {
             throw new ObjectDisposedException("This processor has already been disposed.");
         }
         return Task.Factory.StartNew(() =>
         {
-            fixed (float* pData = samples)
+            fixed (float* pData = samples.Span)
             {
                 processingSemaphore.Wait();
                 segmentIndex = 0;