Changeset 89310 in vbox for trunk/src/VBox

Timestamp:

May 27, 2021 10:11:23 AM (4 years ago)

Author:

vboxsync

Message:

Audio/ValKit: Also use the test driver stack functions for recording path. bugref:10008

File:

• trunk/src/VBox/ValidationKit/utils/audio/vkat.cpp (modified) (6 diffs)

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

@@ -1348 +1348 @@
 }
 
+/**
+ * Tries to capture @a cbBuf bytes of samples in @a pvBuf.
+ */
+static int audioTestDriverStackStreamCapture(PAUDIOTESTDRVSTACK pDrvStack, PPDMAUDIOSTREAM pStream,
+                                             void *pvBuf, uint32_t cbBuf, uint32_t *pcbCaptured)
+{
+    int rc;
+    if (pDrvStack->pIAudioConnector)
+    {
+        rc = pDrvStack->pIAudioConnector->pfnStreamCapture(pDrvStack->pIAudioConnector, pStream, pcbCaptured);
+        if (RT_FAILURE(rc))
+            RTTestFailed(g_hTest, "pfnStreamCapture(,,,%#x) failed: %Rrc", cbBuf, rc);
+    }
+    else
+    {
+        PAUDIOTESTDRVSTACKSTREAM pStreamAt = (PAUDIOTESTDRVSTACKSTREAM)pStream;
+        rc = pDrvStack->pIHostAudio->pfnStreamCapture(pDrvStack->pIHostAudio, &pStreamAt->Backend, pvBuf, cbBuf, pcbCaptured);
+        if (RT_FAILURE(rc))
+            RTTestFailed(g_hTest, "PDMIHOSTAUDIO::pfnStreamCapture(,,,%#x) failed: %Rrc", cbBuf, rc);
+    }
+    return rc;
+}
+
 
 /*********************************************************************************************************************************
@@ -1609 +1632 @@
     /** @todo Use .WAV here? */
     PAUDIOTESTOBJ pObj;
-    int rc = AudioTestSetObjCreateAndRegister(&pTstEnv->Set, "tone.pcm", &pObj);
+    int rc = AudioTestSetObjCreateAndRegister(&pTstEnv->Set, "tone-rec.pcm", &pObj);
     AssertRCReturn(rc, rc);
 
-    PDMHOSTAUDIOSTREAMSTATE enmState = pTstEnv->DrvStack.pIHostAudio->pfnStreamGetState(pTstEnv->DrvStack.pIHostAudio,
-                                                                                        pStream->pBackend);
-    if (enmState == PDMHOSTAUDIOSTREAMSTATE_OKAY)
-    {
-        uint8_t  abBuf[_4K];
+    if (audioTestDriverStackStreamIsOkay(&pTstEnv->DrvStack, pStream->pStream))
+    {
+        uint8_t abBuf[_4K];
 
         const uint64_t tsStartMs     = RTTimeMilliTS();
-        const uint16_t cSchedulingMs = RTRandU32Ex(10, 80); /* Chose a random scheduling (in ms). */
+        const uint16_t cSchedulingMs = RTRandU32Ex(10, 80); /* Choose a random scheduling (in ms). */
 
         do
         {
             uint32_t cbRead = 0;
-            rc = pTstEnv->DrvStack.pIHostAudio->pfnStreamCapture(pTstEnv->DrvStack.pIHostAudio, pStream->pBackend, abBuf,
-                                                                 sizeof(abBuf), &cbRead);
+            rc = audioTestDriverStackStreamCapture(&pTstEnv->DrvStack, pStream->pStream, (void *)abBuf, sizeof(abBuf), &cbRead);
             if (RT_SUCCESS(rc))
                 rc = AudioTestSetObjWrite(pObj, abBuf, cbRead);
@@ -1690 +1710 @@
     /** @todo Use .WAV here? */
     PAUDIOTESTOBJ pObj;
-    int rc = AudioTestSetObjCreateAndRegister(&pTstEnv->Set, "tone.pcm", &pObj);
+    int rc = AudioTestSetObjCreateAndRegister(&pTstEnv->Set, "tone-play.pcm", &pObj);
     AssertRCReturn(rc, rc);
 
@@ -1699 +1719 @@
 
         const uint64_t tsStartMs     = RTTimeMilliTS();
-        const uint16_t cSchedulingMs = RTRandU32Ex(10, 80); /* Chose a random scheduling (in ms). */
+        const uint16_t cSchedulingMs = RTRandU32Ex(10, 80); /* Choose a random scheduling (in ms). */
         const uint32_t cbPerMs       = PDMAudioPropsMilliToBytes(&pParms->Props, cSchedulingMs);
 
@@ -1771 +1791 @@
 
     pTstParmsAcq->enmDir      = PDMAUDIODIR_OUT;
-#ifdef DEBUG_andy
-    pTstParmsAcq->cIterations = RTRandU32Ex(1, 1);
+#ifdef DEBUG
+    pTstParmsAcq->cIterations = 2;
+#else
+    pTstParmsAcq->cIterations = RTRandU32Ex(1, 10);
 #endif
-    pTstParmsAcq->cIterations = RTRandU32Ex(1, 10);
     pTstParmsAcq->idxCurrent  = 0;
 
@@ -1847 +1868 @@
 
     pTstParmsAcq->enmDir      = PDMAUDIODIR_IN;
+#ifdef DEBUG
+    pTstParmsAcq->cIterations = 2;
+#else
     pTstParmsAcq->cIterations = RTRandU32Ex(1, 10);
+#endif
     pTstParmsAcq->idxCurrent  = 0;