Changeset 68759 in vbox

Timestamp:

Sep 14, 2017 8:12:19 AM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

117995

Message:

Audio/DrvHostDSound.cpp: Get rid of the pdwBuffer parameter of dsoundGetPosOut(); this value always matches pStreamDS->Out.cbPlayBuf.

File:

• trunk/src/VBox/Devices/Audio/DrvHostDSound.cpp (modified) (10 diffs)

trunk/src/VBox/Devices/Audio/DrvHostDSound.cpp

@@ -277 +277 @@
 
 
-static int dsoundGetPosOut(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS,
-                           DWORD *pdwBuffer, DWORD *pdwFree, DWORD *pdwPlayPos)
+static int dsoundGetPosOut(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS, DWORD *pdwFree, DWORD *pdwPlayPos)
 {
     AssertPtr(pThis);
     AssertPtrReturn(pStreamDS, VERR_INVALID_POINTER);
-    AssertPtrNull(pdwBuffer);
     AssertPtrNull(pdwFree);
     AssertPtrNull(pdwPlayPos);
@@ -299 +297 @@
         {
             DWORD const cbBuffer = pStreamDS->Out.cbPlayBuf;
-            if (pdwBuffer)
-                *pdwBuffer  = cbBuffer;
             if (pdwFree)
                 *pdwFree    = cbBuffer - dsoundRingDistance(pStreamDS->Out.offPlayWritePos, cbPlayPos, cbBuffer);
@@ -614 +610 @@
         /*
          * As we reuse our (secondary) buffer for playing out data as it comes in,
-         * we're using this buffer as a so-called static buffer.
+         * we're using this buffer as a so-called streaming buffer.
+         *
+         * See https://msdn.microsoft.com/en-us/library/windows/desktop/ee419014(v=vs.85).aspx
          *
          * However, as we do not want to use memory on the sound device directly
@@ -1604 +1602 @@
         PPDMAUDIOPCMPROPS pProps = &pStreamDS->pCfg->Props;
 
-        DWORD cbBuffer, cbFree, cbPlayPos;
-        rc = dsoundGetPosOut(pThis, pStreamDS, &cbBuffer, &cbFree, &cbPlayPos);
+        DWORD cbFree, cbPlayPos;
+        rc = dsoundGetPosOut(pThis, pStreamDS, &cbFree, &cbPlayPos);
         if (RT_FAILURE(rc))
             break;
@@ -1616 +1614 @@
         if (cbFree <= cbSample)
             break;
+        Assert(cbFree >= cbSample);
         cbFree     -= cbSample;
 
@@ -1623 +1622 @@
         cbLive = RT_MIN(cbFree, cbLive);
         cbLive &= ~pStreamDS->uAlign;
-        if (cbLive == 0 || cbLive > cbBuffer)
-        {
-            DSLOG(("DSound: cbLive=%RU32, cbBuffer=%ld, offPlayWritePos=%ld, cbPlayPos=%ld\n",
-                   cbLive, cbBuffer, pStreamDS->Out.offPlayWritePos, cbPlayPos));
+
+        if (   cbLive == 0
+            || cbLive > pStreamDS->Out.cbPlayBuf)
+        {
+            DSLOG(("DSound: cbLive=%RU32, offPlayWritePos=%ld, cbPlayPos=%ld\n",
+                   cbLive, pStreamDS->Out.offPlayWritePos, cbPlayPos));
             break;
         }
@@ -1659 +1660 @@
         directSoundPlayUnlock(pThis, pDSB, pv1, pv2, cb1, cb2);
 
-        pStreamDS->Out.offPlayWritePos = (pStreamDS->Out.offPlayWritePos + cbWrittenTotal) % cbBuffer;
+        pStreamDS->Out.offPlayWritePos = (pStreamDS->Out.offPlayWritePos + cbWrittenTotal) % pStreamDS->Out.cbPlayBuf;
 
         DSLOGF(("DSound: %RU32/%RU32, buffer write pos %ld, rc=%Rrc\n",
@@ -2028 +2029 @@
                 else if (aEvents[dwObj] == pThis->aEvents[DSOUNDEVENT_OUTPUT])
                 {
-                    DWORD cbBuffer, cbFree, cbPlayPos;
-                    rc = dsoundGetPosOut(pThis->pDSStream, &cbBuffer, &cbFree, &cbPlayPos);
+                    DWORD cbFree, cbPlayPos;
+                    rc = dsoundGetPosOut(pThis->pDSStream, &cbFree, &cbPlayPos);
                     if (   RT_SUCCESS(rc)
                         && cbFree)
@@ -2317 +2318 @@
 static DECLCALLBACK(uint32_t) drvHostDSoundStreamGetWritable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
-    RT_NOREF(pInterface, pStream);
-
     AssertPtrReturn(pInterface, PDMAUDIOSTREAMSTS_FLAG_NONE);
     AssertPtrReturn(pStream,    PDMAUDIOSTREAMSTS_FLAG_NONE);
@@ -2328 +2327 @@
     {
         DWORD cbFree;
-        int rc = dsoundGetPosOut(pThis, pStreamDS, NULL /* cbBuffer */, &cbFree, NULL /* cbPlayPos */);
+        int rc = dsoundGetPosOut(pThis, pStreamDS, &cbFree, NULL /* cbPlayPos */);
         if (   RT_SUCCESS(rc)
             && cbFree)