Changeset 92335 in vbox for trunk/src/VBox/Devices

Timestamp:

Nov 10, 2021 5:20:27 PM (3 years ago)

Author:

vboxsync

Message:

Audio/Validation Kit: More bugfixes for the Validation Kit audio driver, dealing with overlapping playback data. bugref:10008

File:

• trunk/src/VBox/Devices/Audio/DrvHostAudioValidationKit.cpp (modified) (6 diffs)

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

@@ -1096 +1096 @@
     uint8_t *auBuf     = (uint8_t *)pvBuf;
 
+    uint64_t const msStartedTS = RTTimeMilliTS();
+
     while (cbWritten < cbBuf)
     {
@@ -1116 +1118 @@
                     bool const fStarted = AudioTestBeaconGetRemaining(pBeacon) == AudioTestBeaconGetSize(pBeacon);
 
-                    size_t off = 0; /* Points at the data right *after the found beacon data on return. */
+                    size_t off = 0; /* Points at the data right *after* the found beacon data on return. */
                     rc2 = AudioTestBeaconAddConsecutive(pBeacon, auBuf, cbBuf - cbWritten, &off);
                     if (RT_SUCCESS(rc2))
@@ -1122 +1124 @@
                         cbWritten += (uint32_t)off;
                         auBuf     += off;
+                    }
+                    else /* No beacon data found. */
+                    {
+                        LogRel2(("ValKit: Test #%RU32: Warning: Beacon data for '%s' not found (%Rrc) - Skipping ...\n",
+                                 pTst->idxTest, AudioTestBeaconTypeGetName(pBeacon->enmType), rc2));
+                        cbWritten = cbBuf; /* Skip all. */
+                        break;
                     }
 
@@ -1151 +1160 @@
                          pTst->idxTest, cbRemaining, PDMAudioPropsBytesToMilli(&pStream->pStream->Cfg.Props, cbRemaining)));
 
-                /* Whether we count all silence as recorded data or not.
-                 * Currently we don't, as otherwise consequtively played tones will be cut off in the end. */
-                if (!fIsAllSilence)
-                {
-                    /* Don't read more than we're told to.
-                     * After the actual test tone data there might come a post beacon which also
-                     * needs to be handled in the AUDIOTESTSTATE_POST state then. */
-                    const uint32_t cbData = RT_MIN(cbBuf - cbWritten, cbRemaining);
-
-                    pTst->t.TestTone.u.Play.cbRead += cbData;
-
-                    cbWritten += cbData;
-                    auBuf     += cbData;
-                }
+                /* Don't read more than we're told to.
+                 * After the actual test tone data there might come a post beacon which also
+                 * needs to be handled in the AUDIOTESTSTATE_POST state then. */
+                const uint32_t cbData = RT_MIN(cbBuf - cbWritten, cbRemaining);
+
+                pTst->t.TestTone.u.Play.cbRead += cbData;
+
+                cbWritten += cbData;
+                auBuf     += cbData;
 
                 const bool fComplete = pTst->t.TestTone.u.Play.cbRead >= pTst->t.TestTone.u.Play.cbToRead;
@@ -1172 +1176 @@
                             pTst->idxTest, RTTimeMilliTS() - pTst->msStartedTS));
 
-                    if (pTst->t.TestTone.u.Play.cbRead > pTst->t.TestTone.u.Play.cbToRead)
-                        LogRel(("ValKit: Test #%RU32: Warning: Read %RU32 bytes more than announced\n",
-                                pTst->idxTest, pTst->t.TestTone.u.Play.cbRead - pTst->t.TestTone.u.Play.cbToRead));
-
                     pTst->enmState = AUDIOTESTSTATE_POST;
+
                     /* Re-use the beacon object, but this time it's the post beacon. */
                     AudioTestBeaconInit(&pTst->t.TestTone.Beacon, AUDIOTESTTONEBEACONTYPE_PLAY_POST, &pTst->t.TestTone.Parms.Props);
@@ -1196 +1197 @@
         if (pTst->enmState == AUDIOTESTSTATE_DONE)
             break;
+
+        if (RTTimeMilliTS() - msStartedTS > RT_MS_30SEC)
+        {
+            LogRel(("ValKit: Test #%RU32: Error: Playback processing timed out -- please report this bug!\n", pTst->idxTest));
+            break;
+        }
     }