Changeset 62350 in vbox

Timestamp:

Jul 20, 2016 10:47:36 AM (8 years ago)

Author:

vboxsync

Message:

Audio/DevSB16.cpp: Fixes.

File:

• trunk/src/VBox/Devices/Audio/DevSB16.cpp (modified) (17 diffs)

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

@@ -2 +2 @@
 /** @file
  * DevSB16 - VBox SB16 Audio Controller.
- *
- * @todo hiccups on NT4 and Win98.
  */
 
@@ -44 +42 @@
 #include <VBox/log.h>
 #include <iprt/assert.h>
+#include <iprt/file.h>
 #ifdef IN_RING3
 # include <iprt/mem.h>
@@ -58 +57 @@
 #include "AudioMixer.h"
 #include "DrvAudio.h"
+
+#if 0
+/*
+ * SB16_DEBUG_DUMP_PCM_DATA enables dumping the raw PCM data
+ * to a file on the host. Be sure to adjust SB16_DEBUG_DUMP_PCM_DATA_PATH
+ * to your needs before using this!
+ */
+# define SB16_DEBUG_DUMP_PCM_DATA
+# ifdef RT_OS_WINDOWS
+#  define SB16_DEBUG_DUMP_PCM_DATA_PATH "c:\\temp\\"
+# else
+#  define SB16_DEBUG_DUMP_PCM_DATA_PATH "/tmp/"
+# endif
+#endif
 
 /** Current saved state version. */
@@ -1638 +1651 @@
         AssertMsgRC(rc, ("DMAReadMemory -> %Rrc\n", rc));
 
+#ifdef SB16_DEBUG_DUMP_PCM_DATA
+        RTFILE fh;
+        RTFileOpen(&fh, SB16_DEBUG_DUMP_PCM_DATA_PATH "sb16WriteAudio.pcm",
+                   RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
+        RTFileWrite(fh, tmpbuf, cbToRead, NULL);
+        RTFileClose(fh);
+#endif
         /*
          * Write data to the backends.
@@ -1681 +1701 @@
         pThis->left_till_irq = pThis->block_size;
 
-    PSB16DRIVER pDrv;
-    RTListForEach(&pThis->lstDrv, pDrv, SB16DRIVER, Node)
-        pDrv->pConnector->pfnStreamIterate(pDrv->pConnector, pDrv->Out.pStream);
-
     free = dma_len;
 
@@ -1693 +1709 @@
     till = pThis->left_till_irq;
 
-#ifdef DEBUG_SB16_MOST
-    LogFlowFunc(("pos:%06d %d till:%d len:%d\n", dma_pos, free, till, dma_len));
-#endif
+    Log3Func(("pos %d/%d free %5d till %5d\n", dma_pos, dma_len, free, till));
 
     if (copy >= till)
@@ -1725 +1739 @@
     }
 
-#ifdef DEBUG_SB16_MOST
-    LogFlowFunc(("pos %5d free %5d size %5d till % 5d copy %5d written %5d size %5d\n",
-                 dma_pos, free, dma_len, pThis->left_till_irq, copy, written,
-                 pThis->block_size));
-#endif
+    Log3Func(("pos %d/%d free %5d till %5d copy %5d written %5d block_size %5d\n",
+               dma_pos, dma_len, free, pThis->left_till_irq, copy, written,
+               pThis->block_size));
 
     while (pThis->left_till_irq <= 0)
@@ -1783 +1795 @@
     uint64_t cTicksPerSec  = TMTimerGetFreq(pTimer);
 
+    bool     fIsPlaying    = false; /* Whether one or more streams are still playing. */
+    bool     fDoTransfer   = false;
+
     pThis->uTimerTSIO = cTicksNow;
-
-    bool     fIsPlaying = false;
-    uint32_t cbWritable = UINT32_MAX;
-
-    LogFlowFuncEnter();
 
     PSB16DRIVER pDrv;
@@ -1797 +1807 @@
             continue;
 
+#ifdef DEBUG
+        PSB16DRIVER pDrvPrev = RTListNodeGetPrev(&pDrv->Node, SB16DRIVER, Node);
+        if (   pDrvPrev
+            && !RTListNodeIsDummy(&pThis->lstDrv, pDrvPrev, SB16DRIVER, Node))
+        {
+            PPDMAUDIOSTREAM pStreamPrev = pDrvPrev->Out.pStream;
+            AssertPtr(pStreamPrev);
+
+            /*
+             * Sanity. Make sure that all streams have the same configuration
+             * to get SB16's DMA transfers right.
+             *
+             * SB16 only allows one output configuration per serial data out,
+             * so check if all streams have the same configuration.
+             */
+            AssertMsg(pStream->Cfg.uHz       == pStreamPrev->Cfg.uHz,
+                      ("%RU32Hz vs. %RU32Hz\n", pStream->Cfg.uHz, pStreamPrev->Cfg.uHz));
+            AssertMsg(pStream->Cfg.cChannels == pStreamPrev->Cfg.cChannels,
+                      ("%RU8 vs. %RU8 channels\n", pStream->Cfg.cChannels, pStreamPrev->Cfg.cChannels));
+            AssertMsg(pStream->Cfg.enmFormat == pStreamPrev->Cfg.enmFormat,
+                      ("%ld vs. %ld format\n", pStream->Cfg.enmFormat, pStreamPrev->Cfg.enmFormat));
+        }
+#endif
         PPDMIAUDIOCONNECTOR pConn = pDrv->pConnector;
         if (!pConn)
@@ -1816 +1849 @@
                     continue;
                 }
-
-                rc2 = pConn->pfnStreamIterate(pConn, pStream);
-                if (RT_FAILURE(rc2))
-                {
-                    LogFlowFunc(("%s: Failed re-iterating stream, rc=%Rrc\n", pStream->szName, rc2));
-                    continue;
-                }
-
-                cbWritable = RT_MIN(pConn->pfnStreamGetWritable(pConn, pStream), cbWritable);
+            }
+
+            if (pDrv->Flags & PDMAUDIODRVFLAG_PRIMARY)
+            {
+                /* Only do the next DMA transfer if we're able to write the entire
+                 * next data block. */
+                fDoTransfer = pConn->pfnStreamGetWritable(pConn, pStream) >= (uint32_t)pThis->block_size;
             }
         }
@@ -1831 +1862 @@
         fIsPlaying |= (   (strmSts & PDMAUDIOSTRMSTS_FLAG_ENABLED)
                        || (strmSts & PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE));
-
-        LogFlowFunc(("%s: strmSts=0x%x -> fIsPlaying=%RTbool\n", pStream->szName, strmSts, fIsPlaying));
-    }
-
-    if (   ASMAtomicReadBool(&pThis->fTimerActive)
-        || fIsPlaying)
-    {
-        if (cbWritable)
-        {
-            /* Schedule the next transfer. */
-            PDMDevHlpDMASchedule(pThis->pDevInsR3);
-        }
-
+    }
+
+    bool fTimerActive = ASMAtomicReadBool(&pThis->fTimerActive);
+    bool fKickTimer   = fTimerActive || fIsPlaying;
+
+    LogFlowFunc(("fTimerActive=%RTbool, fIsPlaying=%RTbool\n", fTimerActive, fIsPlaying));
+
+    if (fDoTransfer)
+    {
+        /* Schedule the next transfer. */
+        PDMDevHlpDMASchedule(pThis->pDevInsR3);
+
+        /* Kick the timer at least one more time. */
+        fKickTimer = true;
+    }
+
+    if (fKickTimer)
+    {
         /* Kick the timer again. */
         uint64_t cTicks = pThis->cTimerTicksIO;
@@ -1849 +1885 @@
         TMTimerSet(pThis->pTimerIO, cTicksNow + cTicks);
     }
-
-    LogFlowFuncLeave();
 }
 
@@ -2075 +2109 @@
 
     AssertReturn(pCfg->enmDir == PDMAUDIODIR_OUT, VERR_INVALID_PARAMETER);
+    Assert(DrvAudioHlpStreamCfgIsValid(pCfg));
 
     /* Set a default audio format for the host. */
@@ -2080 +2115 @@
     CfgHost.enmDir          = PDMAUDIODIR_OUT;
     CfgHost.DestSource.Dest = PDMAUDIOPLAYBACKDEST_FRONT;
-    CfgHost.uHz             = 44100;
-    CfgHost.cChannels       = 2;
+    CfgHost.uHz             = pCfg->uHz;
+    CfgHost.cChannels       = pCfg->cChannels;
     CfgHost.enmFormat       = PDMAUDIOFMT_S16;
     CfgHost.enmEndianness   = PDMAUDIOHOSTENDIANNESS;
@@ -2094 +2129 @@
     RTListForEach(&pThis->lstDrv, pDrv, SB16DRIVER, Node)
     {
-        if (!RTStrPrintf(pCfg->szName, sizeof(pCfg->szName), "[LUN#%RU8] sb16.po (%RU32Hz, %RU8 %s)",
-                         pDrv->uLUN, pCfg->uHz, pCfg->cChannels, pCfg->cChannels > 1 ? "Channels" : "Channel"))
+        if (!RTStrPrintf(pCfg->szName, sizeof(pCfg->szName), "[LUN#%RU8] %s (%RU32Hz, %RU8 %s)",
+                         pDrv->uLUN, CfgHost.szName, pCfg->uHz, pCfg->cChannels, pCfg->cChannels > 1 ? "Channels" : "Channel"))
         {
             rc = VERR_BUFFER_OVERFLOW;
@@ -2139 +2174 @@
     RTListForEach(&pThis->lstDrv, pDrv, SB16DRIVER, Node)
     {
-        if (pDrv->Out.pStream)
-        {
-            pDrv->pConnector->pfnStreamRelease(pDrv->pConnector, pDrv->Out.pStream);
-
-            int rc2 = pDrv->pConnector->pfnStreamDestroy(pDrv->pConnector, pDrv->Out.pStream);
-            if (RT_SUCCESS(rc2))
-                pDrv->Out.pStream = NULL;
-        }
+        int rc2 = pDrv->pConnector->pfnStreamControl(pDrv->pConnector, pDrv->Out.pStream, PDMAUDIOSTREAMCMD_DISABLE);
+        AssertRC(rc2);
     }
 
@@ -2208 +2237 @@
     LogRel2(("SB16: Powering off ...\n"));
 
-    sb16CloseOut(pThis);
+    PSB16DRIVER pDrv;
+    RTListForEach(&pThis->lstDrv, pDrv, SB16DRIVER, Node)
+    {
+        if (pDrv->Out.pStream)
+        {
+            pDrv->pConnector->pfnStreamRelease(pDrv->pConnector, pDrv->Out.pStream);
+
+            int rc2 = pDrv->pConnector->pfnStreamDestroy(pDrv->pConnector, pDrv->Out.pStream);
+            if (RT_SUCCESS(rc2))
+                pDrv->Out.pStream = NULL;
+        }
+    }
 }