Changeset 91209 in vbox

Timestamp:

Sep 10, 2021 4:39:07 PM (3 years ago)

Author:

vboxsync

Message:

Audio/Validation Kit: More bugfixes. bugref:10008

File:

• trunk/src/VBox/Devices/Audio/DrvHostAudioValidationKit.cpp (modified) (4 diffs)

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

@@ -732 +732 @@
 static DECLCALLBACK(int) drvHostValKitAudioHA_StreamDrain(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
-    RT_NOREF(pStream);
-
-    PDRVHOSTVALKITAUDIO pThis = RT_FROM_MEMBER(pInterface, DRVHOSTVALKITAUDIO, IHostAudio);
-
-    int rc = RTCritSectEnter(&pThis->CritSect);
-    if (RT_SUCCESS(rc))
-    {
-        PVALKITTESTDATA pTst = pThis->pTestCurPlay;
-
-        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->pTestCurPlay = NULL;
-            pTst                = NULL;
-
-            if (ASMAtomicReadBool(&pThis->fTestSetEnd))
-                rc = RTSemEventSignal(pThis->EventSemEnded);
-        }
-
-        int rc2 = RTCritSectLeave(&pThis->CritSect);
-        AssertRC(rc2);
-    }
-
+    RT_NOREF(pInterface, pStream);
     return VINF_SUCCESS;
 }
@@ -888 +858 @@
     PVALKITTESTDATA     pTst  = NULL;
 
-    pThis->cbPlayedTotal += cbBuf; /* Do a bit of accounting. */
-
     bool const fIsSilence = PDMAudioPropsIsBufferSilence(&pStream->pStream->Cfg.Props, pvBuf, cbBuf);
+
+    LogRel2(("ValKit: Playing stream '%s' ...\n", pStream->pStream->Cfg.szName));
 
     int rc = RTCritSectEnter(&pThis->CritSect);
     if (RT_SUCCESS(rc))
     {
+        pThis->cbPlayedTotal += cbBuf; /* Do a bit of accounting. */
+
         if (pThis->pTestCurPlay == NULL)
         {
@@ -1040 +1012 @@
     PVALKITTESTDATA     pTst        = NULL;
 
-    pThis->cbRecordedTotal += cbBuf; /* Do a bit of accounting. */
+    LogRel2(("ValKit: Capturing stream '%s' ...\n", pStream->pStream->Cfg.szName));
 
     int rc = RTCritSectEnter(&pThis->CritSect);
     if (RT_SUCCESS(rc))
     {
+        pThis->cbRecordedTotal += cbBuf; /* Do a bit of accounting. */
+
         if (pThis->pTestCurRec == NULL)
         {
@@ -1203 +1177 @@
 
     pThis->cTestsTotal = 0;
-    pThis->cTestsPlay  = 0;
-    pThis->cTestsRec   = 0;
     pThis->fTestSetEnd = false;