Changeset 73570 in vbox for trunk/src/VBox

Timestamp:

Aug 8, 2018 3:28:35 PM (6 years ago)

Author:

vboxsync

Message:

Audio/DrvAudio: Also make use of VERR_AUDIO_STREAM_NOT_READY for playback stuff.

File:

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

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

@@ -863 +863 @@
                pStream->szName, pStream->enmDir));
 
+    AssertMsg(DrvAudioHlpBytesIsAligned(cbBuf, &pStream->Guest.Cfg.Props),
+              ("Writing audio data (%RU32 bytes) to stream '%s' is not properly aligned\n", cbBuf, pStream->szName));
+
     uint32_t cbWrittenTotal = 0;
 
@@ -874 +877 @@
 
 #ifdef LOG_ENABLED
-    char *pszStreamSts = NULL;
+    char *pszStreamSts = dbgAudioStreamStatusToStr(pStream->fStatus);
+    AssertPtr(pszStreamSts);
 #endif
 
     do
     {
-        if (!pThis->Out.fEnabled)
-        {
-            cbWrittenTotal = cbBuf;
+        if (   !pThis->Out.fEnabled
+            || !DrvAudioHlpStreamStatusIsReady(pStream->fStatus))
+        {
+            rc = VERR_AUDIO_STREAM_NOT_READY;
             break;
         }
@@ -889 +894 @@
             && pThis->pHostDrvAudio->pfnGetStatus(pThis->pHostDrvAudio, PDMAUDIODIR_OUT) != PDMAUDIOBACKENDSTS_RUNNING)
         {
-            rc = VERR_NOT_AVAILABLE;
-            break;
-        }
-
-        AssertMsg(DrvAudioHlpBytesIsAligned(cbBuf, &pStream->Guest.Cfg.Props),
-                  ("Writing audio data (%RU32 bytes) to stream '%s' is not properly aligned\n", cbBuf, pStream->szName));
-
-#ifdef LOG_ENABLED
-        pszStreamSts = dbgAudioStreamStatusToStr(pStream->fStatus);
-        AssertPtr(pszStreamSts);
-#endif
-        if (!(pStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_ENABLED))
-        {
-            Log3Func(("[%s] Writing to disabled guest output stream not possible (status is %s)\n",
-                      pStream->szName, pszStreamSts));
-#ifdef DEBUG_andy
-            AssertFailed();
-#endif
-            rc = VERR_NOT_AVAILABLE;
+            rc = VERR_AUDIO_STREAM_NOT_READY;
             break;
         }
@@ -921 +908 @@
 
         if (!cbToWrite)
+        {
+            rc = VERR_BUFFER_OVERFLOW;
             break;
+        }
 
         /* We use the guest side mixing buffer as an intermediate buffer to do some
@@ -987 +977 @@
     } while (0);
 
-    Log3Func(("[%s] fEnabled=%RTbool, cbWrittenTotal=%RU32, rc=%Rrc\n",
-              pStream->szName, pThis->Out.fEnabled, cbWrittenTotal, rc));
+    Log3Func(("[%s] cbWrittenTotal=%RU32, rc=%Rrc\n", pStream->szName, cbWrittenTotal, rc));
 
 #ifdef LOG_ENABLED
@@ -1403 +1392 @@
     uint32_t cfPlayedTotal = 0;
 
-    if (!pThis->pHostDrvAudio)
-        return VINF_SUCCESS;
-
     PDMAUDIOSTREAMSTS stsStream = pStream->fStatus;
 #ifdef LOG_ENABLED
@@ -1415 +1401 @@
     do
     {
-        /*
-         * Check if the backend is ready to operate.
-         */
-        if (!(stsStream & PDMAUDIOSTREAMSTS_FLAG_ENABLED)) /* Stream disabled? Bail out. */
+        if (!pThis->pHostDrvAudio)
+        {
+            rc = VERR_AUDIO_STREAM_NOT_READY;
             break;
-
+        }
+
+        if (   !pThis->Out.fEnabled
+            || !DrvAudioHlpStreamStatusIsReady(stsStream))
+        {
+            rc = VERR_AUDIO_STREAM_NOT_READY;
+            break;
+        }
               uint32_t cfLive       = AudioMixBufLive(&pStream->Host.MixBuf);
         const uint8_t  uLivePercent = (100 * cfLive) / AudioMixBufSize(&pStream->Host.MixBuf);