Changeset 89469 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 2, 2021 1:18:42 PM (4 years ago)

Author:

vboxsync

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

144824

Message:

Audio/ValKit: More code for the Validation Kit audio driver. bugref:10008

File:

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

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

@@ -115 +115 @@
     /** Pointer to host audio interface. */
     PDMIHOSTAUDIO       IHostAudio;
+    /** Temporary path to use. */
+    char                szPathTemp[RTPATH_MAX];
+    /** Output path to use. */
+    char                szPathOut[RTPATH_MAX];
     /** Current test set being handled. */
     AUDIOTESTSET        Set;
@@ -136 +140 @@
 
 
-
+/**
+ * Unregisters a ValKit test, common code.
+ *
+ * @param   pTst                Test to unregister.
+ *                              The pointer will be invalid afterwards.
+ */
 static void drvHostValKiUnregisterTest(PVALKITTESTDATA pTst)
 {
+    AssertPtrReturnVoid(pTst);
+
     RTListNodeRemove(&pTst->Node);
 
     AudioTestSetObjClose(pTst->pObj);
     pTst->pObj = NULL;
+
+    AssertPtrReturnVoid(pTst->pEntry);
     AudioTestSetTestDone(pTst->pEntry);
     pTst->pEntry = NULL;
@@ -150 +163 @@
 }
 
+/**
+ * Unregisters a ValKit recording test.
+ *
+ * @param   pThis               ValKit audio driver instance.
+ * @param   pTst                Test to unregister.
+ *                              The pointer will be invalid afterwards.
+ */
 static void drvHostValKiUnregisterRecTest(PDRVHOSTVALKITAUDIO pThis, PVALKITTESTDATA pTst)
 {
@@ -158 +178 @@
 }
 
+/**
+ * Unregisters a ValKit playback test.
+ *
+ * @param   pThis               ValKit audio driver instance.
+ * @param   pTst                Test to unregister.
+ *                              The pointer will be invalid afterwards.
+ */
 static void drvHostValKiUnregisterPlayTest(PDRVHOSTVALKITAUDIO pThis, PVALKITTESTDATA pTst)
 {
@@ -164 +191 @@
     Assert(pThis->cTestsPlay);
     pThis->cTestsPlay--;
+}
+
+static DECLCALLBACK(int) drvHostValKitTestSetBegin(void const *pvUser, const char *pszTag)
+{
+    PDRVHOSTVALKITAUDIO pThis = (PDRVHOSTVALKITAUDIO)pvUser;
+
+    LogRel(("Audio: Validation Kit: Beginning test set '%s'\n", pszTag));
+
+    return AudioTestSetCreate(&pThis->Set, pThis->szPathTemp, pszTag);
+
+}
+
+static DECLCALLBACK(int) drvHostValKitTestSetEnd(void const *pvUser, const char *pszTag)
+{
+    PDRVHOSTVALKITAUDIO pThis = (PDRVHOSTVALKITAUDIO)pvUser;
+
+    const PAUDIOTESTSET pSet  = &pThis->Set;
+
+    LogRel(("Audio: Validation Kit: Ending test set '%s'\n", pszTag));
+
+    /* Close the test set first. */
+    AudioTestSetClose(pSet);
+
+    /* Before destroying the test environment, pack up the test set so
+     * that it's ready for transmission. */
+    char szFileOut[RTPATH_MAX];
+    int rc = AudioTestSetPack(pSet, pThis->szPathOut, szFileOut, sizeof(szFileOut));
+    if (RT_SUCCESS(rc))
+        LogRel(("Audio: Validation Kit: Packed up to '%s'\n", szFileOut));
+
+    int rc2 = AudioTestSetWipe(pSet);
+    if (RT_SUCCESS(rc))
+        rc = rc2;
+
+    AudioTestSetDestroy(pSet);
+
+    if (RT_FAILURE(rc))
+        LogRel(("Audio: Validation Kit: Test set prologue failed with %Rrc\n", rc));
+
+    return rc;
 }
 
@@ -665 +732 @@
 
     ATSCALLBACKS Callbacks;
-    Callbacks.pfnTonePlay   = drvHostValKitRegisterGuestRecTest;
-    Callbacks.pfnToneRecord = drvHostValKitRegisterGuestPlayTest;
-    Callbacks.pvUser        = pThis;
+    Callbacks.pfnTestSetBegin = drvHostValKitTestSetBegin;
+    Callbacks.pfnTestSetEnd   = drvHostValKitTestSetEnd;
+    Callbacks.pfnTonePlay     = drvHostValKitRegisterGuestRecTest;
+    Callbacks.pfnToneRecord   = drvHostValKitRegisterGuestPlayTest;
+    Callbacks.pvUser          = pThis;
 
     LogRel(("Audio: Validation Kit: Starting Audio Test Service (ATS) ...\n"));
@@ -675 +744 @@
         rc = AudioTestSvcStart(&pThis->Srv);
 
+    if (RT_SUCCESS(rc))
+    {
+        LogRel(("Audio: Validation Kit: Audio Test Service (ATS) running\n"));
+
+        /** @todo Let the following be customizable by CFGM later. */
+        rc = AudioTestPathCreateTemp(pThis->szPathTemp, sizeof(pThis->szPathTemp), "ValKitAudio");
+        if (RT_SUCCESS(rc))
+        {
+            LogRel(("Audio: Validation Kit: Using temp dir '%s'\n", pThis->szPathTemp));
+            rc = AudioTestPathGetTemp(pThis->szPathOut, sizeof(pThis->szPathOut));
+            if (RT_SUCCESS(rc))
+                LogRel(("Audio: Validation Kit: Using output dir '%s'\n", pThis->szPathOut));
+        }
+    }
+
+    if (RT_SUCCESS(rc))
+        rc = RTCritSectInit(&pThis->CritSect);
+
     if (RT_FAILURE(rc))
-    {
-        LogRel(("Audio: Validation Kit: Starting Audio Test Service (ATS) failed, rc=%Rrc\n", rc));
-    }
-    else
-        LogRel(("Audio: Validation Kit: Audio Test Service (ATS) running\n"));
-
-    if (RT_SUCCESS(rc))
-        rc = RTCritSectInit(&pThis->CritSect);
+        LogRel(("Audio: Validation Kit: Initialization failed, rc=%Rrc\n", rc));
 
     return rc;
@@ -721 +801 @@
         LogRel(("Audio: Validation Kit: Shutdown of Audio Test Service failed, rc=%Rrc\n", rc));
 
-    rc = RTCritSectDelete(&pThis->CritSect);
-    AssertRC(rc);
+    int rc2 = RTCritSectDelete(&pThis->CritSect);
+    if (RT_SUCCESS(rc))
+        rc = rc2;
+
+    if (RT_FAILURE(rc))
+        LogRel(("Audio: Validation Kit: Destruction failed, rc=%Rrc\n", rc));
 }