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

Timestamp:

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

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Devices/Audio/DrvHostAudioValidationKit.cpp (modified) (15 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);