Changeset 88960 in vbox for trunk

Timestamp:

May 10, 2021 11:28:35 AM (4 years ago)

Author:

vboxsync

Message:

Audio/VaKit: A bit more work on audio device enumeration and selection. bugref:10008

File:

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

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

@@ -40 +40 @@
 
 #include <VBox/vmm/pdmaudioinline.h>
+#include <VBox/vmm/pdmaudiohostenuminline.h>
 
 #include "../../../Devices/Audio/AudioHlp.h"
@@ -65 +66 @@
     /** How many iterations the test should be executed. */
     uint32_t                cIterations;
-    /** Name or path of audio device to use, depending on the OS.
-     *  If NULL, the default device for this specific test (input / output) will be used. */
-    char                   *pszDevice;
+    /** Audio device to use. */
+    PDMAUDIOHOSTDEV         Dev;
     /** Absolute path where to store the test audio data.
      *  If NULL, no test audio data will be written. */
@@ -113 +113 @@
 typedef struct AUDIOTESTENV
 {
-    PPDMIHOSTAUDIO          pDrvAudio;
+    /** The host (backend) driver to use. */
+    PPDMIHOSTAUDIO   pDrvAudio;
+    /** The current (last) audio device enumeration to use. */
+    PDMAUDIOHOSTENUM DevEnm;
 } AUDIOTESTENV;
 /** Pointer a audio test environment. */
@@ -208 +211 @@
 //    PDMAudioPropsInit(&Props, 16 /* bit */ / 8, true /* fSigned */, 2 /* Channels */, 44100 /* Hz */);
 
-    //AudioTestToneParamsInitRandom(&pTestParms->ToneParms, &pTestParms->ToneParms.Props);
+    //AudioTestToneParamsInitRandom(&pTstParms->ToneParms, &pTstParms->ToneParms.Props);
 
     return VINF_SUCCESS;
@@ -232 +235 @@
 *********************************************************************************************************************************/
 
-static void audioTestParmsInit(PAUDIOTESTPARMS pTestParms)
-{
-    RT_BZERO(pTestParms, sizeof(AUDIOTESTPARMS));
+static void audioTestEnvInit(PAUDIOTESTENV pTstEnv, PPDMIHOSTAUDIO pDrvAudio)
+{
+    RT_BZERO(pTstEnv, sizeof(AUDIOTESTENV));
+
+    pTstEnv->pDrvAudio = pDrvAudio;
+    PDMAudioHostEnumInit(&pTstEnv->DevEnm);
+
     return;
 }
 
-static void audioTestParmsDestroy(PAUDIOTESTPARMS pTestParms)
-{
-    if (!pTestParms)
+static void audioTestEnvDestroy(PAUDIOTESTENV pTstEnv)
+{
+    if (!pTstEnv)
         return;
 
-    RTStrFree(pTestParms->pszDevice);
-    pTestParms->pszDevice = NULL;
-
-    RTStrFree(pTestParms->pszPathOutAbs);
-    pTestParms->pszPathOutAbs = NULL;
+    PDMAudioHostEnumDelete(&pTstEnv->DevEnm);
+}
+
+static void audioTestParmsInit(PAUDIOTESTPARMS pTstParms)
+{
+    RT_BZERO(pTstParms, sizeof(AUDIOTESTPARMS));
+    return;
+}
+
+static void audioTestParmsDestroy(PAUDIOTESTPARMS pTstParms)
+{
+    if (!pTstParms)
+        return;
+
+    RTStrFree(pTstParms->pszPathOutAbs);
+    pTstParms->pszPathOutAbs = NULL;
 
     return;
@@ -340 +358 @@
 }
 
-/**
- * Searches for the default audio test device and return the device path.
- *
- * @returns Path to the device audio device or NULL if none was found.
- */
-static char *audioTestDeviceFindDefault(void)
-{
-    /** @todo Implement finding default device. */
-    return NULL;
-}
-
-static int audioTestDeviceOpen(const char *pszDevice)
+static int audioTestDevicesEnumerateAndCheck(PAUDIOTESTENV pTstEnv, const char *pszDev, PPDMAUDIOHOSTDEV *ppDev)
+{
+    RTTestSubF(g_hTest, "Enumerating audio devices and checking for device '%s'", pszDev ? pszDev : "<Default>");
+
+    if (!pTstEnv->pDrvAudio->pfnGetDevices)
+    {
+        RTTestSkipped(g_hTest, "Backend does not support device enumeration, skipping");
+        return VINF_NOT_SUPPORTED;
+    }
+
+    Assert(pszDev == NULL || ppDev);
+
+    if (ppDev)
+        *ppDev = NULL;
+
+    int rc = pTstEnv->pDrvAudio->pfnGetDevices(pTstEnv->pDrvAudio, &pTstEnv->DevEnm);
+    if (RT_SUCCESS(rc))
+    {
+        PPDMAUDIOHOSTDEV pDev;
+        RTListForEach(&pTstEnv->DevEnm.LstDevices, pDev, PDMAUDIOHOSTDEV, ListEntry)
+        {
+            char szFlags[PDMAUDIOHOSTDEV_MAX_FLAGS_STRING_LEN];
+            RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Enum: Device '%s':\n", pDev->szName);
+            RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Enum:   Usage           = %s\n",   PDMAudioDirGetName(pDev->enmUsage));
+            RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Enum:   Flags           = %s\n",   PDMAudioHostDevFlagsToString(szFlags, pDev->fFlags));
+            RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Enum:   Input channels  = %RU8\n", pDev->cMaxInputChannels);
+            RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Enum:   Output channels = %RU8\n", pDev->cMaxOutputChannels);
+
+            if (   pszDev
+                && !RTStrCmp(pDev->szName, pszDev))
+            {
+                *ppDev = pDev;
+            }
+        }
+    }
+    else
+        RTTestFailed(g_hTest, "Enumerating audio devices failed with %Rrc", rc);
+
+    RTTestSubDone(g_hTest);
+
+    if (   pszDev
+        && *ppDev == NULL)
+    {
+        RTTestFailed(g_hTest, "Audio device '%s' not found", pszDev);
+        return VERR_NOT_FOUND;
+    }
+
+    return VINF_SUCCESS;
+}
+
+static int audioTestDeviceOpen(PPDMAUDIOHOSTDEV pDev)
 {
     int rc = VINF_SUCCESS;
 
-    RTTestSubF(g_hTest, "Opening audio device '%s' ...", pszDevice ? "<Default>>" : pszDevice);
-
-    if (!pszDevice)
-        audioTestDeviceFindDefault();
+    RTTestSubF(g_hTest, "Opening audio device '%s' ...", pDev->szName);
 
     /** @todo Detect + open device here. */
+
+    RTTestSubDone(g_hTest);
+
+    return rc;
+}
+
+static int audioTestDeviceClose(PPDMAUDIOHOSTDEV pDev)
+{
+    int rc = VINF_SUCCESS;
+
+    RTTestSubF(g_hTest, "Closing audio device '%s' ...", pDev->szName);
+
+    /** @todo Close device here. */
 
     RTTestSubDone(g_hTest);
@@ -376 +443 @@
                         unsigned uSeq, PAUDIOTESTPARMS pOverrideParms)
 {
+    RT_NOREF(uSeq);
+
     int rc;
 
@@ -400 +469 @@
     audioTestCombineParms(&TstParms, pOverrideParms);
 
-    /* Open the device on the first test being run. */
-    if (   uSeq == 0
-        && TstParms.pszDevice
-        && strlen(TstParms.pszDevice))
-    {
-        rc = audioTestDeviceOpen(TstParms.pszDevice);
-        if (RT_FAILURE(rc))
-            RTTestFailed(g_hTest, "Unable to find audio device '%s'", TstParms.pszDevice);
-    }
+    if (strlen(TstParms.Dev.szName)) /** @todo Refine this check. */
+        rc = audioTestDeviceOpen(&TstParms.Dev);
 
     AssertPtr(pTstDesc->pfnExec);
@@ -422 +484 @@
     }
 
+    rc = audioTestDeviceClose(&TstParms.Dev);
+
     audioTestParmsDestroy(&TstParms);
 
@@ -451 +515 @@
     AUDIOTESTPARMS TstCust;
     audioTestParmsInit(&TstCust);
+
+    char *pszDevice = NULL; /* Custom device to use. Can be NULL if not being used. */
 
     RT_ZERO(g_DrvIns);
@@ -539 +605 @@
             case VKAT_TEST_OPT_DEV:
             {
-                TstCust.pszDevice = RTStrDup(ValueUnion.psz);
+                pszDevice = RTStrDup(ValueUnion.psz);
                 break;
             }
@@ -611 +677 @@
     {
         /* For now all tests have the same test environment. */
-        AUDIOTESTENV TestEnv;
-        TestEnv.pDrvAudio = pDrvAudio;
-
-        audioTestWorker(&TestEnv, &TstCust);
-
+        AUDIOTESTENV TstEnv;
+        audioTestEnvInit(&TstEnv, pDrvAudio);
+
+        PPDMAUDIOHOSTDEV pDev;
+        rc = audioTestDevicesEnumerateAndCheck(&TstEnv, pszDevice, &pDev);
+        if (RT_SUCCESS(rc))
+            audioTestWorker(&TstEnv, &TstCust);
+
+        audioTestEnvDestroy(&TstEnv);
         audioTestDrvDestruct(pDrvReg, &g_DrvIns);
     }
 
     audioTestParmsDestroy(&TstCust);
+
+    RTStrFree(pszDevice);
 
     /*