Changeset 90056 in vbox for trunk/src

Timestamp:

Jul 6, 2021 11:15:47 AM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

145551

Message:

Audio/ValKit: Added support for concurrent playback + recording tests to the ValKit audio driver. bugref:10008

File:

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

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

@@ -131 +131 @@
     /** List keeping the recording tests (FIFO). */
     RTLISTANCHOR        lstTestsRec;
+    /** Pointer to current recording test being processed.
+     *  NULL if no current test active. */
+    PVALKITTESTDATA     pTestCurRec;
     /** Number of tests in \a lstTestsPlay. */
     uint32_t            cTestsPlay;
     /** List keeping the recording tests (FIFO). */
     RTLISTANCHOR        lstTestsPlay;
-    /** Pointer to current test being processed. */
-    PVALKITTESTDATA     pTestCur;
+    /** Pointer to current playback test being processed.
+     *  NULL if no current test active. */
+    PVALKITTESTDATA     pTestCurPlay;
     /** Critical section for serializing access across threads. */
     RTCRITSECT          CritSect;
@@ -635 +639 @@
     if (RT_SUCCESS(rc))
     {
-        PVALKITTESTDATA pTst = pThis->pTestCur;
+        PVALKITTESTDATA pTst = pThis->pTestCurPlay;
 
         if (pTst)
@@ -648 +652 @@
             AudioTestSetTestDone(pTst->pEntry);
 
-            pThis->pTestCur = NULL;
-            pTst            = NULL;
+            pThis->pTestCurPlay = NULL;
+            pTst                = NULL;
 
             if (pThis->fTestSetEnded)
@@ -671 +675 @@
 
     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);
+        pTst = RTListGetFirst(&pThis->lstTestsRec, VALKITTESTDATA, Node);
 
         int rc2 = RTCritSectLeave(&pThis->CritSect);
@@ -681 +686 @@
     }
 
-    if (pThis->pTestCur == NULL) /* Empty list? */
+    if (pTst == NULL) /* Empty list? */
         return 0;
-
-    PVALKITTESTDATA const pTst = pThis->pTestCur;
 
     Assert(pTst->t.TestTone.u.Rec.cbToWrite >= pTst->t.TestTone.u.Rec.cbWritten);
@@ -727 +730 @@
 
     PDRVHOSTVALKITAUDIO pThis = RT_FROM_MEMBER(pInterface, DRVHOSTVALKITAUDIO, IHostAudio);
+    PVALKITTESTDATA     pTst  = NULL;
 
     bool const fIsSilence = PDMAudioPropsIsBufferSilence(&pStream->pStream->Cfg.Props, pvBuf, cbBuf);
@@ -733 +737 @@
     if (RT_SUCCESS(rc))
     {
-        if (pThis->pTestCur == NULL)
-        {
-            pThis->pTestCur = RTListGetFirst(&pThis->lstTestsPlay, VALKITTESTDATA, Node);
-            if (pThis->pTestCur)
-                LogRel(("ValKit: Next guest playback test in queue is test #%RU32\n", pThis->pTestCur->idxTest));
-        }
+        if (pThis->pTestCurPlay == NULL)
+        {
+            pThis->pTestCurPlay = RTListGetFirst(&pThis->lstTestsPlay, VALKITTESTDATA, Node);
+            if (pThis->pTestCurPlay)
+                LogRel(("ValKit: Next guest playback test in queue is test #%RU32\n", pThis->pTestCurPlay->idxTest));
+        }
+
+        pTst = pThis->pTestCurPlay;
 
         int rc2 = RTCritSectLeave(&pThis->CritSect);
@@ -744 +750 @@
     }
 
-    if (pThis->pTestCur == NULL) /* Empty list? */
+    if (pTst == NULL) /* Empty list? */
     {
 #ifdef DEBUG_andy
@@ -762 +768 @@
 #endif
 
-    PVALKITTESTDATA pTst = pThis->pTestCur;
-
     const bool fHandleSilence = false; /** @todo Skip blocks of entire silence for now. */
 
-    if (pTst->pEntry == NULL)
+    if (pTst->pEntry == NULL) /* Test not started yet? */
     {
         AUDIOTESTPARMS Parms;
@@ -814 +818 @@
                     drvHostValKiUnregisterPlayTest(pThis, pTst);
 
-                    pThis->pTestCur = NULL;
-                    pTst            = NULL;
+                    pThis->pTestCurPlay = NULL;
+                    pTst                = NULL;
 
                     int rc2 = RTCritSectLeave(&pThis->CritSect);
@@ -858 +862 @@
 
     PDRVHOSTVALKITAUDIO pThis = RT_FROM_MEMBER(pInterface, DRVHOSTVALKITAUDIO, IHostAudio);
+    PVALKITTESTDATA     pTst  = NULL;
 
     int rc = RTCritSectEnter(&pThis->CritSect);
     if (RT_SUCCESS(rc))
     {
-        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));
-        }
+        if (pThis->pTestCurRec == NULL)
+        {
+            pThis->pTestCurRec = RTListGetFirst(&pThis->lstTestsRec, VALKITTESTDATA, Node);
+            if (pThis->pTestCurRec)
+                LogRel(("ValKit: Next guest recording test in queue is test #%RU32\n", pThis->pTestCurRec->idxTest));
+        }
+
+        pTst = pThis->pTestCurRec;
 
         int rc2 = RTCritSectLeave(&pThis->CritSect);
@@ -873 +880 @@
     }
 
-    if (pThis->pTestCur == NULL) /* Empty list? */
+    if (pTst == NULL) /* Empty list? */
     {
         LogRelMax(64, ("ValKit: Warning: Guest is trying to record audio data when no recording test is active\n"));
@@ -881 +888 @@
     }
 
-    PVALKITTESTDATA pTst = pThis->pTestCur;
-
-    if (pTst->pEntry == NULL)
+    if (pTst->pEntry == NULL) /* Test not started yet? */
     {
         AUDIOTESTPARMS Parms;
@@ -934 +939 @@
                         drvHostValKiUnregisterRecTest(pThis, pTst);
 
-                        pThis->pTestCur = NULL;
-                        pTst            = NULL;
+                        pThis->pTestCurRec = NULL;
+                        pTst               = NULL;
 
                         int rc2 = RTCritSectLeave(&pThis->CritSect);