Read last data from Output Buffer before discarding it

aqibbanday · Mar 9, 2020 · 341d92b · 341d92b
1 parent 1f2cbc7
commit 341d92b
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/NAudio/MediaFoundation/MediaFoundationTransform.cs b/NAudio/MediaFoundation/MediaFoundationTransform.cs
@@ -130,6 +130,7 @@ public int Read(byte[] buffer, int offset, int count)
                     EndStreamAndDrain();
                     // resampler might have given us a little bit more to return
                     bytesWritten += ReadFromOutputBuffer(buffer, offset + bytesWritten, count - bytesWritten);
+                    ClearOutputBuffer();
                     break;
                 }
 
@@ -170,14 +171,18 @@ private void EndStreamAndDrain()
             {
                 read = ReadFromTransform();
             } while (read > 0);
-            outputBufferCount = 0;
-            outputBufferOffset = 0;
             inputPosition = 0;
             outputPosition = 0;
             transform.ProcessMessage(MFT_MESSAGE_TYPE.MFT_MESSAGE_NOTIFY_END_STREAMING, IntPtr.Zero);
             initializedForStreaming = false;
         }
 
+        private void ClearOutputBuffer()
+        {
+            outputBufferCount = 0;
+            outputBufferOffset = 0;
+        }
+
         /// <summary>
         /// Attempts to read from the transform
         /// Some useful info here:
@@ -280,6 +285,7 @@ public void Reposition()
             if (initializedForStreaming)
             {
                 EndStreamAndDrain();
+                ClearOutputBuffer();
                 InitializeTransformForStreaming();
             }
         }