Changeset 89890 in vbox

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

Files:

• Devices/Audio/AudioTest.cpp (modified) (5 diffs)
• Devices/Audio/AudioTest.h (modified) (2 diffs)
• Devices/Audio/DrvHostAudioValidationKit.cpp (modified) (35 diffs)
• ValidationKit/utils/audio/vkat.cpp (modified) (17 diffs)
• ValidationKit/utils/audio/vkatCmdSelfTest.cpp (modified) (5 diffs)
• ValidationKit/utils/audio/vkatCommon.cpp (modified) (11 diffs)
• ValidationKit/utils/audio/vkatInternal.h (modified) (3 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));
 }
 

trunk/src/VBox/ValidationKit/utils/audio/vkat.cpp

@@ -61 +61 @@
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
-static int audioTestCombineParms(PAUDIOTESTPARMS pBaseParms, PAUDIOTESTPARMS pOverrideParms);
 static int audioVerifyOne(const char *pszPathSetA, const char *pszPathSetB);
 
@@ -230 +229 @@
 
 
-/**
- * Overrides audio test base parameters with another set.
- *
- * @returns VBox status code.
- * @param   pBaseParms          Base parameters to override.
- * @param   pOverrideParms      Override parameters to use for overriding the base parameters.
- *
- * @note    Overriding a parameter depends on its type / default values.
- */
-static int audioTestCombineParms(PAUDIOTESTPARMS pBaseParms, PAUDIOTESTPARMS pOverrideParms)
-{
-    RT_NOREF(pBaseParms, pOverrideParms);
-
-    /** @todo Implement parameter overriding. */
-    return VERR_NOT_IMPLEMENTED;
-}
-
-
 /*********************************************************************************************************************************
 *   Test callbacks                                                                                                               *
@@ -257 +238 @@
 static DECLCALLBACK(int) audioTestPlayToneSetup(PAUDIOTESTENV pTstEnv, PAUDIOTESTDESC pTstDesc, PAUDIOTESTPARMS pTstParmsAcq, void **ppvCtx)
 {
-    RT_NOREF(pTstEnv, pTstDesc, ppvCtx);
+    RT_NOREF(pTstDesc, ppvCtx);
+
+    int rc;
+
+    if (strlen(pTstEnv->szDev))
+    {
+        rc = audioTestDriverStackSetDevice(&pTstEnv->DrvStack, PDMAUDIODIR_OUT, pTstEnv->szDev);
+        if (RT_FAILURE(rc))
+            return rc;
+    }
 
     pTstParmsAcq->enmType     = AUDIOTESTTYPE_TESTTONE_PLAY;
-
-    PDMAudioPropsInit(&pTstParmsAcq->Props, 16 /* bit */ / 8, true /* fSigned */, 2 /* Channels */, 44100 /* Hz */);
-
+    pTstParmsAcq->Props       = pTstEnv->Props;
     pTstParmsAcq->enmDir      = PDMAUDIODIR_OUT;
 #ifdef DEBUG
-    pTstParmsAcq->cIterations = 2;
+    pTstParmsAcq->cIterations = 1;
 #else
     pTstParmsAcq->cIterations = RTRandU32Ex(1, 10);
@@ -271 +259 @@
     pTstParmsAcq->idxCurrent  = 0;
 
-    return VINF_SUCCESS;
+    PAUDIOTESTTONEPARMS pToneParms = &pTstParmsAcq->TestTone;
+
+    pToneParms->Props          = pTstParmsAcq->Props;
+    pToneParms->dbFreqHz       = AudioTestToneGetRandomFreq();
+    pToneParms->msPrequel      = 0; /** @todo Implement analyzing this first! */
+#ifdef DEBUG_andy
+    pToneParms->msDuration     = 2000;
+#else
+    pToneParms->msDuration     = RTRandU32Ex(0, RT_MS_10SEC); /** @todo Probably a bit too long, but let's see. */
+#endif
+    pToneParms->msSequel       = 0;   /** @todo Implement analyzing this first! */
+    pToneParms->uVolumePercent = 100; /** @todo Implement analyzing this first! */
+
+    return rc;
 }
 
@@ -285 +286 @@
     for (uint32_t i = 0; i < pTstParms->cIterations; i++)
     {
-        AudioTestToneParamsInitRandom(&pTstParms->TestTone, &pTstParms->Props);
-
+        /*
+         * 1. Arm the (host) ValKit ATS with the recording parameters.
+         */
         PAUDIOTESTTONEPARMS const pToneParms = &pTstParms->TestTone;
         rc = AudioTestSvcClientToneRecord(&pTstEnv->u.Host.AtsClValKit, pToneParms);
         if (RT_SUCCESS(rc))
+        {
+            /*
+             * 2. Tell the guest ATS to start playback.
+             */
             rc = AudioTestSvcClientTonePlay(&pTstEnv->u.Host.AtsClGuest, pToneParms);
+        }
 
         if (RT_FAILURE(rc))
@@ -314 +321 @@
 static DECLCALLBACK(int) audioTestRecordToneSetup(PAUDIOTESTENV pTstEnv, PAUDIOTESTDESC pTstDesc, PAUDIOTESTPARMS pTstParmsAcq, void **ppvCtx)
 {
-    RT_NOREF(pTstEnv, pTstDesc, ppvCtx);
+    RT_NOREF(pTstDesc, ppvCtx);
+
+    int rc;
+
+    if (strlen(pTstEnv->szDev))
+    {
+        rc = audioTestDriverStackSetDevice(&pTstEnv->DrvStack, PDMAUDIODIR_IN, pTstEnv->szDev);
+        if (RT_FAILURE(rc))
+            return rc;
+    }
 
     pTstParmsAcq->enmType     = AUDIOTESTTYPE_TESTTONE_RECORD;
-
-    PDMAudioPropsInit(&pTstParmsAcq->Props, 16 /* bit */ / 8, true /* fSigned */, 2 /* Channels */, 44100 /* Hz */);
-
+    pTstParmsAcq->Props       = pTstEnv->Props;
     pTstParmsAcq->enmDir      = PDMAUDIODIR_IN;
 #ifdef DEBUG
-    pTstParmsAcq->cIterations = 2;
+    pTstParmsAcq->cIterations = 1;
 #else
     pTstParmsAcq->cIterations = RTRandU32Ex(1, 10);
@@ -328 +342 @@
     pTstParmsAcq->idxCurrent  = 0;
 
-    return VINF_SUCCESS;
+    return rc;
 }
 
@@ -349 +363 @@
 #endif
         /*
-         * 1. Arm the ValKit ATS with the recording parameters.
+         * 1. Arm the (host) ValKit ATS with the playback parameters.
          */
         rc = AudioTestSvcClientTonePlay(&pTstEnv->u.Host.AtsClValKit, &pTstParms->TestTone);
@@ -399 +413 @@
  * @param   pTstDesc            Test to run.
  * @param   uSeq                Test sequence # in case there are more tests.
- * @param   pOverrideParms      Test parameters for overriding the actual test parameters. Optional.
- */
-static int audioTestOne(PAUDIOTESTENV pTstEnv, PAUDIOTESTDESC pTstDesc,
-                        unsigned uSeq, PAUDIOTESTPARMS pOverrideParms)
+ */
+static int audioTestOne(PAUDIOTESTENV pTstEnv, PAUDIOTESTDESC pTstDesc, unsigned uSeq)
 {
     RT_NOREF(uSeq);
@@ -431 +443 @@
     }
 
-    audioTestCombineParms(&TstParms, pOverrideParms);
-
     RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Test #%u: %RU32 iterations\n", uSeq, TstParms.cIterations);
-
-    if (TstParms.Dev.pszName && strlen(TstParms.Dev.pszName)) /** @todo Refine this check. Use pszId for starters! */
-        rc = audioTestDeviceOpen(&TstParms.Dev);
 
     AssertPtr(pTstDesc->pfnExec);
@@ -455 +462 @@
     }
 
-    rc = audioTestDeviceClose(&TstParms.Dev);
-
     audioTestParmsDestroy(&TstParms);
 
@@ -467 +472 @@
  * @returns VBox status code.
  * @param   pTstEnv             Test environment to use for running all tests.
- * @param   pOverrideParms      Test parameters for (some / all) specific test parameters. Optional.
- */
-int audioTestWorker(PAUDIOTESTENV pTstEnv, PAUDIOTESTPARMS pOverrideParms)
+ */
+int audioTestWorker(PAUDIOTESTENV pTstEnv)
 {
     int rc = VINF_SUCCESS;
@@ -501 +505 @@
             for (unsigned i = 0; i < RT_ELEMENTS(g_aTests); i++)
             {
-                int rc2 = audioTestOne(pTstEnv, &g_aTests[i], uSeq, pOverrideParms);
+                int rc2 = audioTestOne(pTstEnv, &g_aTests[i], uSeq);
                 if (RT_SUCCESS(rc))
                     rc = rc2;
@@ -631 +635 @@
     RT_ZERO(TstEnv);
 
-    AUDIOTESTPARMS TstCust;
-    audioTestParmsInit(&TstCust);
-
     const char *pszDevice     = NULL; /* Custom device to use. Can be NULL if not being used. */
     const char *pszTag        = NULL; /* Custom tag to use. Can be NULL if not being used. */
@@ -750 +751 @@
 
             case VKAT_TEST_OPT_VOL:
-                TstCust.TestTone.uVolumePercent = ValueUnion.u8;
+                TstEnv.uVolumePercent = ValueUnion.u8;
                 break;
 
@@ -766 +767 @@
 
     /* Initialize the custom test parameters with sensible defaults if nothing else is given. */
-    PDMAudioPropsInit(&TstCust.TestTone.Props,
+    PDMAudioPropsInit(&TstEnv.Props,
                       cPcmSampleBit ? cPcmSampleBit / 8 : 2 /* 16-bit */, fPcmSigned, cPcmChannels ? cPcmChannels : 2,
                       uPcmHz ? uPcmHz : 44100);
@@ -784 +785 @@
                           pszGuestTcpAddr, uGuestTcpPort);
     if (RT_SUCCESS(rc))
-    {
-        audioTestWorker(&TstEnv, &TstCust);
-        audioTestEnvDestroy(&TstEnv);
-    }
-
-    audioTestParmsDestroy(&TstCust);
+        rc = audioTestWorker(&TstEnv);
+
+    audioTestEnvDestroy(&TstEnv);
 
     if (RT_FAILURE(rc)) /* Let us know that something went wrong in case we forgot to mention it. */

trunk/src/VBox/ValidationKit/utils/audio/vkatCmdSelfTest.cpp

@@ -56 +56 @@
     PSELFTESTCTX pCtx = (PSELFTESTCTX)pvUser;
 
-    AUDIOTESTPARMS TstCust;
-    audioTestParmsInit(&TstCust);
-
-    PAUDIOTESTENV pTstEnv = &pCtx->Guest.TstEnv;
+    PAUDIOTESTENV pTstEnvGst = &pCtx->Guest.TstEnv;
 
     /* Flag the environment for self test mode. */
-    pTstEnv->fSelftest = true;
+    pTstEnvGst->fSelftest = true;
 
     /* Generate tag for guest side. */
-    int rc = RTStrCopy(pTstEnv->szTag, sizeof(pTstEnv->szTag), pCtx->szTag);
+    int rc = RTStrCopy(pTstEnvGst->szTag, sizeof(pTstEnvGst->szTag), pCtx->szTag);
     AssertRCReturn(rc, rc);
 
-    rc = AudioTestPathCreateTemp(pTstEnv->szPathTemp, sizeof(pTstEnv->szPathTemp), "selftest-guest");
+    rc = AudioTestPathCreateTemp(pTstEnvGst->szPathTemp, sizeof(pTstEnvGst->szPathTemp), "selftest-guest");
     AssertRCReturn(rc, rc);
 
-    rc = AudioTestPathCreateTemp(pTstEnv->szPathOut, sizeof(pTstEnv->szPathOut), "selftest-out");
+    rc = AudioTestPathCreateTemp(pTstEnvGst->szPathOut, sizeof(pTstEnvGst->szPathOut), "selftest-out");
     AssertRCReturn(rc, rc);
 
-    pTstEnv->enmMode = AUDIOTESTMODE_GUEST;
+    pTstEnvGst->enmMode = AUDIOTESTMODE_GUEST;
 
     /** @todo Make this customizable. */
-    PDMAudioPropsInit(&TstCust.TestTone.Props,
+    PDMAudioPropsInit(&pTstEnvGst->Props,
                       2 /* 16-bit */, true  /* fSigned */, 2 /* cChannels */, 44100 /* uHz */);
 
-    rc = audioTestEnvInit(pTstEnv, pTstEnv->DrvStack.pDrvReg, pCtx->fWithDrvAudio,
+    rc = audioTestEnvInit(pTstEnvGst, pTstEnvGst->DrvStack.pDrvReg, pCtx->fWithDrvAudio,
                           pCtx->Host.szValKitAtsAddr, pCtx->Host.uValKitAtsPort,
                           pCtx->Guest.szAtsAddr, pCtx->Guest.uAtsPort);
@@ -87 +84 @@
         RTThreadUserSignal(hThread);
 
-        audioTestWorker(pTstEnv, &TstCust);
-        audioTestEnvDestroy(pTstEnv);
-    }
-
-    audioTestParmsDestroy(&TstCust);
+        audioTestWorker(pTstEnvGst);
+        audioTestEnvDestroy(pTstEnvGst);
+    }
 
     return rc;
@@ -118 +113 @@
      */
 
-    AUDIOTESTPARMS TstCust;
-    audioTestParmsInit(&TstCust);
-
     /* Generate a common tag for guest and host side. */
     int rc = AudioTestGenTag(pCtx->szTag, sizeof(pCtx->szTag));
     AssertRCReturn(rc, RTEXITCODE_FAILURE);
 
-    PAUDIOTESTENV pTstEnv = &pCtx->Host.TstEnv;
+    PAUDIOTESTENV pTstEnvHst = &pCtx->Host.TstEnv;
 
     /* Flag the environment for self test mode. */
-    pTstEnv->fSelftest = true;
+    pTstEnvHst->fSelftest = true;
 
     /* Generate tag for host side. */
-    rc = RTStrCopy(pTstEnv->szTag, sizeof(pTstEnv->szTag), pCtx->szTag);
+    rc = RTStrCopy(pTstEnvHst->szTag, sizeof(pTstEnvHst->szTag), pCtx->szTag);
     AssertRCReturn(rc, RTEXITCODE_FAILURE);
 
-    rc = AudioTestPathCreateTemp(pTstEnv->szPathTemp, sizeof(pTstEnv->szPathTemp), "selftest-tmp");
+    rc = AudioTestPathCreateTemp(pTstEnvHst->szPathTemp, sizeof(pTstEnvHst->szPathTemp), "selftest-tmp");
     AssertRCReturn(rc, RTEXITCODE_FAILURE);
 
-    rc = AudioTestPathCreateTemp(pTstEnv->szPathOut, sizeof(pTstEnv->szPathOut), "selftest-out");
+    rc = AudioTestPathCreateTemp(pTstEnvHst->szPathOut, sizeof(pTstEnvHst->szPathOut), "selftest-out");
     AssertRCReturn(rc, RTEXITCODE_FAILURE);
+
+    /* Initialize the PCM properties to some sane values. */
+    PDMAudioPropsInit(&pTstEnvHst->Props,
+                      2 /* 16-bit */, true /* fPcmSigned */, 2 /* cPcmChannels */, 44100 /* uPcmHz */);
 
     /*
@@ -161 +157 @@
          * Steps 2 + 3.
          */
-        pTstEnv->enmMode = AUDIOTESTMODE_HOST;
-
-        rc = audioTestEnvInit(pTstEnv, &g_DrvHostValidationKitAudio, true /* fWithDrvAudio */,
+        pTstEnvHst->enmMode = AUDIOTESTMODE_HOST;
+
+        rc = audioTestEnvInit(pTstEnvHst, &g_DrvHostValidationKitAudio, true /* fWithDrvAudio */,
                               pCtx->Host.szValKitAtsAddr, pCtx->Host.uValKitAtsPort,
                               pCtx->Host.szGuestAtsAddr, pCtx->Host.uGuestAtsPort);
         if (RT_SUCCESS(rc))
         {
-            rc = audioTestWorker(pTstEnv, &TstCust);
+            rc = audioTestWorker(pTstEnvHst);
             if (RT_SUCCESS(rc))
             {
@@ -174 +170 @@
             }
 
-            audioTestEnvDestroy(pTstEnv);
+            audioTestEnvDestroy(pTstEnvHst);
         }
     }
-
-    audioTestParmsDestroy(&TstCust);
 
     /*

trunk/src/VBox/ValidationKit/utils/audio/vkatCommon.cpp

@@ -68 +68 @@
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
-static int audioTestCreateStreamDefaultIn(PAUDIOTESTENV pTstEnv, PAUDIOTESTSTREAM pStream, PPDMAUDIOPCMPROPS pProps);
-static int audioTestCreateStreamDefaultOut(PAUDIOTESTENV pTstEnv, PAUDIOTESTSTREAM pStream, PPDMAUDIOPCMPROPS pProps);
+static int audioTestStreamInit(PAUDIOTESTDRVSTACK pDrvStack, PAUDIOTESTSTREAM pStream, PDMAUDIODIR enmDir, PCPDMAUDIOPCMPROPS pProps, bool fWithMixer, uint32_t cMsBufferSize, uint32_t cMsPreBuffer, uint32_t cMsSchedulingHint);
 static int audioTestStreamDestroy(PAUDIOTESTENV pTstEnv, PAUDIOTESTSTREAM pStream);
 static int audioTestDevicesEnumerateAndCheck(PAUDIOTESTENV pTstEnv, const char *pszDev, PPDMAUDIOHOSTDEV *ppDev);
@@ -144 +143 @@
 }
 
-/**
- * Opens an audio device.
- *
- * @returns VBox status code.
- * @param   pDev                Audio device to open.
- */
-int audioTestDeviceOpen(PPDMAUDIOHOSTDEV pDev)
-{
-    int rc = VINF_SUCCESS;
-
-    RTTestSubF(g_hTest, "Opening audio device '%s' ...", pDev->pszName);
-
-    /** @todo Detect + open device here. */
-
-    RTTestSubDone(g_hTest);
-
-    return rc;
-}
-
-/**
- * Closes an audio device.
- *
- * @returns VBox status code.
- * @param   pDev                Audio device to close.
- */
-int audioTestDeviceClose(PPDMAUDIOHOSTDEV pDev)
-{
-    int rc = VINF_SUCCESS;
-
-    RTTestSubF(g_hTest, "Closing audio device '%s' ...", pDev->pszName);
-
-    /** @todo Close device here. */
-
-    RTTestSubDone(g_hTest);
+static int audioTestStreamInit(PAUDIOTESTDRVSTACK pDrvStack, PAUDIOTESTSTREAM pStream,
+                               PDMAUDIODIR enmDir, PCPDMAUDIOPCMPROPS pProps, bool fWithMixer,
+                               uint32_t cMsBufferSize, uint32_t cMsPreBuffer, uint32_t cMsSchedulingHint)
+{
+    int rc;
+
+    if (enmDir == PDMAUDIODIR_IN)
+        rc = audioTestDriverStackStreamCreateInput(pDrvStack, pProps, cMsBufferSize,
+                                                   cMsPreBuffer, cMsSchedulingHint, &pStream->pStream, &pStream->Cfg);
+    else if (enmDir == PDMAUDIODIR_OUT)
+        rc = audioTestDriverStackStreamCreateOutput(pDrvStack, pProps, cMsBufferSize,
+                                                    cMsPreBuffer, cMsSchedulingHint, &pStream->pStream, &pStream->Cfg);
+    else
+        rc = VERR_NOT_SUPPORTED;
+
+    if (RT_SUCCESS(rc))
+    {
+        if (!pDrvStack->pIAudioConnector)
+        {
+            pStream->pBackend = &((PAUDIOTESTDRVSTACKSTREAM)pStream->pStream)->Backend;
+        }
+        else
+            pStream->pBackend = NULL;
+
+        /*
+         * Automatically enable the mixer if the PCM properties don't match.
+         */
+        if (   !fWithMixer
+            && !PDMAudioPropsAreEqual(pProps, &pStream->Cfg.Props))
+        {
+            RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS,  "Enabling stream mixer\n");
+            fWithMixer = true;
+        }
+
+        rc = AudioTestMixStreamInit(&pStream->Mix, pDrvStack, pStream->pStream,
+                                    fWithMixer ? pProps : NULL, 100 /* ms */); /** @todo Configure mixer buffer? */
+    }
+
+    if (RT_FAILURE(rc))
+        RTTestFailed(g_hTest, "Initializing %s stream failed with %Rrc", enmDir == PDMAUDIODIR_IN ? "input" : "output", rc);
 
     return rc;
@@ -201 +206 @@
     }
 
-    return rc;
-}
-
-/**
- * Creates an audio default input (recording) test stream.
- * Convenience function.
- *
- * @returns VBox status code.
- * @param   pTstEnv             Test environment to use for creating the stream.
- * @param   pStream             Audio stream to create.
- * @param   pProps              PCM properties to use for creation.
- */
-static int audioTestCreateStreamDefaultIn(PAUDIOTESTENV pTstEnv, PAUDIOTESTSTREAM pStream, PPDMAUDIOPCMPROPS pProps)
-{
-    pStream->pBackend = NULL;
-    int rc = audioTestDriverStackStreamCreateInput(&pTstEnv->DrvStack, pProps, pTstEnv->cMsBufferSize, pTstEnv->cMsPreBuffer,
-                                                   pTstEnv->cMsSchedulingHint, &pStream->pStream, &pStream->Cfg);
-    if (RT_SUCCESS(rc) && !pTstEnv->DrvStack.pIAudioConnector)
-        pStream->pBackend = &((PAUDIOTESTDRVSTACKSTREAM)pStream->pStream)->Backend;
-    return rc;
-}
-
-/**
- * Creates an audio default output (playback) test stream.
- * Convenience function.
- *
- * @returns VBox status code.
- * @param   pTstEnv             Test environment to use for creating the stream.
- * @param   pStream             Audio stream to create.
- * @param   pProps              PCM properties to use for creation.
- */
-static int audioTestCreateStreamDefaultOut(PAUDIOTESTENV pTstEnv, PAUDIOTESTSTREAM pStream, PPDMAUDIOPCMPROPS pProps)
-{
-    pStream->pBackend = NULL;
-    int rc = audioTestDriverStackStreamCreateOutput(&pTstEnv->DrvStack, pProps, pTstEnv->cMsBufferSize, pTstEnv->cMsPreBuffer,
-                                                    pTstEnv->cMsSchedulingHint, &pStream->pStream, &pStream->Cfg);
-    if (RT_SUCCESS(rc) && !pTstEnv->DrvStack.pIAudioConnector)
-        pStream->pBackend = &((PAUDIOTESTDRVSTACKSTREAM)pStream->pStream)->Backend;
+    AudioTestMixStreamTerm(&pStream->Mix);
+
     return rc;
 }
@@ -246 +215 @@
 *   Test Primitives                                                                                                              *
 *********************************************************************************************************************************/
+
+/**
+ * Returns a random scheduling hint (in ms).
+ */
+DECLINLINE(uint32_t) audioTestEnvGetRandomSchedulingHint(void)
+{
+    static const unsigned s_aSchedulingHintsMs[] =
+    {
+        10,
+        25,
+        50,
+        100,
+        200,
+        250
+    };
+
+    return s_aSchedulingHintsMs[RTRandU32Ex(0, RT_ELEMENTS(s_aSchedulingHintsMs) - 1)];
+}
 
 /**
@@ -260 +247 @@
 {
     AUDIOTESTTONE TstTone;
-    AudioTestToneInit(&TstTone, &pParms->Props, pParms->dbFreqHz);
+    AudioTestToneInit(&TstTone, &pStream->Cfg.Props, pParms->dbFreqHz);
 
     const char *pcszPathOut = pTstEnv->Set.szPathAbs;
 
     RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Playing test tone (tone frequency is %RU16Hz, %RU32ms)\n", (uint16_t)pParms->dbFreqHz, pParms->msDuration);
-    RTTestPrintf(g_hTest, RTTESTLVL_DEBUG,  "Writing to '%s'\n", pcszPathOut);
+    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Using %RU32ms stream scheduling hint\n", pStream->Cfg.Device.cMsSchedulingHint);
+    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Writing to '%s'\n", pcszPathOut);
 
     /** @todo Use .WAV here? */
@@ -272 +260 @@
     AssertRCReturn(rc, rc);
 
+    rc = AudioTestMixStreamEnable(&pStream->Mix);
+    if (   RT_SUCCESS(rc)
+        && AudioTestMixStreamIsOkay(&pStream->Mix))
+    {
+        uint8_t  abBuf[_4K];
+
+        uint32_t cbToPlayTotal  = PDMAudioPropsMilliToBytes(&pStream->Cfg.Props, pParms->msDuration);
+        AssertStmt(cbToPlayTotal, rc = VERR_INVALID_PARAMETER);
+
+        RTTestPrintf(g_hTest, RTTESTLVL_DEBUG, "Playing %RU32 bytes total\n", cbToPlayTotal);
+
+        AudioTestSetObjAddMetadataStr(pObj, "stream_to_play_bytes=%RU32\n",      cbToPlayTotal);
+        AudioTestSetObjAddMetadataStr(pObj, "stream_period_size_frames=%RU32\n", pStream->Cfg.Backend.cFramesPeriod);
+        AudioTestSetObjAddMetadataStr(pObj, "stream_buffer_size_frames=%RU32\n", pStream->Cfg.Backend.cFramesBufferSize);
+        AudioTestSetObjAddMetadataStr(pObj, "stream_prebuf_size_frames=%RU32\n", pStream->Cfg.Backend.cFramesPreBuffering);
+        /* Note: This mostly is provided by backend (e.g. PulseAudio / ALSA / ++) and
+         *       has nothing to do with the device emulation scheduling hint. */
+        AudioTestSetObjAddMetadataStr(pObj, "device_scheduling_hint_ms=%RU32\n", pStream->Cfg.Device.cMsSchedulingHint);
+
+        while (cbToPlayTotal)
+        {
+            uint32_t       cbPlayed   = 0;
+            uint32_t const cbCanWrite = AudioTestMixStreamGetWritable(&pStream->Mix);
+            if (cbCanWrite)
+            {
+                uint32_t const cbToGenerate = RT_MIN(RT_MIN(cbToPlayTotal, sizeof(abBuf)), cbCanWrite);
+                uint32_t       cbToPlay;
+                rc = AudioTestToneGenerate(&TstTone, abBuf, cbToGenerate, &cbToPlay);
+                if (RT_SUCCESS(rc))
+                {
+                    RTTestPrintf(g_hTest, RTTESTLVL_DEBUG, "Playing %RU32 bytes ...\n", cbToPlay);
+
+                    /* Write stuff to disk before trying to play it. Help analysis later. */
+                    rc = AudioTestSetObjWrite(pObj, abBuf, cbToPlay);
+                    if (RT_SUCCESS(rc))
+                        rc = AudioTestMixStreamPlay(&pStream->Mix, abBuf, cbToPlay, &cbPlayed);
+                }
+
+                if (RT_FAILURE(rc))
+                    break;
+            }
+            else if (AudioTestMixStreamIsOkay(&pStream->Mix))
+                RTThreadSleep(RT_MIN(RT_MAX(1, pStream->Cfg.Device.cMsSchedulingHint), 256));
+            else
+                AssertFailedBreakStmt(rc = VERR_AUDIO_STREAM_NOT_READY);
+
+            Assert(cbToPlayTotal >= cbPlayed);
+            cbToPlayTotal -= cbPlayed;
+        }
+
+        if (cbToPlayTotal != 0)
+            RTTestFailed(g_hTest, "Playback ended unexpectedly (%RU32 bytes left)\n", cbToPlayTotal);
+    }
+    else
+        rc = VERR_AUDIO_STREAM_NOT_READY;
+
+    int rc2 = AudioTestSetObjClose(pObj);
+    if (RT_SUCCESS(rc))
+        rc = rc2;
+
+    if (RT_FAILURE(rc))
+        RTTestFailed(g_hTest, "Playing tone failed with %Rrc\n", rc);
+
+    return rc;
+}
+
+/**
+ * Records a test tone from a specific audio test stream.
+ *
+ * @returns VBox status code.
+ * @param   pTstEnv             Test environment to use for running the test.
+ * @param   pStream             Stream to use for recording the tone.
+ * @param   pParms              Tone parameters to use.
+ *
+ * @note    Blocking function.
+ */
+static int audioTestRecordTone(PAUDIOTESTENV pTstEnv, PAUDIOTESTSTREAM pStream, PAUDIOTESTTONEPARMS pParms)
+{
+    const char *pcszPathOut = pTstEnv->Set.szPathAbs;
+
+    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Recording test tone (for %RU32ms)\n", pParms->msDuration);
+    RTTestPrintf(g_hTest, RTTESTLVL_DEBUG,  "Writing to '%s'\n", pcszPathOut);
+
+    /** @todo Use .WAV here? */
+    PAUDIOTESTOBJ pObj;
+    int rc = AudioTestSetObjCreateAndRegister(&pTstEnv->Set, "guest-tone-rec.pcm", &pObj);
+    AssertRCReturn(rc, rc);
+
     if (audioTestDriverStackStreamIsOkay(&pTstEnv->DrvStack, pStream->pStream))
     {
-        uint32_t cbBuf;
-        uint8_t  abBuf[_4K];
-
         const uint32_t cbPerSched = PDMAudioPropsMilliToBytes(&pParms->Props, pTstEnv->cMsSchedulingHint);
         AssertStmt(cbPerSched, rc = VERR_INVALID_PARAMETER);
-              uint32_t cbToWrite  = PDMAudioPropsMilliToBytes(&pParms->Props, pParms->msDuration);
-        AssertStmt(cbToWrite,  rc = VERR_INVALID_PARAMETER);
+              uint32_t cbToRead   = PDMAudioPropsMilliToBytes(&pParms->Props, pParms->msDuration);
+        AssertStmt(cbToRead,   rc = VERR_INVALID_PARAMETER);
 
         if (RT_SUCCESS(rc))
@@ -288 +361 @@
             AudioTestSetObjAddMetadataStr(pObj, "scheduling_hint_ms=%RU32\n", pTstEnv->cMsSchedulingHint);
 
-            while (cbToWrite)
-            {
-                uint32_t cbWritten    = 0;
-                uint32_t cbToGenerate = RT_MIN(cbToWrite, RT_MIN(cbPerSched, sizeof(abBuf)));
-                Assert(cbToGenerate);
-
-                rc = AudioTestToneGenerate(&TstTone, abBuf, cbToGenerate, &cbBuf);
-                if (RT_SUCCESS(rc))
-                {
-                    /* Write stuff to disk before trying to play it. Help analysis later. */
-                    rc = AudioTestSetObjWrite(pObj, abBuf, cbBuf);
-                    if (RT_SUCCESS(rc))
-                        rc = audioTestDriverStackStreamPlay(&pTstEnv->DrvStack, pStream->pStream,
-                                                            abBuf, cbBuf, &cbWritten);
-                }
-
-                if (RT_FAILURE(rc))
-                    break;
-
-                RTThreadSleep(pTstEnv->cMsSchedulingHint);
-
-                Assert(cbToWrite >= cbWritten);
-                cbToWrite -= cbWritten;
-            }
-        }
-    }
-    else
-        rc = VERR_AUDIO_STREAM_NOT_READY;
-
-    int rc2 = AudioTestSetObjClose(pObj);
-    if (RT_SUCCESS(rc))
-        rc = rc2;
-
-    if (RT_FAILURE(rc))
-        RTTestFailed(g_hTest, "Playing tone done failed with %Rrc\n", rc);
-
-    return rc;
-}
-
-/**
- * Records a test tone from a specific audio test stream.
- *
- * @returns VBox status code.
- * @param   pTstEnv             Test environment to use for running the test.
- * @param   pStream             Stream to use for recording the tone.
- * @param   pParms              Tone parameters to use.
- *
- * @note    Blocking function.
- */
-static int audioTestRecordTone(PAUDIOTESTENV pTstEnv, PAUDIOTESTSTREAM pStream, PAUDIOTESTTONEPARMS pParms)
-{
-    const char *pcszPathOut = pTstEnv->Set.szPathAbs;
-
-    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Recording test tone (for %RU32ms)\n", pParms->msDuration);
-    RTTestPrintf(g_hTest, RTTESTLVL_DEBUG,  "Writing to '%s'\n", pcszPathOut);
-
-    /** @todo Use .WAV here? */
-    PAUDIOTESTOBJ pObj;
-    int rc = AudioTestSetObjCreateAndRegister(&pTstEnv->Set, "guest-tone-rec.pcm", &pObj);
-    AssertRCReturn(rc, rc);
-
-    if (audioTestDriverStackStreamIsOkay(&pTstEnv->DrvStack, pStream->pStream))
-    {
-        const uint32_t cbPerSched = PDMAudioPropsMilliToBytes(&pParms->Props, pTstEnv->cMsSchedulingHint);
-        AssertStmt(cbPerSched, rc = VERR_INVALID_PARAMETER);
-              uint32_t cbToRead   = PDMAudioPropsMilliToBytes(&pParms->Props, pParms->msDuration);
-        AssertStmt(cbToRead,   rc = VERR_INVALID_PARAMETER);
-
-        if (RT_SUCCESS(rc))
-        {
-            AudioTestSetObjAddMetadataStr(pObj, "buffer_size_ms=%RU32\n", pTstEnv->cMsBufferSize);
-            AudioTestSetObjAddMetadataStr(pObj, "prebuf_size_ms=%RU32\n", pTstEnv->cMsPreBuffer);
-            AudioTestSetObjAddMetadataStr(pObj, "scheduling_hint_ms=%RU32\n", pTstEnv->cMsSchedulingHint);
-
             uint8_t abBuf[_4K];
 
@@ -444 +443 @@
     const PAUDIOTESTSTREAM pTstStream = &pTstEnv->aStreams[0]; /** @todo Make this dynamic. */
 
-    int rc = audioTestCreateStreamDefaultOut(pTstEnv, pTstStream, &pToneParms->Props);
+    int rc = audioTestStreamInit(&pTstEnv->DrvStack, pTstStream, PDMAUDIODIR_OUT, &pTstEnv->Props, false /* fWithMixer */,
+                                 pTstEnv->cMsBufferSize, pTstEnv->cMsPreBuffer, pTstEnv->cMsSchedulingHint);
     if (RT_SUCCESS(rc))
     {
@@ -484 +484 @@
     const PAUDIOTESTSTREAM pTstStream = &pTstEnv->aStreams[0]; /** @todo Make this dynamic. */
 
-    int rc = audioTestCreateStreamDefaultIn(pTstEnv, pTstStream, &pToneParms->Props);
+    int rc = audioTestStreamInit(&pTstEnv->DrvStack, pTstStream, PDMAUDIODIR_IN, &pTstEnv->Props, false /* fWithMixer */,
+                                 pTstEnv->cMsBufferSize, pTstEnv->cMsPreBuffer, pTstEnv->cMsSchedulingHint);
     if (RT_SUCCESS(rc))
     {
@@ -666 +667 @@
     RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Temp directory is '%s'\n", pTstEnv->szPathTemp);
 
+    if (!pTstEnv->cMsBufferSize)
+        pTstEnv->cMsBufferSize     = UINT32_MAX;
+    if (!pTstEnv->cMsPreBuffer)
+        pTstEnv->cMsPreBuffer      = UINT32_MAX;
+    if (!pTstEnv->cMsSchedulingHint)
+        pTstEnv->cMsSchedulingHint = UINT32_MAX;
+
     PDMAudioHostEnumInit(&pTstEnv->DevEnum);
-
-    pTstEnv->cMsBufferSize     = 300; /* ms */ /** @todo Randomize this also? */
-    pTstEnv->cMsPreBuffer      = 150; /* ms */ /** @todo Ditto. */
-    pTstEnv->cMsSchedulingHint = RTRandU32Ex(10, 80); /* Choose a random scheduling (in ms). */
 
     bool fUseDriverStack = false; /* Whether to init + use the audio driver stack or not. */
@@ -691 +695 @@
 
         PPDMAUDIOHOSTDEV pDev;
-        rc = audioTestDevicesEnumerateAndCheck(pTstEnv, NULL /* pszDevice */, &pDev); /** @todo Implement device checking. */
+        rc = audioTestDevicesEnumerateAndCheck(pTstEnv, pTstEnv->szDev, &pDev);
         if (RT_FAILURE(rc))
             return rc;

trunk/src/VBox/ValidationKit/utils/audio/vkatInternal.h

@@ -165 +165 @@
     /** The stream config. */
     PDMAUDIOSTREAMCFG       Cfg;
+    /** Associated mixing stream. Optional. */
+    AUDIOTESTDRVMIXSTREAM   Mix;
 } AUDIOTESTSTREAM;
 /** Pointer to audio test stream. */
@@ -184 +186 @@
     /** Whether skip the actual verification or not. */
     bool                    fSkipVerify;
+    /** The PCM properties to use. */
+    PDMAUDIOPCMPROPS        Props;
+    /** Name of the audio device to use.
+     *  If empty the default audio device will be used. */
+    char                    szDev[128];
+    /** Audio volume to use (in percent).
+     *  Might not be available on all systems. */
+    uint8_t                 uVolumePercent;
     /** Output path for storing the test environment's final test files. */
     char                    szTag[AUDIOTEST_TAG_MAX];
@@ -427 +437 @@
 /** @}  */
 
-int         audioTestWorker(PAUDIOTESTENV pTstEnv, PAUDIOTESTPARMS pOverrideParms);
+int         audioTestWorker(PAUDIOTESTENV pTstEnv);
 
 /** @name Command handlers