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

Timestamp:

Jul 7, 2016 4:16:01 PM (9 years ago)

Author:

vboxsync

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

108603

Message:

Audio: Bugfixes, logging.

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixer.cpp (modified) (6 diffs)
• AudioMixer.h (modified) (3 diffs)
• DevIchHda.cpp (modified) (5 diffs)
• DrvAudio.cpp (modified) (4 diffs)
• DrvAudioCommon.cpp (modified) (1 diff)
• DrvHostCoreAudio.cpp (modified) (2 diffs)

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

@@ -829 +829 @@
     }
 
+    /* Update last updated timestamp. */
+    pSink->tsLastUpdatedMS = RTTimeMilliTS();
+
     /* Reset status. */
     pSink->fStatus = AUDMIXSINK_STS_NONE;
@@ -921 +924 @@
     uint8_t cStreamsDisabled = 0;
 
-    /* Update last updated timestamp. */
-    pSink->tsLastUpdatedNS = RTTimeNanoTS();
+    /* Get the time delta and calculate the bytes that need to be processed. */
+    uint64_t tsDeltaMS = RTTimeMilliTS() - pSink->tsLastUpdatedMS;
+    uint32_t cbDelta   = (pSink->PCMProps.cbBitrate / 1000 /* s to ms */) * tsDeltaMS;
+
+    Log3Func(("[%s] Bitrate is %RU32 bytes/s -> %RU64ms / %RU32 bytes elapsed\n",
+              pSink->pszName, pSink->PCMProps.cbBitrate, tsDeltaMS, cbDelta));
+
+    if (pSink->enmDir == AUDMIXSINKDIR_INPUT)
+    {
+        pSink->In.cbReadable  = cbDelta;
+    }
+    else if (pSink->enmDir == AUDMIXSINKDIR_OUTPUT)
+    {
+        pSink->Out.cbWritable = cbDelta;
+    }
+
+    uint8_t uCurLUN = 0;
 
     PAUDMIXSTREAM pMixStream, pMixStreamNext;
@@ -993 +1011 @@
 # error "Implement me!"
 #else
-                pSink->In.cbReadable = pConn->pfnStreamGetReadable(pConn, pMixStream->pStream);
+                if (uCurLUN == 0)
+                {
+                    pSink->In.cbReadable = pConn->pfnStreamGetReadable(pConn, pMixStream->pStream);
+                    Log3Func(("\t%s: cbReadable=%RU32\n", pMixStream->pStream->szName, pSink->In.cbReadable));
+                    uCurLUN++;
+                }
 #endif
             }
@@ -1001 +1024 @@
 # error "Implement me!"
 #else
-                pSink->Out.cbWritable = pConn->pfnStreamGetWritable(pConn, pMixStream->pStream);
+                if (uCurLUN == 0)
+                {
+                    pSink->Out.cbWritable = pConn->pfnStreamGetWritable(pConn, pMixStream->pStream);
+                    Log3Func(("\t%s: cbWritable=%RU32\n", pMixStream->pStream->szName, pSink->Out.cbWritable));
+                    uCurLUN++;
+                }
 #endif
             }
@@ -1016 +1044 @@
     }
 
-    if (RT_FAILURE(rc))
-        LogFlowFunc(("Failed with rc=%Rrc\n", rc));
+    /* Update last updated timestamp. */
+    pSink->tsLastUpdatedMS = RTTimeMilliTS();
+
+    Log3Func(("[%s] cbReadable=%RU32, cbWritable=%RU32, rc=%Rrc\n",
+              pSink->pszName, pSink->In.cbReadable, pSink->Out.cbWritable, rc));
 
     return rc;
@@ -1025 +1056 @@
 {
     AssertPtrReturn(pSink, VERR_INVALID_POINTER);
-
-    uint64_t tsElapsed = RTTimeNanoTS() - pSink->tsLastUpdatedNS;
 
     /*

trunk/src/VBox/Devices/Audio/AudioMixer.h

@@ -37 +37 @@
     /** The master volume of this mixer. */
     PDMAUDIOVOLUME          VolMaster;
-    /* List of audio mixer sinks. */
+    /** List of audio mixer sinks. */
     RTLISTANCHOR            lstSinks;
     /** Number of used audio sinks. */
@@ -90 +90 @@
 typedef enum AUDMIXSINKDIR
 {
+    /** Unknown direction. */
     AUDMIXSINKDIR_UNKNOWN = 0,
+    /** Input (capturing from a device). */
     AUDMIXSINKDIR_INPUT,
+    /** Output (playing to a device). */
     AUDMIXSINKDIR_OUTPUT,
     /** The usual 32-bit hack. */
@@ -183 +186 @@
     /** The volume of this sink, combined with the last set  master volume. */
     PDMAUDIOVOLUME          VolumeCombined;
-    /** Timestamp (in ns) since last update. */
-    uint64_t                tsLastUpdatedNS;
+    /** Timestamp (in ms) since last update. */
+    uint64_t                tsLastUpdatedMS;
 } AUDMIXSINK, *PAUDMIXSINK;
 

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

@@ -3067 +3067 @@
             /* Also make sure to handle the DMA position enable bit. */
             pThis->fDMAPosition = RT_BOOL(pThis->u64DPBase & RT_BIT_64(0));
-            LogRel(("HDA: %s DMA position buffer\n", pThis->fDMAPosition ? "Enabled" : "Disabled"));
+            LogRel2(("HDA: %s DMA position buffer\n", pThis->fDMAPosition ? "Enabled" : "Disabled"));
             break;
         }
@@ -3778 +3778 @@
         PHDAMIXERSTREAM pStream = NULL;
 
-        if (pCfg->enmDir == PDMAUDIODIR_IN)
+        PPDMAUDIOSTREAMCFG pStreamCfg = (PPDMAUDIOSTREAMCFG)RTMemDup(pCfg, sizeof(PDMAUDIOSTREAMCFG));
+        if (!pStreamCfg)
         {
-            LogFunc(("enmRecSource=%ld\n", pCfg->DestSource.Source));
-
-            switch (pCfg->DestSource.Source)
+            rc = VERR_NO_MEMORY;
+            break;
+        }
+
+        /* Include the driver's LUN in the stream name for easier identification. */
+        RTStrPrintf(pStreamCfg->szName, RT_ELEMENTS(pStreamCfg->szName), "[LUN#%RU8] %s", pDrv->uLUN, pCfg->szName);
+
+        if (pStreamCfg->enmDir == PDMAUDIODIR_IN)
+        {
+            LogFunc(("enmRecSource=%ld\n", pStreamCfg->DestSource.Source));
+
+            switch (pStreamCfg->DestSource.Source)
             {
                 case PDMAUDIORECSOURCE_LINE:
@@ -3797 +3807 @@
             }
         }
-        else if (pCfg->enmDir == PDMAUDIODIR_OUT)
+        else if (pStreamCfg->enmDir == PDMAUDIODIR_OUT)
         {
-            LogFunc(("enmPlaybackDest=%ld\n", pCfg->DestSource.Dest));
-
-            switch (pCfg->DestSource.Dest)
+            LogFunc(("enmPlaybackDest=%ld\n", pStreamCfg->DestSource.Dest));
+
+            switch (pStreamCfg->DestSource.Dest)
             {
                 case PDMAUDIOPLAYBACKDEST_FRONT:
@@ -3832 +3842 @@
 
             PAUDMIXSTREAM pMixStrm;
-            rc2 = AudioMixerSinkCreateStream(pSink->pMixSink, pDrv->pConnector, pCfg, 0 /* fFlags */, &pMixStrm);
+            rc2 = AudioMixerSinkCreateStream(pSink->pMixSink, pDrv->pConnector, pStreamCfg, 0 /* fFlags */, &pMixStrm);
             if (RT_SUCCESS(rc2))
             {
                 rc2 = AudioMixerSinkAddStream(pSink->pMixSink, pMixStrm);
-                LogFlowFunc(("LUN#%RU8: Added \"%s\" to sink, rc=%Rrc\n", pDrv->uLUN, pCfg->szName , rc2));
+                LogFlowFunc(("LUN#%RU8: Added \"%s\" to sink, rc=%Rrc\n", pDrv->uLUN, pStreamCfg->szName , rc2));
             }
 
@@ -3845 +3855 @@
         if (RT_SUCCESS(rc))
             rc = rc2;
+
+        if (pStreamCfg)
+        {
+            RTMemFree(pStreamCfg);
+            pStreamCfg = NULL;
+        }
     }
 

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

@@ -657 +657 @@
     if (rc == VINF_BUFFER_OVERFLOW)
     {
-        LogRel2(("Audio: Lost audio samples from guest stream '%s' (only %zu / %zu bytes written), expect stuttering audio output\n",
-                 pGstStream->szName, AUDIOMIXBUF_S2B(&pGstStream->MixBuf, cWritten), cbBuf));
+        LogRel2(("Audio: Lost audio samples from guest stream '%s', expect stuttering audio output\n", pGstStream->szName));
         rc = VINF_SUCCESS;
     }
@@ -825 +824 @@
 }
 
-static DECLCALLBACK(int) drvAudioStreamPlay(PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream,
-                                            uint32_t *pcSamplesPlayed)
+static DECLCALLBACK(int) drvAudioStreamPlay(PPDMIAUDIOCONNECTOR pInterface,
+                                            PPDMAUDIOSTREAM pStream, uint32_t *pcSamplesPlayed)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
@@ -851 +850 @@
         if (pThis->pHostDrvAudio->pfnGetStatus(pThis->pHostDrvAudio, PDMAUDIODIR_OUT) != PDMAUDIOBACKENDSTS_RUNNING)
         {
+            /* Pull the new config from the backend and check again. */
             rc = pThis->pHostDrvAudio->pfnGetConfig(pThis->pHostDrvAudio, &pThis->BackendCfg);
             AssertRC(rc);
@@ -927 +927 @@
 }
 
-static DECLCALLBACK(int) drvAudioStreamCapture(PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream,
-                                               uint32_t *pcSamplesCaptured)
+static DECLCALLBACK(int) drvAudioStreamCapture(PPDMIAUDIOCONNECTOR pInterface,
+                                               PPDMAUDIOSTREAM pStream, uint32_t *pcSamplesCaptured)
 {
     PDRVAUDIO pThis = PDMIAUDIOCONNECTOR_2_DRVAUDIO(pInterface);

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

@@ -459 +459 @@
         pProps->cShift      = (pCfg->cChannels == 2) + cShift;
         pProps->uAlign      = (1 << pProps->cShift) - 1;
-        pProps->cbPerSec    = pProps->uHz << pProps->cShift;
+        pProps->cbBitrate   = (pProps->cBits * pProps->uHz * pProps->cChannels) / 8;
         pProps->fSwapEndian = pCfg->enmEndianness != PDMAUDIOHOSTENDIANNESS;
     }

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

@@ -1855 +1855 @@
         /* Move offset. */
         cbRead += cbToRead;
-        Assert(pBufData->mBuffers[0].mDataByteSize >= cbRead);
+
+        /* Check if we're lagging behind. */
+        if (cbRead > pBufData->mBuffers[0].mDataByteSize)
+        {
+            LogRel2(("CoreAudio: Host output lagging behind, expect stuttering guest audio output\n"));
+            cbRead = pBufData->mBuffers[0].mDataByteSize;
+            break;
+        }
 
         Assert(cbToRead <= cbLeft);
@@ -1861 +1868 @@
     }
 
-    /* Write the bytes to the core audio buffer which where really written. */
+    /* Write the bytes to the core audio buffer which were really written. */
+    Assert(pBufData->mBuffers[0].mDataByteSize >= cbRead);
     pBufData->mBuffers[0].mDataByteSize = cbRead;