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

Timestamp:

Feb 9, 2017 1:25:02 PM (8 years ago)

Author:

vboxsync

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

113407

Message:

Audio: Bugfixes.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DrvAudio.cpp (modified) (5 diffs)
• DrvHostDebugAudio.cpp (modified) (6 diffs)

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

@@ -1281 +1281 @@
     int rc = VINF_SUCCESS;
 
-    uint32_t csPlayed = 0;
+    uint32_t csPlayedTotal = 0;
 
     AssertPtr(pThis->pHostDrvAudio->pfnStreamGetWritable);
@@ -1292 +1292 @@
         if (csToPlay)
         {
-            uint8_t u8Buf[_4K]; /** @todo Get rid of this here. */
-            AssertReleaseReturn(sizeof(u8Buf) >= AUDIOMIXBUF_S2B(&pHstStream->MixBuf, csToPlay), /** @todo Get rid of this here. */
-                                VERR_BUFFER_OVERFLOW);
-
-            uint32_t csRead = 0;
-            rc = AudioMixBufReadCirc(&pHstStream->MixBuf, u8Buf, AUDIOMIXBUF_S2B(&pHstStream->MixBuf, csToPlay), &csRead);
-            if (RT_SUCCESS(rc))
+            uint8_t auBuf[256]; /** @todo Get rid of this here. */
+
+            uint32_t cbLeft  = AUDIOMIXBUF_S2B(&pHstStream->MixBuf, csToPlay);
+            uint32_t cbChunk = sizeof(auBuf);
+
+            while (cbLeft)
             {
-                uint32_t cbPlayed;
-
-                AssertPtr(pThis->pHostDrvAudio->pfnStreamPlay);
+                uint32_t csRead = 0;
+                rc = AudioMixBufReadCirc(&pHstStream->MixBuf, auBuf, RT_MIN(cbChunk, cbLeft), &csRead);
+                if (   !csRead
+                    || RT_FAILURE(rc))
+                {
+                    break;
+                }
+
+                uint32_t cbRead = AUDIOMIXBUF_S2B(&pHstStream->MixBuf, csRead);
+                Assert(cbRead <= cbChunk);
+
+                uint32_t cbPlayed = 0;
                 rc = pThis->pHostDrvAudio->pfnStreamPlay(pThis->pHostDrvAudio, pHstStream->pvBackend,
-                                                         u8Buf, AUDIOMIXBUF_S2B(&pHstStream->MixBuf, csRead),
-                                                         &cbPlayed);
-                if (RT_SUCCESS(rc))
-                {
-                    AssertMsg(cbPlayed % 2 == 0,
-                              ("Backend for stream '%s' returned uneven played bytes count (csRead=%RU32, cbPlayed=%RU32)\n",
-                               pHstStream->szName, csRead, cbPlayed));
-
-                    csPlayed = AUDIOMIXBUF_B2S(&pHstStream->MixBuf, cbPlayed);
-                }
+                                                         auBuf, cbRead, &cbPlayed);
+                if (RT_FAILURE(rc))
+                    break;
+
+                Assert(cbPlayed <= cbRead);
+                AssertMsg(cbPlayed % 2 == 0,
+                          ("Backend for stream '%s' returned uneven played bytes count (csRead=%RU32, cbPlayed=%RU32)\n",
+                           pHstStream->szName, csRead, cbPlayed));
+
+                csPlayedTotal += AUDIOMIXBUF_B2S(&pHstStream->MixBuf, cbPlayed);
+                Assert(cbLeft >= cbPlayed);
+                cbLeft        -= cbPlayed;
             }
         }
     }
 
-    Log3Func(("Played %RU32/%RU32 samples, rc=%Rrc\n", csPlayed, csToPlay, rc));
-
-    if (pcsPlayed)
-        *pcsPlayed = csPlayed;
+    Log3Func(("[%s] Played %RU32/%RU32 samples, rc=%Rrc\n", pHstStream->szName, csPlayedTotal, csToPlay, rc));
+
+    if (RT_SUCCESS(rc))
+    {
+        if (pcsPlayed)
+            *pcsPlayed = csPlayedTotal;
+    }
 
     return rc;
@@ -1356 +1369 @@
     int rc = VINF_SUCCESS;
 
-    uint32_t csPlayed = 0;
+    uint32_t csPlayedTotal = 0;
 
     AssertPtr(pThis->pHostDrvAudio->pfnStreamGetWritable);
@@ -1385 +1398 @@
                     break;
 
-                csPlayed += csPlayedChunk;
-                Assert(csPlayed <= csToPlay);
+                csPlayedTotal += csPlayedChunk;
+                Assert(csPlayedTotal <= csToPlay);
 
                 Assert(csLeft >= csRead);
@@ -1396 +1409 @@
     }
 
-    Log3Func(("Played %RU32/%RU32 samples, rc=%Rrc\n", csPlayed, csToPlay, rc));
-
-    if (pcsPlayed)
-        *pcsPlayed = csPlayed;
+    Log3Func(("[%s] Played %RU32/%RU32 samples, rc=%Rrc\n", pHstStream->szName, csPlayedTotal, csToPlay, rc));
+
+    if (RT_SUCCESS(rc))
+    {
+        if (pcsPlayed)
+            *pcsPlayed = csPlayedTotal;
+
+    }
 
     return rc;

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

@@ -47 +47 @@
         struct
         {
-            /** Timestamp of last played samples. */
-            uint64_t   tsLastPlayed;
-            uint8_t   *pu8PlayBuffer;
+            uint8_t   *auPlayBuffer;
             uint32_t   cbPlayBuffer;
         } Out;
@@ -140 +138 @@
     int rc = VINF_SUCCESS;
 
-    pStreamDbg->Out.tsLastPlayed  = 0;
     pStreamDbg->Out.cbPlayBuffer  = _1K * PDMAUDIOSTREAMCFG_S2B(pCfgReq, 1); /** @todo Make this configurable? */
-    pStreamDbg->Out.pu8PlayBuffer = (uint8_t *)RTMemAlloc(pStreamDbg->Out.cbPlayBuffer);
-    if (!pStreamDbg->Out.pu8PlayBuffer)
+    pStreamDbg->Out.auPlayBuffer  = (uint8_t *)RTMemAlloc(pStreamDbg->Out.cbPlayBuffer);
+    if (!pStreamDbg->Out.auPlayBuffer)
         rc = VERR_NO_MEMORY;
 
@@ -219 +216 @@
                                                      uint32_t *pcbWritten)
 {
-    RT_NOREF(pvBuf, cbBuf);
-
-    PDRVHOSTDEBUGAUDIO pDrv       = RT_FROM_MEMBER(pInterface, DRVHOSTDEBUGAUDIO, IHostAudio);
+    RT_NOREF(pInterface);
     PDEBUGAUDIOSTREAM  pStreamDbg = (PDEBUGAUDIOSTREAM)pStream;
 
-    /* Consume as many samples as would be played at the current frequency since last call. */
-    /*uint32_t cLive           = AudioMixBufLive(&pStream->MixBuf);*/
-
-    uint64_t u64TicksNow     = PDMDrvHlpTMGetVirtualTime(pDrv->pDrvIns);
-   // uint64_t u64TicksElapsed = u64TicksNow  - pStreamDbg->Out.tsLastPlayed;
-   // uint64_t u64TicksFreq    = PDMDrvHlpTMGetVirtualFreq(pDrv->pDrvIns);
-
-    /*
-     * Minimize the rounding error by adding 0.5: samples = int((u64TicksElapsed * samplesFreq) / u64TicksFreq + 0.5).
-     * If rounding is not taken into account then the playback rate will be consistently lower that expected.
-     */
-   // uint64_t cSamplesPlayed = (2 * u64TicksElapsed * pStream->Props.uHz + u64TicksFreq) / u64TicksFreq / 2;
-
-    /* Don't play more than available. */
-    /*if (cSamplesPlayed > cLive)
-        cSamplesPlayed = cLive;*/
-
-    uint32_t cbWritten = 0;
-
-    uint32_t cbAvail  = RT_MIN(cbBuf, pStreamDbg->Out.cbPlayBuffer);
+    uint32_t cbWrittenTotal = 0;
+
+    uint32_t cbAvail = cbBuf;
     while (cbAvail)
     {
-        uint32_t cbChunk = cbAvail; /** @todo Use chunks? */
-
-        memcpy(pStreamDbg->Out.pu8PlayBuffer, pvBuf, cbChunk);
+        uint32_t cbChunk = RT_MIN(cbAvail, pStreamDbg->Out.cbPlayBuffer);
+
+        memcpy(pStreamDbg->Out.auPlayBuffer, (uint8_t *)pvBuf + cbWrittenTotal, cbChunk);
 #if 0
         RTFILE fh;
@@ -257 +235 @@
 #endif
         int rc2 = DrvAudioHlpWAVFileWrite(&pStreamDbg->File,
-                                          pStreamDbg->Out.pu8PlayBuffer, cbChunk, 0 /* fFlags */);
+                                          pStreamDbg->Out.auPlayBuffer, cbChunk, 0 /* fFlags */);
         if (RT_FAILURE(rc2))
         {
@@ -265 +243 @@
 
         Assert(cbAvail >= cbAvail);
-        cbAvail   -= cbChunk;
-
-        cbWritten += cbChunk;
-    }
-
-    /* Remember when samples were consumed. */
-    pStreamDbg->Out.tsLastPlayed = u64TicksNow;
+        cbAvail        -= cbChunk;
+
+        cbWrittenTotal += cbChunk;
+    }
 
     if (pcbWritten)
-        *pcbWritten = cbWritten;
+        *pcbWritten = cbWrittenTotal;
 
     return VINF_SUCCESS;
@@ -307 +282 @@
     RT_NOREF(pDrv);
 
-    if (pStreamDbg->Out.pu8PlayBuffer)
-    {
-        RTMemFree(pStreamDbg->Out.pu8PlayBuffer);
-        pStreamDbg->Out.pu8PlayBuffer = NULL;
+    if (pStreamDbg->Out.auPlayBuffer)
+    {
+        RTMemFree(pStreamDbg->Out.auPlayBuffer);
+        pStreamDbg->Out.auPlayBuffer = NULL;
     }