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

Timestamp:

Jun 24, 2021 3:56:05 PM (4 years ago)

Author:

vboxsync

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

145348

Message:

Audio/ValKit: More code for audio verification. bugref:10008

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioTest.cpp (modified) (5 diffs)
• AudioTest.h (modified) (2 diffs)
• DrvHostAudioValidationKit.cpp (modified) (35 diffs)

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

@@ -128 +128 @@
 
 /**
- * Returns a random test tone frequency.
- */
-DECLINLINE(double) audioTestToneGetRandomFreq(void)
-{
-    return s_aAudioTestToneFreqsHz[RTRandU32Ex(0, RT_ELEMENTS(s_aAudioTestToneFreqsHz) - 1)];
-}
-
-/**
  * Initializes a test tone with a specific frequency (in Hz).
  *
@@ -147 +139 @@
 {
     if (dbFreq == 0.0)
-        dbFreq = audioTestToneGetRandomFreq();
+        dbFreq = AudioTestToneGetRandomFreq();
 
     pTone->rdFreqHz = dbFreq;
@@ -290 +282 @@
 
 /**
- * Initializes an audio test tone parameters struct with random values.
- * @param   pToneParams         Test tone parameters to initialize.
- * @param   pProps              PCM properties to use for the test tone.
- */
-int AudioTestToneParamsInitRandom(PAUDIOTESTTONEPARMS pToneParams, PPDMAUDIOPCMPROPS pProps)
-{
-    AssertReturn(PDMAudioPropsAreValid(pProps), VERR_INVALID_PARAMETER);
-
-    memcpy(&pToneParams->Props, pProps, sizeof(PDMAUDIOPCMPROPS));
-
-    /** @todo Make this a bit more sophisticated later, e.g. muting and prequel/sequel are not very balanced. */
-
-    pToneParams->dbFreqHz       = audioTestToneGetRandomFreq();
-    pToneParams->msPrequel      = RTRandU32Ex(0, RT_MS_5SEC);
-#ifdef DEBUG_andy
-    pToneParams->msDuration     = RTRandU32Ex(0, RT_MS_1SEC);
-#else
-    pToneParams->msDuration     = RTRandU32Ex(0, RT_MS_10SEC); /** @todo Probably a bit too long, but let's see. */
-#endif
-    pToneParams->msSequel       = RTRandU32Ex(0, RT_MS_5SEC);
-    pToneParams->uVolumePercent = RTRandU32Ex(0, 100);
-
-    return VINF_SUCCESS;
+ * Returns a random test tone frequency.
+ */
+double AudioTestToneGetRandomFreq(void)
+{
+    return s_aAudioTestToneFreqsHz[RTRandU32Ex(0, RT_ELEMENTS(s_aAudioTestToneFreqsHz) - 1)];
 }
 
@@ -1411 +1385 @@
 
 /**
+ * Returns whether a test set has running (active) tests or not.
+ *
+ * @returns \c true if it has running tests, or \c false if not.
+ * @param   pSet                Test set to return status for.
+ */
+bool AudioTestSetIsRunning(PAUDIOTESTSET pSet)
+{
+    return (pSet->cTestsRunning > 0);
+}
+
+/**
  * Unpacks a formerly packed audio test set.
  *
@@ -1713 +1698 @@
     rc = RTFileQuerySize(pObjB->File.hFile, &cbSizeB);
     AssertRCReturn(rc, rc);
-    if (   cbSizeA != cbSizeB
-        || !audioTestFilesCompareBinary(pObjA->File.hFile, pObjB->File.hFile, cbSizeA))
+
+    if (!cbSizeA)
+    {
+        int rc2 = audioTestErrorDescAdd(pVerJob->pErr, pVerJob->idxTest, "File '%s' is empty\n", pObjA->szName);
+        AssertRC(rc2);
+    }
+
+    if (!cbSizeB)
+    {
+        int rc2 = audioTestErrorDescAdd(pVerJob->pErr, pVerJob->idxTest, "File '%s' is empty\n", pObjB->szName);
+        AssertRC(rc2);
+    }
+
+    if (cbSizeA != cbSizeB)
+    {
+        int rc2 = audioTestErrorDescAdd(pVerJob->pErr, pVerJob->idxTest, "File '%s' is %zu bytes %s than '%s'\n",
+                                        pObjA->szName,
+                                        cbSizeA > cbSizeB ? cbSizeA - cbSizeB : cbSizeB - cbSizeA,
+                                        cbSizeA > cbSizeB ? "bigger" : "smaller",
+                                        pObjB->szName);
+        AssertRC(rc2);
+    }
+    else if (audioTestFilesCompareBinary(pObjA->File.hFile, pObjB->File.hFile, cbSizeA))
     {
         /** @todo Add more sophisticated stuff here. */
 
-        int rc2 = audioTestErrorDescAdd(pVerJob->pErr, pVerJob->idxTest, "Files '%s' and '%s' don't match\n", szObjA, szObjB);
+        int rc2 = audioTestErrorDescAdd(pVerJob->pErr, pVerJob->idxTest, "Files '%s' and '%s' have different content\n",
+                                        pObjA->szName, pObjB->szName);
         AssertRC(rc2);
     }

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

@@ -340 +340 @@
 double AudioTestToneInit(PAUDIOTESTTONE pTone, PPDMAUDIOPCMPROPS pProps, double dbFreq);
 double AudioTestToneInitRandom(PAUDIOTESTTONE pTone, PPDMAUDIOPCMPROPS pProps);
+double AudioTestToneGetRandomFreq(void);
 int    AudioTestToneGenerate(PAUDIOTESTTONE pTone, void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten);
-
-int    AudioTestToneParamsInitRandom(PAUDIOTESTTONEPARMS pToneParams, PPDMAUDIOPCMPROPS pProps);
 
 int    AudioTestGenTag(char *pszTag, size_t cbTag);
@@ -367 +366 @@
 const char *AudioTestSetGetTag(PAUDIOTESTSET pSet);
 bool   AudioTestSetIsPacked(const char *pszPath);
+bool   AudioTestSetIsRunning(PAUDIOTESTSET pSet);
 int    AudioTestSetPack(PAUDIOTESTSET pSet, const char *pszOutDir, char *pszFileName, size_t cbFileName);
 int    AudioTestSetUnpack(const char *pszFile, const char *pszOutDir);

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

@@ -25 +25 @@
 #include <iprt/mem.h>
 #include <iprt/path.h>
+#include <iprt/semaphore.h>
 #include <iprt/stream.h>
 #include <iprt/uuid.h> /* For PDMIBASE_2_PDMDRV. */
@@ -138 +139 @@
     /** Critical section for serializing access across threads. */
     RTCRITSECT          CritSect;
+    bool                fTestSetEnded;
+    RTSEMEVENT          EventSemEnded;
     /** The Audio Test Service (ATS) instance. */
     ATSSERVER           Srv;
@@ -173 +176 @@
     {
         AssertPtrReturnVoid(pTst->pEntry);
-        AudioTestSetTestDone(pTst->pEntry);
         pTst->pEntry = NULL;
     }
@@ -218 +220 @@
 static void drvHostValKitCleanup(PDRVHOSTVALKITAUDIO pThis)
 {
-    LogRel(("Audio: Validation Kit: Cleaning up ...\n"));
+    LogRel(("ValKit: Cleaning up ...\n"));
 
     if (pThis->cTestsRec)
-        LogRel(("Audio: Validation Kit: Warning: %RU32 guest recording tests still outstanding:\n", pThis->cTestsRec));
+        LogRel(("ValKit: Warning: %RU32 guest recording tests still outstanding:\n", pThis->cTestsRec));
 
     PVALKITTESTDATA pTst, pTstNext;
@@ -228 +230 @@
         size_t const cbOutstanding = pTst->t.TestTone.u.Rec.cbToWrite - pTst->t.TestTone.u.Rec.cbWritten;
         if (cbOutstanding)
-            LogRel(("Audio: Validation Kit: \tRecording test #%RU32 has %RU64 bytes (%RU32ms) outstanding\n",
+            LogRel(("ValKit: \tRecording test #%RU32 has %RU64 bytes (%RU32ms) outstanding\n",
                     pTst->idxTest, cbOutstanding, PDMAudioPropsBytesToMilli(&pTst->t.TestTone.Parms.Props, (uint32_t)cbOutstanding)));
         drvHostValKiUnregisterRecTest(pThis, pTst);
@@ -234 +236 @@
 
     if (pThis->cTestsPlay)
-        LogRel(("Audio: Validation Kit: Warning: %RU32 guest playback tests still outstanding:\n", pThis->cTestsPlay));
+        LogRel(("ValKit: Warning: %RU32 guest playback tests still outstanding:\n", pThis->cTestsPlay));
 
     RTListForEachSafe(&pThis->lstTestsPlay, pTst, pTstNext, VALKITTESTDATA, Node)
@@ -240 +242 @@
         size_t const cbOutstanding = pTst->t.TestTone.u.Play.cbToRead - pTst->t.TestTone.u.Play.cbRead;
         if (cbOutstanding)
-            LogRel(("Audio: Validation Kit: \tPlayback test #%RU32 has %RU64 bytes (%RU32ms) outstanding\n",
+            LogRel(("ValKit: \tPlayback test #%RU32 has %RU64 bytes (%RU32ms) outstanding\n",
                     pTst->idxTest, cbOutstanding, PDMAudioPropsBytesToMilli(&pTst->t.TestTone.Parms.Props, (uint32_t)cbOutstanding)));
         drvHostValKiUnregisterPlayTest(pThis, pTst);
@@ -259 +261 @@
     PDRVHOSTVALKITAUDIO pThis = (PDRVHOSTVALKITAUDIO)pvUser;
 
-    LogRel(("Audio: Validation Kit: Beginning test set '%s'\n", pszTag));
-    return AudioTestSetCreate(&pThis->Set, pThis->szPathTemp, pszTag);
+    int rc = RTCritSectEnter(&pThis->CritSect);
+    if (RT_SUCCESS(rc))
+    {
+
+        LogRel(("ValKit: Beginning test set '%s'\n", pszTag));
+        rc = AudioTestSetCreate(&pThis->Set, pThis->szPathTemp, pszTag);
+
+        int rc2 = RTCritSectLeave(&pThis->CritSect);
+        if (RT_SUCCESS(rc))
+            rc = rc2;
+    }
+
+    if (RT_FAILURE(rc))
+        LogRel(("ValKit: Beginning test set failed with %Rrc\n", rc));
+
+    return rc;
 }
 
@@ -268 +284 @@
     PDRVHOSTVALKITAUDIO pThis = (PDRVHOSTVALKITAUDIO)pvUser;
 
-    const PAUDIOTESTSET pSet  = &pThis->Set;
-
-    LogRel(("Audio: Validation Kit: Ending test set '%s'\n", pszTag));
-
-    /* Close the test set first. */
-    AudioTestSetClose(pSet);
-
-    /* Before destroying the test environment, pack up the test set so
-     * that it's ready for transmission. */
-    int rc = AudioTestSetPack(pSet, pThis->szPathOut, pThis->szTestSetArchive, sizeof(pThis->szTestSetArchive));
-    if (RT_SUCCESS(rc))
-        LogRel(("Audio: Validation Kit: Packed up to '%s'\n", pThis->szTestSetArchive));
-
-    /* Do some internal housekeeping. */
-    drvHostValKitCleanup(pThis);
-
-    int rc2 = AudioTestSetWipe(pSet);
-    if (RT_SUCCESS(rc))
-        rc = rc2;
-
-    AudioTestSetDestroy(pSet);
+    int rc = RTCritSectEnter(&pThis->CritSect);
+    if (RT_SUCCESS(rc))
+    {
+        const PAUDIOTESTSET pSet  = &pThis->Set;
+
+        if (AudioTestSetIsRunning(pSet))
+        {
+            pThis->fTestSetEnded = true;
+
+            rc = RTCritSectLeave(&pThis->CritSect);
+            if (RT_SUCCESS(rc))
+            {
+                LogRel(("ValKit: Waiting for runnig test set '%s' to end ...\n", pszTag));
+                rc = RTSemEventWait(pThis->EventSemEnded, RT_MS_30SEC);
+
+                int rc2 = RTCritSectEnter(&pThis->CritSect);
+                if (RT_SUCCESS(rc))
+                    rc = rc2;
+            }
+        }
+
+        if (RT_SUCCESS(rc))
+        {
+            LogRel(("ValKit: Ending test set '%s'\n", pszTag));
+
+            /* Close the test set first. */
+            rc = AudioTestSetClose(pSet);
+            if (RT_SUCCESS(rc))
+            {
+                /* Before destroying the test environment, pack up the test set so
+                 * that it's ready for transmission. */
+                rc = AudioTestSetPack(pSet, pThis->szPathOut, pThis->szTestSetArchive, sizeof(pThis->szTestSetArchive));
+                if (RT_SUCCESS(rc))
+                    LogRel(("ValKit: Packed up to '%s'\n", pThis->szTestSetArchive));
+
+                /* Do some internal housekeeping. */
+                drvHostValKitCleanup(pThis);
+
+#ifndef DEBUG_andy
+                int rc2 = AudioTestSetWipe(pSet);
+                if (RT_SUCCESS(rc))
+                    rc = rc2;
+#endif
+            }
+
+            AudioTestSetDestroy(pSet);
+        }
+
+        int rc2 = RTCritSectLeave(&pThis->CritSect);
+        if (RT_SUCCESS(rc))
+            rc = rc2;
+    }
 
     if (RT_FAILURE(rc))
-        LogRel(("Audio: Validation Kit: Ending test set failed with %Rrc\n", rc));
+        LogRel(("ValKit: Ending test set failed with %Rrc\n", rc));
 
     return rc;
@@ -310 +357 @@
     memcpy(&pTestData->t.TestTone.Parms, pToneParms, sizeof(AUDIOTESTTONEPARMS));
 
-    AudioTestToneInit(&pTestData->t.TestTone.Tone, &pToneParms->Props, pTestData->t.TestTone.Parms.dbFreqHz);
-
-    pTestData->t.TestTone.u.Rec.cbToWrite = PDMAudioPropsMilliToBytes(&pToneParms->Props,
+    AssertReturn(pTestData->t.TestTone.Parms.msDuration, VERR_INVALID_PARAMETER);
+    AssertReturn(PDMAudioPropsAreValid(&pTestData->t.TestTone.Parms.Props), VERR_INVALID_PARAMETER);
+
+    AudioTestToneInit(&pTestData->t.TestTone.Tone, &pTestData->t.TestTone.Parms.Props, pTestData->t.TestTone.Parms.dbFreqHz);
+
+    pTestData->t.TestTone.u.Rec.cbToWrite = PDMAudioPropsMilliToBytes(&pTestData->t.TestTone.Parms.Props,
                                                                       pTestData->t.TestTone.Parms.msDuration);
     int rc = RTCritSectEnter(&pThis->CritSect);
     if (RT_SUCCESS(rc))
     {
-        LogRel(("Audio: Validation Kit: Registered guest recording test #%RU32 (%RU32ms, %RU64 bytes)\n",
+        LogRel(("ValKit: Registered guest recording test #%RU32 (%RU32ms, %RU64 bytes)\n",
                 pThis->cTestsTotal, pTestData->t.TestTone.Parms.msDuration, pTestData->t.TestTone.u.Rec.cbToWrite));
 
@@ -347 +397 @@
     memcpy(&pTestData->t.TestTone.Parms, pToneParms, sizeof(AUDIOTESTTONEPARMS));
 
-    pTestData->t.TestTone.u.Play.cbToRead = PDMAudioPropsMilliToBytes(&pToneParms->Props,
+    AssertReturn(pTestData->t.TestTone.Parms.msDuration, VERR_INVALID_PARAMETER);
+    AssertReturn(PDMAudioPropsAreValid(&pTestData->t.TestTone.Parms.Props), VERR_INVALID_PARAMETER);
+
+    pTestData->t.TestTone.u.Play.cbToRead = PDMAudioPropsMilliToBytes(&pTestData->t.TestTone.Parms.Props,
                                                                       pTestData->t.TestTone.Parms.msDuration);
     int rc = RTCritSectEnter(&pThis->CritSect);
     if (RT_SUCCESS(rc))
     {
-        LogRel(("Audio: Validation Kit: Registered guest playback test #%RU32 (%RU32ms, %RU64 bytes)\n",
+        LogRel(("ValKit: Registered guest playback test #%RU32 (%RU32ms, %RU64 bytes)\n",
                 pThis->cTestsTotal, pTestData->t.TestTone.Parms.msDuration, pTestData->t.TestTone.u.Play.cbToRead));
 
@@ -375 +428 @@
     PDRVHOSTVALKITAUDIO pThis = (PDRVHOSTVALKITAUDIO)pvUser;
 
-    if (!RTFileExists(pThis->szTestSetArchive)) /* Has the archive successfully been created yet? */
-        return VERR_WRONG_ORDER;
-
-    int rc = RTFileOpen(&pThis->hTestSetArchive, pThis->szTestSetArchive, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE);
-    if (RT_SUCCESS(rc))
-    {
-        uint64_t uSize;
-        rc = RTFileQuerySize(pThis->hTestSetArchive, &uSize);
-        if (RT_SUCCESS(rc))
-            LogRel(("Audio: Validation Kit: Sending test set '%s' (%zu bytes)\n", pThis->szTestSetArchive, uSize));
-    }
+    int rc = RTCritSectEnter(&pThis->CritSect);
+    if (RT_SUCCESS(rc))
+    {
+        if (RTFileExists(pThis->szTestSetArchive)) /* Has the archive successfully been created yet? */
+        {
+            rc = RTFileOpen(&pThis->hTestSetArchive, pThis->szTestSetArchive, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE);
+            if (RT_SUCCESS(rc))
+            {
+                uint64_t uSize;
+                rc = RTFileQuerySize(pThis->hTestSetArchive, &uSize);
+                if (RT_SUCCESS(rc))
+                    LogRel(("ValKit: Sending test set '%s' (%zu bytes)\n", pThis->szTestSetArchive, uSize));
+            }
+        }
+        else
+            rc = VERR_FILE_NOT_FOUND;
+
+        int rc2 = RTCritSectLeave(&pThis->CritSect);
+        if (RT_SUCCESS(rc))
+            rc = rc2;
+    }
+
+    if (RT_FAILURE(rc))
+        LogRel(("ValKit: Beginning to send test set failed with %Rrc\n", rc));
 
     return rc;
@@ -398 +464 @@
     PDRVHOSTVALKITAUDIO pThis = (PDRVHOSTVALKITAUDIO)pvUser;
 
-    return RTFileRead(pThis->hTestSetArchive, pvBuf, cbBuf, pcbRead);
+    int rc = RTCritSectEnter(&pThis->CritSect);
+    if (RT_SUCCESS(rc))
+    {
+        if (RTFileIsValid(pThis->hTestSetArchive))
+        {
+            rc =  RTFileRead(pThis->hTestSetArchive, pvBuf, cbBuf, pcbRead);
+        }
+        else
+            rc = VERR_WRONG_ORDER;
+
+        int rc2 = RTCritSectLeave(&pThis->CritSect);
+        if (RT_SUCCESS(rc))
+            rc = rc2;
+    }
+
+    if (RT_FAILURE(rc))
+        LogRel(("ValKit: Reading from test set failed with %Rrc\n", rc));
+
+    return rc;
 }
 
@@ -408 +492 @@
     PDRVHOSTVALKITAUDIO pThis = (PDRVHOSTVALKITAUDIO)pvUser;
 
-    int rc = RTFileClose(pThis->hTestSetArchive);
-    if (RT_SUCCESS(rc))
-    {
-        pThis->hTestSetArchive = NIL_RTFILE;
-    }
+    int rc = RTCritSectEnter(&pThis->CritSect);
+    if (RT_SUCCESS(rc))
+    {
+        if (RTFileIsValid(pThis->hTestSetArchive))
+        {
+            rc = RTFileClose(pThis->hTestSetArchive);
+            if (RT_SUCCESS(rc))
+                pThis->hTestSetArchive = NIL_RTFILE;
+        }
+
+        int rc2 = RTCritSectLeave(&pThis->CritSect);
+        if (RT_SUCCESS(rc))
+            rc = rc2;
+    }
+
+    if (RT_FAILURE(rc))
+        LogRel(("ValKit: Ending to send test set failed with %Rrc\n", rc));
 
     return rc;
@@ -532 +628 @@
 static DECLCALLBACK(int) drvHostValKitAudioHA_StreamDrain(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
-    RT_NOREF(pInterface, pStream);
+    RT_NOREF(pStream);
+
+    PDRVHOSTVALKITAUDIO pThis = RT_FROM_MEMBER(pInterface, DRVHOSTVALKITAUDIO, IHostAudio);
+
+    int rc = RTCritSectEnter(&pThis->CritSect);
+    if (RT_SUCCESS(rc))
+    {
+        PVALKITTESTDATA pTst = pThis->pTestCur;
+
+        if (pTst)
+        {
+            LogRel(("ValKit: Test #%RU32: Recording audio data ended (took %RU32ms)\n",
+                pTst->idxTest, RTTimeMilliTS() - pTst->msStartedTS));
+
+            if (pTst->t.TestTone.u.Play.cbRead > pTst->t.TestTone.u.Play.cbToRead)
+                LogRel(("ValKit: Warning: Test #%RU32 read %RU32 bytes more than announced\n",
+                        pTst->idxTest, pTst->t.TestTone.u.Play.cbRead - pTst->t.TestTone.u.Play.cbToRead));
+
+            AudioTestSetTestDone(pTst->pEntry);
+
+            pThis->pTestCur = NULL;
+            pTst            = NULL;
+
+            if (pThis->fTestSetEnded)
+                rc = RTSemEventSignal(pThis->EventSemEnded);
+        }
+
+        int rc2 = RTCritSectLeave(&pThis->CritSect);
+        AssertRC(rc2);
+    }
+
     return VINF_SUCCESS;
 }
@@ -595 +721 @@
     RT_NOREF(pStream);
 
+    if (cbBuf == 0)
+    {
+        /* Fend off draining calls. */
+        *pcbWritten = 0;
+        return VINF_SUCCESS;
+    }
+
     PDRVHOSTVALKITAUDIO pThis = RT_FROM_MEMBER(pInterface, DRVHOSTVALKITAUDIO, IHostAudio);
 
+    PVALKITTESTDATA pTst = NULL;
+
     int rc = RTCritSectEnter(&pThis->CritSect);
     if (RT_SUCCESS(rc))
     {
-        pThis->pTestCur = RTListGetFirst(&pThis->lstTestsPlay, VALKITTESTDATA, Node);
+        if (pThis->pTestCur == NULL)
+            pThis->pTestCur = RTListGetFirst(&pThis->lstTestsPlay, VALKITTESTDATA, Node);
+
+        pTst = pThis->pTestCur;
 
         int rc2 = RTCritSectLeave(&pThis->CritSect);
@@ -606 +744 @@
     }
 
-    if (pThis->pTestCur == NULL) /* Empty list? */
-    {
-        LogRelMax(64, ("Audio: Validation Kit: Warning: Guest is playing back data when no playback test is active\n"));
+    if (pTst == NULL) /* Empty list? */
+    {
+        LogRel(("ValKit: Warning: Guest is playing back data when no playback test is active\n"));
 
         *pcbWritten = cbBuf;
@@ -614 +752 @@
     }
 
-    PVALKITTESTDATA pTst = pThis->pTestCur;
+#if 1
+    if (PDMAudioPropsIsBufferSilence(&pStream->pStream->Cfg.Props, pvBuf, cbBuf))
+    {
+        LogRel(("ValKit: Skipping %RU32 bytes of silence\n", cbBuf));
+
+        *pcbWritten = cbBuf;
+        return VINF_SUCCESS;
+    }
+#endif
 
     if (pTst->t.TestTone.u.Play.cbRead == 0)
@@ -633 +779 @@
         {
             pTst->msStartedTS = RTTimeMilliTS();
-            LogRel(("Audio: Validation Kit: Recording audio data (%RU16Hz, %RU32ms) started\n",
-                    (uint16_t)Parms.TestTone.dbFreqHz, Parms.TestTone.msDuration));
+            LogRel(("ValKit: Test #%RU32: Recording audio data (%RU16Hz, %RU32ms) started\n",
+                    pTst->idxTest, (uint16_t)Parms.TestTone.dbFreqHz, Parms.TestTone.msDuration));
         }
     }
@@ -642 +788 @@
     if (RT_SUCCESS(rc))
     {
-        uint32_t cbToRead = RT_MIN(cbBuf,
-                                   pTst->t.TestTone.u.Play.cbToRead - pTst->t.TestTone.u.Play.cbRead);
-
-        rc = AudioTestSetObjWrite(pTst->pObj, pvBuf, cbToRead);
-        if (RT_SUCCESS(rc))
-        {
-            pTst->t.TestTone.u.Play.cbRead += cbToRead;
-            Assert(pTst->t.TestTone.u.Play.cbRead <= pTst->t.TestTone.u.Play.cbToRead);
-
-            const bool fComplete = pTst->t.TestTone.u.Play.cbToRead == pTst->t.TestTone.u.Play.cbRead;
-
+        rc = AudioTestSetObjWrite(pTst->pObj, pvBuf, cbBuf);
+        if (RT_SUCCESS(rc))
+        {
+            pTst->t.TestTone.u.Play.cbRead += cbBuf;
+
+        #if 0
+            const bool fComplete = pTst->t.TestTone.u.Play.cbRead >= pTst->t.TestTone.u.Play.cbToRead;
             if (fComplete)
             {
-                LogRel(("Audio: Validation Kit: Recording audio data done (took %RU32ms)\n",
-                        RTTimeMilliTS() - pTst->msStartedTS));
+                LogRel(("ValKit: Test #%RU32: Recording audio data ended (took %RU32ms)\n",
+                        pTst->idxTest, RTTimeMilliTS() - pTst->msStartedTS));
+
+                if (pTst->t.TestTone.u.Play.cbRead > pTst->t.TestTone.u.Play.cbToRead)
+                    LogRel(("ValKit: Warning: Test #%RU32 read %RU32 bytes more than announced\n",
+                            pTst->idxTest, pTst->t.TestTone.u.Play.cbRead - pTst->t.TestTone.u.Play.cbToRead));
 
                 rc = RTCritSectEnter(&pThis->CritSect);
                 if (RT_SUCCESS(rc))
                 {
-                    drvHostValKiUnregisterPlayTest(pThis, pTst);
+                    AudioTestSetTestDone(pTst->pEntry);
 
                     pThis->pTestCur = NULL;
+                    pTst            = NULL;
+
+                    if (pThis->fTestSetEnded)
+                        rc = RTSemEventSignal(pThis->EventSemEnded);
 
                     int rc2 = RTCritSectLeave(&pThis->CritSect);
-                    AssertRC(rc2);
+                    if (RT_SUCCESS(rc))
+                        rc = rc2;
                 }
             }
-
-            cbWritten = cbToRead;
+        #endif
+
+            cbWritten = cbBuf;
         }
     }
@@ -676 +828 @@
     if (RT_FAILURE(rc))
     {
-        if (pTst->pEntry)
+        if (   pTst
+            && pTst->pEntry)
             AudioTestSetTestFailed(pTst->pEntry, rc, "Recording audio data failed");
-        LogRel(("Audio: Validation Kit: Recording audio data failed with %Rrc\n", rc));
+        LogRel(("ValKit: Recording audio data failed with %Rrc\n", rc));
     }
 
@@ -700 +853 @@
     if (RT_SUCCESS(rc))
     {
-        pThis->pTestCur = RTListGetFirst(&pThis->lstTestsRec, VALKITTESTDATA, Node);
+        if (pThis->pTestCur == NULL)
+            pThis->pTestCur = RTListGetFirst(&pThis->lstTestsRec, VALKITTESTDATA, Node);
 
         int rc2 = RTCritSectLeave(&pThis->CritSect);
@@ -708 +862 @@
     if (pThis->pTestCur == NULL) /* Empty list? */
     {
-        LogRelMax(64, ("Audio: Validation Kit: Warning: Guest is recording audio data when no recording test is active\n"));
+        LogRelMax(64, ("ValKit: Warning: Guest is recording audio data when no recording test is active\n"));
 
         *pcbRead = 0;
@@ -733 +887 @@
         {
             pTst->msStartedTS = RTTimeMilliTS();
-            LogRel(("Audio: Validation Kit: Injecting audio input data (%RU16Hz, %RU32ms) started\n",
+            LogRel(("ValKit: Injecting audio input data (%RU16Hz, %RU32ms) started\n",
                     (uint16_t)pTst->t.TestTone.Tone.rdFreqHz,
                     pTst->t.TestTone.Parms.msDuration));
@@ -759 +913 @@
                 if (fComplete)
                 {
-                    LogRel(("Audio: Validation Kit: Injecting audio input data done (took %RU32ms)\n",
+                    LogRel(("ValKit: Injecting audio input data done (took %RU32ms)\n",
                             RTTimeMilliTS() - pTst->msStartedTS));
 
@@ -768 +922 @@
 
                         pThis->pTestCur = NULL;
+                        pTst            = NULL;
 
                         int rc2 = RTCritSectLeave(&pThis->CritSect);
@@ -779 +934 @@
     if (RT_FAILURE(rc))
     {
-        if (pTst->pEntry)
+        if (   pTst
+            && pTst->pEntry)
             AudioTestSetTestFailed(pTst->pEntry, rc, "Injecting audio input data failed");
-        LogRel(("Audio: Validation Kit: Injecting audio input data failed with %Rrc\n", rc));
+        LogRel(("ValKit: Injecting audio input data failed with %Rrc\n", rc));
     }
 
@@ -844 +1000 @@
     pThis->IHostAudio.pfnStreamCapture              = drvHostValKitAudioHA_StreamCapture;
 
+    int rc = RTCritSectInit(&pThis->CritSect);
+    AssertRCReturn(rc, rc);
+    rc = RTSemEventCreate(&pThis->EventSemEnded);
+    AssertRCReturn(rc, rc);
+
+    pThis->fTestSetEnded = false;
+
     RTListInit(&pThis->lstTestsRec);
     pThis->cTestsRec  = 0;
@@ -864 +1027 @@
        uint32_t uTcpPort   = ATS_TCP_HOST_DEFAULT_PORT;
 
-    LogRel(("Audio: Validation Kit: Starting Audio Test Service (ATS) at %s:%RU32...\n",
+    LogRel(("ValKit: Starting Audio Test Service (ATS) at %s:%RU32...\n",
             pszTcpAddr, uTcpPort));
 
-    int rc = AudioTestSvcInit(&pThis->Srv,
-                              /* We only allow connections from localhost for now. */
-                              pszTcpAddr, uTcpPort, &Callbacks);
+    rc = AudioTestSvcInit(&pThis->Srv,
+                          /* We only allow connections from localhost for now. */
+                          pszTcpAddr, uTcpPort, &Callbacks);
     if (RT_SUCCESS(rc))
         rc = AudioTestSvcStart(&pThis->Srv);
@@ -875 +1038 @@
     if (RT_SUCCESS(rc))
     {
-        LogRel(("Audio: Validation Kit: Audio Test Service (ATS) running\n"));
+        LogRel(("ValKit: Audio Test Service (ATS) running\n"));
 
         /** @todo Let the following be customizable by CFGM later. */
@@ -881 +1044 @@
         if (RT_SUCCESS(rc))
         {
-            LogRel(("Audio: Validation Kit: Using temp dir '%s'\n", pThis->szPathTemp));
+            LogRel(("ValKit: Using temp dir '%s'\n", pThis->szPathTemp));
             rc = AudioTestPathGetTemp(pThis->szPathOut, sizeof(pThis->szPathOut));
             if (RT_SUCCESS(rc))
-                LogRel(("Audio: Validation Kit: Using output dir '%s'\n", pThis->szPathOut));
+                LogRel(("ValKit: Using output dir '%s'\n", pThis->szPathOut));
         }
     }
 
-    if (RT_SUCCESS(rc))
-        rc = RTCritSectInit(&pThis->CritSect);
-
     if (RT_FAILURE(rc))
-        LogRel(("Audio: Validation Kit: Initialization failed, rc=%Rrc\n", rc));
+        LogRel(("ValKit: Initialization failed, rc=%Rrc\n", rc));
 
     return rc;
@@ -902 +1062 @@
     PDRVHOSTVALKITAUDIO pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTVALKITAUDIO);
 
-    LogRel(("Audio: Validation Kit: Shutting down Audio Test Service (ATS) ...\n"));
+    LogRel(("ValKit: Shutting down Audio Test Service (ATS) ...\n"));
 
     int rc = AudioTestSvcShutdown(&pThis->Srv);
@@ -910 +1070 @@
     if (RT_SUCCESS(rc))
     {
-        LogRel(("Audio: Validation Kit: Shutdown of Audio Test Service (ATS) complete\n"));
+        LogRel(("ValKit: Shutdown of Audio Test Service (ATS) complete\n"));
         drvHostValKitCleanup(pThis);
     }
     else
-        LogRel(("Audio: Validation Kit: Shutdown of Audio Test Service (ATS) failed, rc=%Rrc\n", rc));
+        LogRel(("ValKit: Shutdown of Audio Test Service (ATS) failed, rc=%Rrc\n", rc));
 
     /* Try cleaning up a bit. */
@@ -920 +1080 @@
     RTDirRemove(pThis->szPathOut);
 
+    RTSemEventDestroy(pThis->EventSemEnded);
+
     if (RTCritSectIsInitialized(&pThis->CritSect))
     {
@@ -928 +1090 @@
 
     if (RT_FAILURE(rc))
-        LogRel(("Audio: Validation Kit: Destruction failed, rc=%Rrc\n", rc));
+        LogRel(("ValKit: Destruction failed, rc=%Rrc\n", rc));
 }