Changeset 62323 in vbox for trunk

Timestamp:

Jul 19, 2016 2:32:42 PM (9 years ago)

Author:

vboxsync

Message:

Audio/DrvAudio.cpp: Added some more checking.

File:

• trunk/src/VBox/Devices/Audio/DrvAudio.cpp (modified) (12 diffs)

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

@@ -137 +137 @@
     AssertPtrReturn(pStream, NULL);
 
-    PPDMAUDIOSTREAM pStreamHst = pStream->enmCtx == PDMAUDIOSTREAMCTX_HOST
+    if (!pStream)
+        return NULL;
+
+    PPDMAUDIOSTREAM pHstStream = pStream->enmCtx == PDMAUDIOSTREAMCTX_HOST
                                ? pStream
                                : pStream->pPair;
-    if (pStreamHst)
-    {
-        Assert(pStreamHst->enmCtx == PDMAUDIOSTREAMCTX_HOST);
+    if (pHstStream)
+    {
+        Assert(pHstStream->enmCtx == PDMAUDIOSTREAMCTX_HOST);
     }
     else
         LogFlowFunc(("%s: Warning: Does not have a host stream (anymore)\n", pStream->szName));
 
-    return pStreamHst;
+    return pHstStream;
 }
 
@@ -625 +628 @@
                pStream->szName, pStream->enmDir));
 
-    Log3Func(("[%s]: cbBuf=%RU32\n", pStream->szName, cbBuf));
+    uint32_t cbWritten = 0;
 
     int rc = RTCritSectEnter(&pThis->CritSect);
@@ -631 +634 @@
         return rc;
 
-    if (!pThis->pHostDrvAudio->pfnGetStatus(pThis->pHostDrvAudio, PDMAUDIODIR_OUT))
-    {
-        rc = RTCritSectLeave(&pThis->CritSect);
-        AssertRC(rc);
-
-        return VERR_NOT_AVAILABLE;
-    }
-
-    PPDMAUDIOSTREAM pHstStream = drvAudioGetHostStream(pStream);
-    PPDMAUDIOSTREAM pGstStream = pHstStream->pPair;
-
-    AssertMsg(pGstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED,
-              ("Writing to disabled guest output stream \"%s\" not possible\n", pGstStream->szName));
-
-    if (!AudioMixBufFreeBytes(&pGstStream->MixBuf))
+    do
+    {
+        if (   pThis->pHostDrvAudio
+            && pThis->pHostDrvAudio->pfnGetStatus
+            && pThis->pHostDrvAudio->pfnGetStatus(pThis->pHostDrvAudio, PDMAUDIODIR_OUT) != PDMAUDIOBACKENDSTS_RUNNING)
+        {
+            rc = VERR_NOT_AVAILABLE;
+            break;
+        }
+
+        PPDMAUDIOSTREAM pHstStream = drvAudioGetHostStream(pStream);
+        if (!pHstStream)
+        {
+            rc = VERR_NOT_AVAILABLE;
+            break;
+        }
+
+        PPDMAUDIOSTREAM pGstStream = pHstStream->pPair;
+
+        AssertMsg(pGstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED,
+                  ("Writing to disabled guest output stream \"%s\" not possible\n", pGstStream->szName));
+
+        if (!AudioMixBufFreeBytes(&pGstStream->MixBuf))
+        {
+            LogRel2(("Audio: Guest stream '%s' full, expect stuttering audio output\n", pGstStream->szName));
+            break;
+        }
+
+        uint32_t cWritten = 0;
+        rc = AudioMixBufWriteCirc(&pGstStream->MixBuf, pvBuf, cbBuf, &cWritten);
+        if (rc == VINF_BUFFER_OVERFLOW)
+        {
+            LogRel2(("Audio: Lost audio samples from guest stream '%s', expect stuttering audio output\n", pGstStream->szName));
+            rc = VINF_SUCCESS;
+            break;
+        }
+
+        cbWritten = AUDIOMIXBUF_S2B(&pGstStream->MixBuf, cWritten);
+
+        Log3Func(("[%s] cUsed=%RU32, cLive=%RU32\n",
+                  pGstStream->szName, AudioMixBufUsed(&pGstStream->MixBuf), AudioMixBufLive(&pGstStream->MixBuf)));
+
+    } while (0);
+
+    int rc2 = RTCritSectLeave(&pThis->CritSect);
+    if (RT_SUCCESS(rc))
+        rc = rc2;
+
+    if (RT_SUCCESS(rc))
     {
         if (pcbWritten)
-            *pcbWritten = 0;
-
-        return RTCritSectLeave(&pThis->CritSect);
-    }
-
-    uint32_t cWritten = 0;
-    rc = AudioMixBufWriteCirc(&pGstStream->MixBuf, pvBuf, cbBuf, &cWritten);
-    if (rc == VINF_BUFFER_OVERFLOW)
-    {
-        LogRel2(("Audio: Lost audio samples from guest stream '%s', expect stuttering audio output\n", pGstStream->szName));
-        rc = VINF_SUCCESS;
-    }
-
-    if (RT_SUCCESS(rc))
-    {
-        if (pcbWritten)
-            *pcbWritten = AUDIOMIXBUF_S2B(&pGstStream->MixBuf, cWritten);
-    }
-
-    Log3Func(("cWritten=%RU32 (%RU32 bytes), rc=%Rrc\n", cWritten, AUDIOMIXBUF_S2B(&pHstStream->MixBuf, cWritten), rc));
-
-    int rc2 = RTCritSectLeave(&pThis->CritSect);
-    if (RT_SUCCESS(rc))
-        rc = rc2;
+            *pcbWritten = cbWritten;
+    }
 
     return rc;
@@ -841 +856 @@
                pStream->szName, pStream->enmDir));
 
-    Log3Func(("[%s]\n", pStream->szName));
-
     uint32_t cSamplesPlayed = 0;
 
     do
     {
+        if (!pThis->pHostDrvAudio)
+        {
+            rc = VERR_NOT_AVAILABLE;
+            break;
+        }
+
         /* Backend output (temporarily) disabled / unavailable? */
-        if (pThis->pHostDrvAudio->pfnGetStatus(pThis->pHostDrvAudio, PDMAUDIODIR_OUT) != PDMAUDIOBACKENDSTS_RUNNING)
+        if (   pThis->pHostDrvAudio->pfnGetStatus
+            && pThis->pHostDrvAudio->pfnGetStatus(pThis->pHostDrvAudio, PDMAUDIODIR_OUT) != PDMAUDIOBACKENDSTS_RUNNING)
         {
             /* Pull the new config from the backend and check again. */
@@ -867 +887 @@
         AssertPtr(pGstStream);
 
+        AssertPtr(pThis->pHostDrvAudio->pfnStreamGetStatus);
         PDMAUDIOSTRMSTS strmSts = pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pHstStream);
         if (!(strmSts & PDMAUDIOSTRMSTS_FLAG_INITIALIZED))
@@ -872 +893 @@
             LogFunc(("[%s] Backend not initialized (anymore), re-initializing ...\n", pHstStream->szName));
             rc = drvAudioStreamReInitInternal(pThis, pStream);
-            break;
+            if (RT_FAILURE(rc))
+            {
+                LogFunc(("[%s] Failed to re-initialize backend, rc=%Rrc\n", pHstStream->szName, rc));
+                break;
+            }
         }
 
@@ -881 +906 @@
                 && (strmSts & PDMAUDIOSTRMSTS_FLAG_DATA_WRITABLE))
             {
+                AssertPtr(pThis->pHostDrvAudio->pfnStreamPlay);
                 rc = pThis->pHostDrvAudio->pfnStreamPlay(pThis->pHostDrvAudio, pHstStream, &cSamplesPlayed);
                 if (RT_FAILURE(rc))
@@ -911 +937 @@
     } while (0);
 
+    int rc2 = RTCritSectLeave(&pThis->CritSect);
+    if (RT_SUCCESS(rc))
+        rc = rc2;
+
     if (RT_SUCCESS(rc))
     {
@@ -916 +946 @@
             *pcSamplesPlayed = cSamplesPlayed;
     }
-
-    int rc2 = RTCritSectLeave(&pThis->CritSect);
-    if (RT_SUCCESS(rc))
-        rc = rc2;
 
     if (RT_FAILURE(rc))
@@ -1248 +1274 @@
     /* pcbWritten is optional. */
 
-    int rc = RTCritSectEnter(&pThis->CritSect);
-    if (RT_FAILURE(rc))
-        return rc;
-
     AssertMsg(pStream->enmDir == PDMAUDIODIR_IN,
               ("Stream '%s' is not an input stream and therefore cannot be read from (direction is 0x%x)\n",
                pStream->szName, pStream->enmDir));
 
-    if (pThis->pHostDrvAudio->pfnGetStatus(pThis->pHostDrvAudio, PDMAUDIODIR_IN) != PDMAUDIOBACKENDSTS_RUNNING)
+    uint32_t cbRead = 0;
+
+    int rc = RTCritSectEnter(&pThis->CritSect);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    do
+    {
+        if (   pThis->pHostDrvAudio
+            && pThis->pHostDrvAudio->pfnGetStatus
+            && pThis->pHostDrvAudio->pfnGetStatus(pThis->pHostDrvAudio, PDMAUDIODIR_IN) != PDMAUDIOBACKENDSTS_RUNNING)
+        {
+            rc = VERR_NOT_AVAILABLE;
+            break;
+        }
+
+        PPDMAUDIOSTREAM pHstStream = drvAudioGetHostStream(pStream);
+        if (pHstStream)
+        {
+            rc = VERR_NOT_AVAILABLE;
+            break;
+        }
+
+        PPDMAUDIOSTREAM pGstStream = pHstStream->pPair;
+
+        AssertMsg(pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED,
+                  ("Reading from disabled host input stream '%s' not possible\n", pHstStream->szName));
+
+        Log3Func(("%s\n", pStream->szName));
+
+        /*
+         * Read from the parent buffer (that is, the guest buffer) which
+         * should have the audio data in the format the guest needs.
+         */
+        uint32_t cRead;
+        rc = AudioMixBufReadCirc(&pGstStream->MixBuf, pvBuf, cbBuf, &cRead);
+        if (RT_SUCCESS(rc))
+        {
+            if (cRead)
+            {
+                AudioMixBufFinish(&pGstStream->MixBuf, cRead);
+
+                cbRead = AUDIOMIXBUF_S2B(&pGstStream->MixBuf, cRead);
+            }
+        }
+
+        Log3Func(("cRead=%RU32 (%RU32 bytes), rc=%Rrc\n", cRead, AUDIOMIXBUF_S2B(&pGstStream->MixBuf, cRead), rc));
+
+    } while (0);
+
+    int rc2 = RTCritSectLeave(&pThis->CritSect);
+    if (RT_SUCCESS(rc))
+        rc = rc2;
+
+    if (RT_SUCCESS(rc))
     {
         if (pcbRead)
-            *pcbRead = 0;
-
-        return RTCritSectLeave(&pThis->CritSect);
-    }
-
-    PPDMAUDIOSTREAM pHstStream = drvAudioGetHostStream(pStream);
-    PPDMAUDIOSTREAM pGstStream = pHstStream->pPair;
-
-    AssertMsg(pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED,
-              ("Reading from disabled host input stream '%s' not possible\n", pHstStream->szName));
-
-    Log3Func(("%s\n", pStream->szName));
-
-    /*
-     * Read from the parent buffer (that is, the guest buffer) which
-     * should have the audio data in the format the guest needs.
-     */
-    uint32_t cRead;
-    rc = AudioMixBufReadCirc(&pGstStream->MixBuf, pvBuf, cbBuf, &cRead);
-    if (RT_SUCCESS(rc))
-    {
-        if (cRead)
-            AudioMixBufFinish(&pGstStream->MixBuf, cRead);
-
-        if (pcbRead)
-            *pcbRead = AUDIOMIXBUF_S2B(&pGstStream->MixBuf, cRead);
-    }
-
-    Log3Func(("cRead=%RU32 (%RU32 bytes), rc=%Rrc\n", cRead, AUDIOMIXBUF_S2B(&pGstStream->MixBuf, cRead), rc));
-
-    int rc2 = RTCritSectLeave(&pThis->CritSect);
-    if (RT_SUCCESS(rc))
-        rc = rc2;
+            *pcbRead = cbRead;
+    }
 
     return rc;
@@ -1486 +1531 @@
     }
     else
-        AssertFailed();
+        AssertFailed();
 
     int rc2 = RTCritSectLeave(&pThis->CritSect);
@@ -1607 +1652 @@
     AssertRC(rc2);
 
+    PDMAUDIOSTRMSTS strmSts = PDMAUDIOSTRMSTS_FLAG_NONE;
+
     PPDMAUDIOSTREAM pHstStream = drvAudioGetHostStream(pStream);
-    PDMAUDIOSTRMSTS strmSts    = pHstStream->fStatus;
-
-    Log3Func(("%s: strmSts=0x%x\n", pHstStream->szName, strmSts));
+    if (pHstStream)
+    {
+        strmSts = pHstStream->fStatus;
+        Log3Func(("%s: strmSts=0x%x\n", pHstStream->szName, strmSts));
+    }
 
     rc2 = RTCritSectLeave(&pThis->CritSect);