Changeset 89992 in vbox

Timestamp:

Jul 2, 2021 8:56:55 AM (4 years ago)

Author:

vboxsync

Message:

Audio/ValKit: More testing code fixes and additions. bugref:10008

Location:

trunk/src/VBox

Files:

• Devices/Audio/DrvHostAudioValidationKit.cpp (modified) (15 diffs)
• ValidationKit/utils/audio/vkat.cpp (modified) (11 diffs)
• ValidationKit/utils/audio/vkatCommon.cpp (modified) (3 diffs)

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

@@ -719 +719 @@
                                                          const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
 {
-    RT_NOREF(pStream);
-
     if (cbBuf == 0)
     {
@@ -730 +728 @@
     PDRVHOSTVALKITAUDIO pThis = RT_FROM_MEMBER(pInterface, DRVHOSTVALKITAUDIO, IHostAudio);
 
-    PVALKITTESTDATA pTst = NULL;
+    bool const fIsSilence = PDMAudioPropsIsBufferSilence(&pStream->pStream->Cfg.Props, pvBuf, cbBuf);
 
     int rc = RTCritSectEnter(&pThis->CritSect);
@@ -736 +734 @@
     {
         if (pThis->pTestCur == NULL)
+        {
             pThis->pTestCur = RTListGetFirst(&pThis->lstTestsPlay, VALKITTESTDATA, Node);
-
-        pTst = pThis->pTestCur;
+            if (pThis->pTestCur)
+                LogRel(("ValKit: Next guest playback test in queue is test #%RU32\n", pThis->pTestCur->idxTest));
+        }
 
         int rc2 = RTCritSectLeave(&pThis->CritSect);
@@ -744 +744 @@
     }
 
-    if (pTst == NULL) /* Empty list? */
-    {
-        LogRel(("ValKit: Warning: Guest is playing back data when no playback test is active\n"));
+    if (pThis->pTestCur == NULL) /* Empty list? */
+    {
+#ifdef DEBUG_andy
+        if (!fIsSilence)
+#endif
+            LogRel(("ValKit: Warning: Guest is playing back audio (%s, %RU32 bytes, %RU64ms) when no playback test is active\n",
+                    fIsSilence ? "silence" : "audible", cbBuf, PDMAudioPropsBytesToMilli(&pStream->pStream->Cfg.Props, cbBuf)));
 
         *pcbWritten = cbBuf;
@@ -752 +756 @@
     }
 
-#if 1
-    if (PDMAudioPropsIsBufferSilence(&pStream->pStream->Cfg.Props, pvBuf, cbBuf))
-    {
-        LogRel(("ValKit: Skipping %RU32 bytes of silence\n", cbBuf));
-
-        *pcbWritten = cbBuf;
-        return VINF_SUCCESS;
-    }
+#ifndef DEBUG_andy
+    if (fIsSilence)
+        LogRel2(("ValKit: Guest is playing back %RU32 bytes (%RU64ms) silence\n",
+                 cbBuf, PDMAudioPropsBytesToMilli(&pStream->pStream->Cfg.Props, cbBuf)));
 #endif
 
-    if (pTst->t.TestTone.u.Play.cbRead == 0)
+    PVALKITTESTDATA pTst = pThis->pTestCur;
+
+    const bool fHandleSilence = false; /** @todo Skip blocks of entire silence for now. */
+
+    if (pTst->pEntry == NULL)
     {
         AUDIOTESTPARMS Parms;
@@ -770 +774 @@
         Parms.TestTone = pTst->t.TestTone.Parms;
 
-        Assert(pTst->pEntry == NULL);
         rc = AudioTestSetTestBegin(&pThis->Set, "Recording audio data from guest",
                                     &Parms, &pTst->pEntry);
@@ -788 +791 @@
     if (RT_SUCCESS(rc))
     {
-        rc = AudioTestSetObjWrite(pTst->pObj, pvBuf, cbBuf);
-        if (RT_SUCCESS(rc))
-        {
+        if (   !fIsSilence
+            || (fIsSilence && fHandleSilence))
+        {
+            rc = AudioTestSetObjWrite(pTst->pObj, pvBuf, cbBuf);
             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)
@@ -804 +807 @@
                             pTst->idxTest, pTst->t.TestTone.u.Play.cbRead - pTst->t.TestTone.u.Play.cbToRead));
 
+                AudioTestSetTestDone(pTst->pEntry);
+
                 rc = RTCritSectEnter(&pThis->CritSect);
                 if (RT_SUCCESS(rc))
                 {
-                    AudioTestSetTestDone(pTst->pEntry);
+                    drvHostValKiUnregisterPlayTest(pThis, pTst);
 
                     pThis->pTestCur = NULL;
                     pTst            = NULL;
-
-                    if (pThis->fTestSetEnded)
-                        rc = RTSemEventSignal(pThis->EventSemEnded);
 
                     int rc2 = RTCritSectLeave(&pThis->CritSect);
@@ -820 +822 @@
                 }
             }
-        #endif
-
-            cbWritten = cbBuf;
-        }
+        }
+
+        /* Always report everything as being played. */
+        cbWritten = cbBuf;
     }
 
@@ -848 +850 @@
     RT_NOREF(pStream);
 
+    if (cbBuf == 0)
+    {
+        /* Fend off draining calls. */
+        *pcbRead = 0;
+        return VINF_SUCCESS;
+    }
+
     PDRVHOSTVALKITAUDIO pThis = RT_FROM_MEMBER(pInterface, DRVHOSTVALKITAUDIO, IHostAudio);
 
@@ -854 +863 @@
     {
         if (pThis->pTestCur == NULL)
+        {
             pThis->pTestCur = RTListGetFirst(&pThis->lstTestsRec, VALKITTESTDATA, Node);
+            if (pThis->pTestCur)
+                LogRel(("ValKit: Next guest recording test in queue is test #%RU32\n", pThis->pTestCur->idxTest));
+        }
 
         int rc2 = RTCritSectLeave(&pThis->CritSect);
@@ -862 +875 @@
     if (pThis->pTestCur == NULL) /* Empty list? */
     {
-        LogRelMax(64, ("ValKit: Warning: Guest is recording audio data when no recording test is active\n"));
+        LogRelMax(64, ("ValKit: Warning: Guest is trying to record audio data when no recording test is active\n"));
 
         *pcbRead = 0;
@@ -870 +883 @@
     PVALKITTESTDATA pTst = pThis->pTestCur;
 
-    if (pTst->t.TestTone.u.Rec.cbWritten == 0)
+    if (pTst->pEntry == NULL)
     {
         AUDIOTESTPARMS Parms;
@@ -878 +891 @@
         Parms.TestTone = pTst->t.TestTone.Parms;
 
-        Assert(pTst->pEntry == NULL);
         rc = AudioTestSetTestBegin(&pThis->Set, "Injecting audio input data to guest",
                                     &Parms, &pTst->pEntry);
@@ -909 +921 @@
                 Assert(pTst->t.TestTone.u.Rec.cbWritten <= pTst->t.TestTone.u.Rec.cbToWrite);
 
-                const bool fComplete = pTst->t.TestTone.u.Rec.cbToWrite == pTst->t.TestTone.u.Rec.cbWritten;
-
+                const bool fComplete = pTst->t.TestTone.u.Rec.cbToWrite >= pTst->t.TestTone.u.Rec.cbWritten;
                 if (fComplete)
                 {
                     LogRel(("ValKit: Injecting audio input data done (took %RU32ms)\n",
                             RTTimeMilliTS() - pTst->msStartedTS));
+
+                    AudioTestSetTestDone(pTst->pEntry);
 
                     rc = RTCritSectEnter(&pThis->CritSect);

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

@@ -253 +253 @@
     pTstParmsAcq->enmDir      = PDMAUDIODIR_OUT;
 #ifdef DEBUG
-    pTstParmsAcq->cIterations = 1;
+    pTstParmsAcq->cIterations = 4;
 #else
     pTstParmsAcq->cIterations = RTRandU32Ex(1, 10);
@@ -265 +265 @@
     pToneParms->msPrequel      = 0; /** @todo Implement analyzing this first! */
 #ifdef DEBUG_andy
-    pToneParms->msDuration     = 2000;
+    pToneParms->msDuration     = RTRandU32Ex(50, 2500);
 #else
     pToneParms->msDuration     = RTRandU32Ex(0, RT_MS_10SEC); /** @todo Probably a bit too long, but let's see. */
@@ -286 +286 @@
     for (uint32_t i = 0; i < pTstParms->cIterations; i++)
     {
+        PAUDIOTESTTONEPARMS const pToneParms = &pTstParms->TestTone;
+
+        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Test #%RU32/%RU16: Playing test tone (%RU16Hz, %RU32ms)\n",
+                     pTstParms->idxCurrent, i, (uint16_t)pToneParms->dbFreqHz, pToneParms->msDuration);
+
         /*
          * 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))
@@ -299 +303 @@
         }
 
-        if (RT_FAILURE(rc))
-            RTTestFailed(g_hTest, "Playing tone failed\n");
+        if (RT_SUCCESS(rc))
+        {
+            if (pTstParms->cIterations)
+                RTThreadSleep(RTRandU32Ex(2000, 5000));
+        }
+        else
+            RTTestFailed(g_hTest, "Test #%RU32/%RU16: Playing tone failed\n", pTstParms->idxCurrent, i);
     }
 
@@ -336 +345 @@
     pTstParmsAcq->enmDir      = PDMAUDIODIR_IN;
 #ifdef DEBUG
-    pTstParmsAcq->cIterations = 1;
+    pTstParmsAcq->cIterations = 4;
 #else
     pTstParmsAcq->cIterations = RTRandU32Ex(1, 10);
@@ -342 +351 @@
     pTstParmsAcq->idxCurrent  = 0;
 
+    PAUDIOTESTTONEPARMS pToneParms = &pTstParmsAcq->TestTone;
+
+    pToneParms->Props          = pTstParmsAcq->Props;
+    pToneParms->dbFreqHz       = AudioTestToneGetRandomFreq();
+    pToneParms->msPrequel      = 0; /** @todo Implement analyzing this first! */
+    pToneParms->Props          = pTstParmsAcq->Props;
+#ifdef DEBUG_andy
+    pToneParms->msDuration     = RTRandU32Ex(50 /* ms */, 2500);
+#else
+    pToneParms->msDuration     = RTRandU32Ex(50 /* ms */, RT_MS_30SEC); /** @todo Record even longer? */
+#endif
+    pToneParms->msSequel       = 0;   /** @todo Implement analyzing this first! */
+    pToneParms->uVolumePercent = 100; /** @todo Implement analyzing this first! */
+
     return rc;
 }
@@ -356 +379 @@
     for (uint32_t i = 0; i < pTstParms->cIterations; i++)
     {
-        pTstParms->TestTone.Props      = pTstParms->Props;
-#ifdef DEBUG_andy
-        pTstParms->TestTone.msDuration = RTRandU32Ex(50 /* ms */, 2000);
-#else
-        pTstParms->TestTone.msDuration = RTRandU32Ex(50 /* ms */, RT_MS_30SEC); /** @todo Record even longer? */
-#endif
+        PAUDIOTESTTONEPARMS const pToneParms = &pTstParms->TestTone;
+
+        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Test #%RU32/%RU16: Recording test tone (%RU16Hz, %RU32ms)\n",
+                     pTstParms->idxCurrent, i, (uint16_t)pToneParms->dbFreqHz, pToneParms->msDuration);
+
         /*
          * 1. Arm the (host) ValKit ATS with the playback parameters.
@@ -375 +397 @@
 
         if (RT_FAILURE(rc))
-            RTTestFailed(g_hTest, "Recording tone failed\n");
+            RTTestFailed(g_hTest, "Test #%RU32/%RU16: Recording tone failed\n", pTstParms->idxCurrent, i);
+
+        /* Wait a bit to let the left over audio bits being processed. */
+        if (pTstParms->cIterations)
+            RTThreadSleep(RTRandU32Ex(2000, 5000));
     }
 
@@ -427 +453 @@
     if (pTstDesc->fExcluded)
     {
-        RTTestSkipped(g_hTest, "Excluded from list");
+        RTTestSkipped(g_hTest, "Test #%u is excluded from list, skipping", uSeq);
         return VINF_SUCCESS;
     }
@@ -438 +464 @@
         if (RT_FAILURE(rc))
         {
-            RTTestFailed(g_hTest, "Test setup failed with %Rrc\n", rc);
+            RTTestFailed(g_hTest, "Test #%u setup failed with %Rrc\n", uSeq, rc);
             return rc;
         }
     }
 
-    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Test #%u: %RU32 iterations\n", uSeq, TstParms.cIterations);
+    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Test #%u (%RU32 iterations total)\n", uSeq, TstParms.cIterations);
 
     AssertPtr(pTstDesc->pfnExec);
     rc = pTstDesc->pfnExec(pTstEnv, pvCtx, &TstParms);
     if (RT_FAILURE(rc))
-        RTTestFailed(g_hTest, "Test failed with %Rrc\n", rc);
+        RTTestFailed(g_hTest, "Test #%u failed with %Rrc\n", uSeq, rc);
 
     RTTestSubDone(g_hTest);
@@ -459 +485 @@
 
         if (RT_FAILURE(rc2))
-            RTTestFailed(g_hTest, "Test destruction failed with %Rrc\n", rc2);
+            RTTestFailed(g_hTest, "Test #%u destruction failed with %Rrc\n", uSeq, rc2);
     }
 

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

@@ -368 +368 @@
     const char *pcszPathOut = pTstEnv->Set.szPathAbs;
 
-    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Recording test tone (for %RU32ms)\n", pParms->msDuration);
+    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Recording test tone (tone frequency is %RU16Hz, %RU32ms)\n", (uint16_t)pParms->dbFreqHz, pParms->msDuration);
     RTTestPrintf(g_hTest, RTTESTLVL_DEBUG,  "Writing to '%s'\n", pcszPathOut);
 
@@ -376 +376 @@
     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);
-
+    PAUDIOTESTDRVMIXSTREAM pMix = &pStream->Mix;
+
+    rc = AudioTestMixStreamEnable(pMix);
+    if (RT_SUCCESS(rc))
+    {
+        uint64_t cbToRecTotal = PDMAudioPropsMilliToBytes(&pStream->Cfg.Props, pParms->msDuration);
+
+        RTTestPrintf(g_hTest, RTTESTLVL_DEBUG, "Recording %RU32 bytes total\n", cbToRecTotal);
+
+        AudioTestSetObjAddMetadataStr(pObj, "stream_to_record_bytes=%RU32\n", cbToRecTotal);
+        AudioTestSetObjAddMetadataStr(pObj, "stream_buffer_size_ms=%RU32\n", pTstEnv->cMsBufferSize);
+        AudioTestSetObjAddMetadataStr(pObj, "stream_prebuf_size_ms=%RU32\n", pTstEnv->cMsPreBuffer);
+        /* 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", pTstEnv->cMsSchedulingHint);
+
+        uint8_t         abSamples[16384];
+        uint32_t const  cbSamplesAligned = PDMAudioPropsFloorBytesToFrame(pMix->pProps, sizeof(abSamples));
+        uint64_t        cbRecTotal  = 0;
+        while (!g_fTerminate && cbRecTotal < cbToRecTotal)
+        {
+            /*
+             * Anything we can read?
+             */
+            uint32_t const cbCanRead = AudioTestMixStreamGetReadable(pMix);
+            if (cbCanRead)
+            {
+                uint32_t const cbToRead   = RT_MIN(cbCanRead, cbSamplesAligned);
+                uint32_t       cbRecorded = 0;
+                rc = AudioTestMixStreamCapture(pMix, abSamples, cbToRead, &cbRecorded);
+                if (RT_SUCCESS(rc))
+                {
+                    if (cbRecorded)
+                    {
+                        rc = AudioTestSetObjWrite(pObj, abSamples, cbRecorded);
+                        if (RT_SUCCESS(rc))
+                        {
+                            cbRecTotal += cbRecorded;
+
+                            /** @todo Clamp result? */
+                        }
+                    }
+                }
+            }
+            else if (AudioTestMixStreamIsOkay(pMix))
+                RTThreadSleep(RT_MIN(RT_MAX(1, pTstEnv->cMsSchedulingHint), 256));
+
+            if (RT_FAILURE(rc))
+                break;
+        }
+
+        int rc2 = AudioTestMixStreamDisable(pMix);
         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];
-
-            while (cbToRead)
-            {
-                const uint32_t cbChunk = RT_MIN(cbToRead, RT_MIN(cbPerSched, sizeof(abBuf)));
-
-                uint32_t cbRead = 0;
-                rc = audioTestDriverStackStreamCapture(&pTstEnv->DrvStack, pStream->pStream, (void *)abBuf, cbChunk, &cbRead);
-                if (RT_SUCCESS(rc))
-                    rc = AudioTestSetObjWrite(pObj, abBuf, cbRead);
-
-                if (RT_FAILURE(rc))
-                    break;
-
-                RTThreadSleep(pTstEnv->cMsSchedulingHint);
-
-                Assert(cbToRead >= cbRead);
-                cbToRead -= cbRead;
-            }
-        }
-    }
-    else
-        rc = VERR_AUDIO_STREAM_NOT_READY;
+            rc = rc2;
+    }
 
     int rc2 = AudioTestSetObjClose(pObj);
@@ -465 +484 @@
     PATSCALLBACKCTX pCtx    = (PATSCALLBACKCTX)pvUser;
     PAUDIOTESTENV   pTstEnv = pCtx->pTstEnv;
-
-    AUDIOTESTTONE TstTone;
-    AudioTestToneInitRandom(&TstTone, &pToneParms->Props);
 
     const PAUDIOTESTSTREAM pTstStream = &pTstEnv->aStreams[0]; /** @todo Make this dynamic. */