Changeset 90766 in vbox for trunk/src/VBox/ValidationKit/utils/audio/vkatCommon.cpp

Timestamp:

Aug 20, 2021 5:30:57 PM (3 years ago)

Author:

vboxsync

Message:

Audio/ValKit: Decoupled the driver stack from the test environment, so that two test environments can use the same driver stack -- needed for self-tests and also is a cleaner solution. bugref:10008

File:

• trunk/src/VBox/ValidationKit/utils/audio/vkatCommon.cpp (modified) (12 diffs)

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

@@ -70 +70 @@
 static int audioTestStreamInit(PAUDIOTESTDRVSTACK pDrvStack, PAUDIOTESTSTREAM pStream, PDMAUDIODIR enmDir, PCPDMAUDIOPCMPROPS pProps, bool fWithMixer, uint32_t cMsBufferSize, uint32_t cMsPreBuffer, uint32_t cMsSchedulingHint);
 static int audioTestStreamDestroy(PAUDIOTESTENV pTstEnv, PAUDIOTESTSTREAM pStream);
-static int audioTestDevicesEnumerateAndCheck(PAUDIOTESTENV pTstEnv, const char *pszDev, PPDMAUDIOHOSTDEV *ppDev);
 
 
@@ -81 +80 @@
  *
  * @returns VBox status code.
- * @param   pTstEnv             Test env to use for enumeration.
+ * @param   pDrvStack           Driver stack to use for enumeration.
  * @param   pszDev              Device name to search for. Can be NULL if the default device shall be used.
  * @param   ppDev               Where to return the pointer of the device enumeration of \a pTstEnv when a
  *                              specific device was found.
  */
-static int audioTestDevicesEnumerateAndCheck(PAUDIOTESTENV pTstEnv, const char *pszDev, PPDMAUDIOHOSTDEV *ppDev)
+int audioTestDevicesEnumerateAndCheck(PAUDIOTESTDRVSTACK pDrvStack, const char *pszDev, PPDMAUDIOHOSTDEV *ppDev)
 {
     RTTestSubF(g_hTest, "Enumerating audio devices and checking for device '%s'", pszDev && *pszDev ? pszDev : "<Default>");
 
-    if (!pTstEnv->DrvStack.pIHostAudio->pfnGetDevices)
+    if (!pDrvStack->pIHostAudio->pfnGetDevices)
     {
         RTTestSkipped(g_hTest, "Backend does not support device enumeration, skipping");
@@ -101 +100 @@
         *ppDev = NULL;
 
-    int rc = pTstEnv->DrvStack.pIHostAudio->pfnGetDevices(pTstEnv->DrvStack.pIHostAudio, &pTstEnv->DevEnum);
+    int rc = pDrvStack->pIHostAudio->pfnGetDevices(pDrvStack->pIHostAudio, &pDrvStack->DevEnum);
     if (RT_SUCCESS(rc))
     {
         PPDMAUDIOHOSTDEV pDev;
-        RTListForEach(&pTstEnv->DevEnum.LstDevices, pDev, PDMAUDIOHOSTDEV, ListEntry)
+        RTListForEach(&pDrvStack->DevEnum.LstDevices, pDev, PDMAUDIOHOSTDEV, ListEntry)
         {
             char szFlags[PDMAUDIOHOSTDEV_MAX_FLAGS_STRING_LEN];
@@ -199 +198 @@
         /** @todo Anything else to do here, e.g. test if there are left over samples or some such? */
 
-        audioTestDriverStackStreamDestroy(&pTstEnv->DrvStack, pStream->pStream);
+        audioTestDriverStackStreamDestroy(pTstEnv->pDrvStack, pStream->pStream);
         pStream->pStream  = NULL;
         pStream->pBackend = NULL;
@@ -504 +503 @@
     const PAUDIOTESTSTREAM pTstStream = &pTstEnv->aStreams[0]; /** @todo Make this dynamic. */
 
-    int rc = audioTestStreamInit(&pTstEnv->DrvStack, pTstStream, PDMAUDIODIR_OUT, &pTstEnv->Props, false /* fWithMixer */,
+    int rc = audioTestStreamInit(pTstEnv->pDrvStack, pTstStream, PDMAUDIODIR_OUT, &pTstEnv->Props, false /* fWithMixer */,
                                  pTstEnv->cMsBufferSize, pTstEnv->cMsPreBuffer, pTstEnv->cMsSchedulingHint);
     if (RT_SUCCESS(rc))
@@ -545 +544 @@
     const PAUDIOTESTSTREAM pTstStream = &pTstEnv->aStreams[0]; /** @todo Make this dynamic. */
 
-    int rc = audioTestStreamInit(&pTstEnv->DrvStack, pTstStream, PDMAUDIODIR_IN, &pTstEnv->Props, false /* fWithMixer */,
+    int rc = audioTestStreamInit(pTstEnv->pDrvStack, pTstStream, PDMAUDIODIR_IN, &pTstEnv->Props, false /* fWithMixer */,
                                  pTstEnv->cMsBufferSize, pTstEnv->cMsPreBuffer, pTstEnv->cMsSchedulingHint);
     if (RT_SUCCESS(rc))
@@ -795 +794 @@
  * @param   fWithDrvAudio       Whether to include DrvAudio in the stack or not.
  */
-int audioTestEnvInit(PAUDIOTESTENV pTstEnv,
-                     PCPDMDRVREG pDrvReg, bool fWithDrvAudio)
+int audioTestEnvInit(PAUDIOTESTENV pTstEnv, PAUDIOTESTDRVSTACK pDrvStack)
 {
     int rc = VINF_SUCCESS;
+
+    pTstEnv->pDrvStack = pDrvStack;
 
     /*
@@ -821 +821 @@
     }
 
-    /* Go with the platform's default backend if nothing else is set. */
-    if (!pDrvReg)
-        pDrvReg = AudioTestGetDefaultBackend();
-
     RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Initializing environment for mode '%s'\n", pTstEnv->enmMode == AUDIOTESTMODE_HOST ? "host" : "guest");
-    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Using backend '%s'\n", pDrvReg->szName);
     RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Using tag '%s'\n", pTstEnv->szTag);
     RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Output directory is '%s'\n", pTstEnv->szPathOut);
@@ -837 +832 @@
     if (!pTstEnv->cMsSchedulingHint)
         pTstEnv->cMsSchedulingHint = UINT32_MAX;
-
-    PDMAudioHostEnumInit(&pTstEnv->DevEnum);
-
-    bool fUseDriverStack = false; /* Whether to init + use the audio driver stack or not. */
-
-    /* In regular testing mode only the guest mode needs initializing the driver stack. */
-    if (pTstEnv->enmMode == AUDIOTESTMODE_GUEST)
-        fUseDriverStack = true;
-
-    /* When running in self-test mode, the host mode also needs to initialize the stack in order to
-     * to run the Valdation Kit audio driver ATS (no "real" VBox involved). */
-    if (pTstEnv->enmMode == AUDIOTESTMODE_HOST && pTstEnv->fSelftest)
-        fUseDriverStack = true;
-
-    if (fUseDriverStack)
-    {
-        rc = audioTestDriverStackInitEx(&pTstEnv->DrvStack, pDrvReg,
-                                        true /* fEnabledIn */, true /* fEnabledOut */, fWithDrvAudio);
-        if (RT_FAILURE(rc))
-            return rc;
-
-        PPDMAUDIOHOSTDEV pDev;
-        rc = audioTestDevicesEnumerateAndCheck(pTstEnv, pTstEnv->szDev, &pDev);
-        if (RT_FAILURE(rc))
-            return rc;
-    }
 
     char szPathTemp[RTPATH_MAX];
@@ -983 +952 @@
     }
 
-    if (   RT_FAILURE(rc)
-        && fUseDriverStack)
-        audioTestDriverStackDelete(&pTstEnv->DrvStack);
-
     return rc;
 }
@@ -999 +964 @@
     if (!pTstEnv)
         return;
-
-    PDMAudioHostEnumDelete(&pTstEnv->DevEnum);
 
     for (unsigned i = 0; i < RT_ELEMENTS(pTstEnv->aStreams); i++)
@@ -1013 +976 @@
     RTDirRemove(pTstEnv->szPathOut);
 
-    audioTestDriverStackDelete(&pTstEnv->DrvStack);
+    pTstEnv->pDrvStack = NULL;
 }