Corrected calculation of AdjustedPosition by removing a stray divisio…

…n by 100. Added conversion of result of AdjustedPosition from device position units into bytes to WasapiOut.GetPosition.
naudio · Jan 28, 2020 · c3327b9 · c3327b9
1 parent 4362fa3
commit c3327b9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/NAudio/CoreAudioApi/AudioClockClient.cs b/NAudio/CoreAudioApi/AudioClockClient.cs
@@ -62,9 +62,6 @@ public ulong AdjustedPosition
         {
             get
             {
-                // figure out ticks per byte (for later)
-                var byteLatency = (TimeSpan.TicksPerSecond / Frequency);
-
                 ulong pos, qpos;
                 int cnt = 0;
                 while (!GetPosition(out pos, out qpos))
@@ -83,14 +80,14 @@ public ulong AdjustedPosition
                     // get the current qpc count (in ticks)
                     var qposNow = (ulong)((Stopwatch.GetTimestamp() * 10000000M) / Stopwatch.Frequency);
 
-                    // find out how many ticks has passed since the device reported the position
-                    var qposDiff = (qposNow - qpos) / 100;
+                    // find out how many ticks have passed since the device reported the position
+                    var qposDiff = qposNow - qpos;
 
-                    // find out how many byte would have played in that time span
-                    var bytes = qposDiff / byteLatency;
+                    // find out how many device position units (usually bytes) would have played in that time span
+                    var posDiff = (qposDiff * Frequency) / TimeSpan.TicksPerSecond;
 
                     // add it to the position
-                    pos += bytes;
+                    pos += posDiff;
                 }
                 return pos;
             }

diff --git a/NAudio/Wave/WaveOutputs/WasapiOut.cs b/NAudio/Wave/WaveOutputs/WasapiOut.cs
@@ -274,7 +274,8 @@ public long GetPosition()
             {
                 return 0;
             }
-            return (long)audioClient.AudioClockClient.AdjustedPosition;
+            var clock = audioClient.AudioClockClient;
+            return ((long)clock.AdjustedPosition * outputFormat.AverageBytesPerSecond) / (long)clock.Frequency;
         }
 
         /// <summary>

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "msbuild-sdks": {
-    "MSBuild.Sdk.Extras": "2.0.31"
+    "MSBuild.Sdk.Extras": "2.0.54"
   }
 }