Changeset 54336 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Feb 20, 2015 5:02:04 PM (10 years ago)

Author:

vboxsync

Message:

Audio: dsoundaudio use correct capture buffer position

File:

• trunk/src/VBox/Devices/Audio/dsoundaudio.c (modified) (6 diffs)

trunk/src/VBox/Devices/Audio/dsoundaudio.c

@@ -755 +755 @@
     DSCBUFFERDESC bd;
     DSCBCAPS bc;
-    DWORD cpos;
+    DWORD rpos;
 
     DSLOGF(("DSound: capture open %p size %d samples, freq %d, chan %d, bits %d, sign %d\n",
@@ -796 +796 @@
     /* Query the actual parameters. */
 
-    hr = IDirectSoundCaptureBuffer_GetCurrentPosition (ds->dsound_capture_buffer, &cpos, NULL);
+    hr = IDirectSoundCaptureBuffer_GetCurrentPosition (ds->dsound_capture_buffer, NULL, &rpos);
     if (FAILED (hr)) {
-        cpos = 0;
+        rpos = 0;
         DSLOGF(("DSound: open GetCurrentPosition %Rhrc\n", hr));
     }
@@ -846 +846 @@
     /* Initial state: reading at the initial capture position. */
     ds->hw.wpos = 0;
-    ds->last_read_pos = cpos >> ds->hw.info.shift;
+    ds->last_read_pos = rpos >> ds->hw.info.shift;
     ds->capture_buffer_size = bc.dwBufferBytes >> ds->hw.info.shift;
     DSLOGF(("DSound: capture open last_read_pos %d, capture_buffer_size %d\n", ds->last_read_pos, ds->capture_buffer_size));
@@ -1156 +1156 @@
     int len1, len2;
     int decr;
-    DWORD cpos;
+    DWORD rpos;
     LPVOID p1, p2;
     int hwshift;
@@ -1175 +1175 @@
     hr = IDirectSoundCaptureBuffer_GetCurrentPosition (
         dscb,
-        &cpos,
-        NULL
+        NULL,
+        &rpos
         );
     if (FAILED (hr)) {
@@ -1187 +1187 @@
     ds->hr_last_run_in = hr;
 
-    if (cpos & hw->info.align) {
-        DSLOGF(("DSound: run_in misaligned capture position %ld(%d)\n", cpos, hw->info.align));
-    }
-
-    cpos >>= hwshift;
+    if (rpos & hw->info.align) {
+        DSLOGF(("DSound: run_in misaligned read position %ld(%d)\n", rpos, hw->info.align));
+    }
+
+    rpos >>= hwshift;
 
     /* Number of samples available in the capture buffer. */
-    len = audio_ring_dist (cpos, ds->last_read_pos, ds->capture_buffer_size);
+    len = audio_ring_dist (rpos, ds->last_read_pos, ds->capture_buffer_size);
     if (!len) {
         return 0;