Changeset 73432 in vbox for trunk/src/VBox

Timestamp:

Aug 1, 2018 3:03:03 PM (6 years ago)

Author:

vboxsync

Message:

Audio: Use the DrvAudioHlpStreamStatusXXX() helpers where applicable.

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixer.cpp (modified) (4 diffs)
• DevSB16.cpp (modified) (1 diff)
• DrvAudio.cpp (modified) (4 diffs)

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

@@ -934 +934 @@
         /* Return how much data we expect since the last write. */
         cbWritable = DrvAudioHlpNanoToBytes(deltaLastReadWriteNs, &pSink->PCMProps);
+
+        /* Make sure to align the writable size to the stream's frame size. */
         cbWritable = DrvAudioHlpBytesAlign(cbWritable, &pSink->PCMProps);
 #endif
@@ -1115 +1117 @@
         Log3Func(("[%s] No recording source specified, skipping ...\n", pSink->pszName));
     }
-    else if (!(pStreamRecSource->pConn->pfnStreamGetStatus(pStreamRecSource->pConn, pStreamRecSource->pStream) & PDMAUDIOSTREAMSTS_FLAG_ENABLED))
+    else if (!DrvAudioHlpStreamStatusCanRead(
+       pStreamRecSource->pConn->pfnStreamGetStatus(pStreamRecSource->pConn, pStreamRecSource->pStream)))
     {
         Log3Func(("[%s] Stream '%s' disabled, skipping ...\n", pSink->pszName, pStreamRecSource->pszName));
@@ -1564 +1567 @@
 
         uint32_t cfProc = 0;
+
+        if (!DrvAudioHlpStreamStatusIsReady(pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream)))
+            continue;
 
         int rc2 = pConn->pfnStreamIterate(pConn, pStream);
@@ -1721 +1727 @@
               ("%s: Can't write to a sink which is not an output sink\n", pSink->pszName));
 
-    Log3Func(("[%s] enmOp=%d, cbBuf=%RU32\n", pSink->pszName, enmOp, cbBuf));
-
     PAUDMIXSTREAM pMixStream;
     RTListForEach(&pSink->lstStreams, pMixStream, AUDMIXSTREAM, Node)
     {
+        if (!DrvAudioHlpStreamStatusCanWrite(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream)))
+            continue;
+
         PRTCIRCBUF pCircBuf = pMixStream->pCircBuf;
         void *pvChunk;

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

@@ -1555 +1555 @@
                 continue;
 
+            if (!DrvAudioHlpStreamStatusCanWrite(pDrv->pConnector->pfnStreamGetStatus(pDrv->pConnector,  pDrv->Out.pStream)))
+                continue;
+
             uint32_t cbWrittenToStream = 0;
             rc2 = pDrv->pConnector->pfnStreamWrite(pDrv->pConnector, pDrv->Out.pStream, tmpbuf, cbRead, &cbWrittenToStream);
 
             LogFlowFunc(("\tLUN#%RU8: rc=%Rrc, cbWrittenToStream=%RU32\n", pDrv->uLUN, rc2, cbWrittenToStream));
-
-            /* The primary driver sets the overall pace. */
-            if (pDrv->fFlags & PDMAUDIODRVFLAGS_PRIMARY)
-            {
-                cbWritten = cbWrittenToStream;
-
-                if (RT_FAILURE(rc2))
-                    break;
-            }
         }
+
+        cbWritten = cbRead; /* Always report everything written, as the backends need to keep up themselves. */
 
         LogFlowFunc(("\tcbToRead=%RU32, cbToWrite=%RU32, cbWritten=%RU32, cbLeft=%RU32\n",

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

@@ -3014 +3014 @@
     }
 
-    uint32_t cfReadable = 0;
+    uint32_t cbReadable = 0;
 
     PPDMAUDIOSTREAM pGstStream = pHstStream->pPair;
     if (pGstStream)
-        cfReadable = AudioMixBufLive(&pGstStream->MixBuf);
-
-    Log3Func(("[%s] cfReadable=%RU32 (%zu bytes)\n", pHstStream->szName, cfReadable,
-              AUDIOMIXBUF_F2B(&pGstStream->MixBuf, cfReadable)));
-
-    uint32_t cbReadable = AUDIOMIXBUF_F2B(&pGstStream->MixBuf, cfReadable);
+    {
+        uint32_t cfReadable = AudioMixBufLive(&pGstStream->MixBuf);
+
+        Log3Func(("[%s] cfReadable=%RU32 (%zu bytes)\n", pHstStream->szName, cfReadable,
+                  AUDIOMIXBUF_F2B(&pGstStream->MixBuf, cfReadable)));
+
+        cbReadable = AUDIOMIXBUF_F2B(&pGstStream->MixBuf, cfReadable);
+    }
 
     rc2 = RTCritSectLeave(&pThis->CritSect);
@@ -3060 +3062 @@
     const uint64_t deltaLastReadWriteNs = RTTimeNanoTS() - pHstStream->tsLastReadWrittenNs;
 
-    uint32_t cbWritable = DrvAudioHlpNanoToBytes(deltaLastReadWriteNs, &pHstStream->Cfg.Props);
-    cbWritable = DrvAudioHlpBytesAlign(cbWritable, &pHstStream->Cfg.Props);
-
-    Log3Func(("Audio: [%s] cbWritable=%RU32 (%RU64ms)\n", pHstStream->szName, cbWritable, deltaLastReadWriteNs / RT_NS_1MS_64));
+    uint32_t cbWritable = 0;
+
+    if (DrvAudioHlpStreamStatusCanWrite(pHstStream->fStatus))
+    {
+        cbWritable = DrvAudioHlpNanoToBytes(deltaLastReadWriteNs, &pHstStream->Cfg.Props);
+
+        /* Make sure to align the writable size to the stream's frame size. */
+        cbWritable = DrvAudioHlpBytesAlign(cbWritable, &pHstStream->Cfg.Props);
+    }
+
+    Log3Func(("[%s] cbWritable=%RU32 (%RU64ms)\n", pHstStream->szName, cbWritable, deltaLastReadWriteNs / RT_NS_1MS_64));
 
     rc2 = RTCritSectLeave(&pThis->CritSect);
@@ -3086 +3095 @@
     AssertRC(rc2);
 
-    PDMAUDIOSTREAMSTS strmSts = PDMAUDIOSTREAMSTS_FLAG_NONE;
+    PDMAUDIOSTREAMSTS stsStream = PDMAUDIOSTREAMSTS_FLAG_NONE;
 
     PPDMAUDIOSTREAM pHstStream = drvAudioGetHostStream(pStream);
     if (pHstStream)
     {
-        strmSts = pHstStream->fStatus;
+        /* If the connector is ready to operate, also make sure to ask the backend. */
+        stsStream = pHstStream->fStatus;
+        if (DrvAudioHlpStreamStatusIsReady(stsStream))
+            stsStream = pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pHstStream->pvBackend);
+
 #ifdef LOG_ENABLED
-        char *pszHstSts = dbgAudioStreamStatusToStr(pHstStream->fStatus);
-        Log3Func(("[%s] %s\n", pHstStream->szName, pszHstSts));
-        RTStrFree(pszHstSts);
+        char *pszStreamSts = dbgAudioStreamStatusToStr(stsStream);
+        Log3Func(("[%s] %s\n", pHstStream->szName, pszStreamSts));
+        RTStrFree(pszStreamSts);
 #endif
     }
@@ -3102 +3115 @@
     AssertRC(rc2);
 
-    return strmSts;
+    return stsStream;
 }