Changeset 88928 in vbox

Timestamp:

May 7, 2021 2:25:30 PM (4 years ago)

Author:

vboxsync

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

144263

Message:

Audio/VaKit: Allow dynamic test backend selection via "[-bbackend]". bugref:10008

Location:

trunk/src/VBox

Files:

• Devices/Audio/DrvHostAudioAlsa.cpp (modified) (1 diff)
• Devices/Audio/DrvHostAudioOss.cpp (modified) (1 diff)
• Devices/Audio/DrvHostAudioPulseAudio.cpp (modified) (1 diff)
• Devices/Audio/VBoxDDVKAT.h (modified) (2 diffs)
• ValidationKit/utils/audio/Makefile.kmk (modified) (3 diffs)
• ValidationKit/utils/audio/vkat.cpp (modified) (5 diffs)

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

@@ -1508 +1508 @@
 const PDMDRVREG g_DrvVKATAlsa =
 {
+    /* szName */
+    "ALSAAudio",
     /* cbInstance */
     sizeof(DRVHOSTALSAAUDIO),

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

@@ -937 +937 @@
 };
 #else
-const PDMDRVREG g_DrvVKATOSS =
-{
+const PDMDRVREG g_DrvVKATOss =
+{
+    /* szName */
+    "OSSAudio",
     /* cbInstance */
     sizeof(DRVHOSTOSSAUDIO),

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

@@ -2069 +2069 @@
 const PDMDRVREG g_DrvVKATPulseAudio =
 {
+    /* szName */
+    "PulseAudio",
     /* cbInstance */
     sizeof(DRVHOSTPULSEAUDIO),

trunk/src/VBox/Devices/Audio/VBoxDDVKAT.h

@@ -52 +52 @@
 typedef struct PDMDRVREG
 {
+    /** Driver name. */
+    char                szName[32];
     /** Size of the instance data. */
     uint32_t            cbInstance;
@@ -76 +78 @@
 extern const PDMDRVREG g_DrvVKATPulseAudio;
 extern const PDMDRVREG g_DrvVKATAlsa;
+extern const PDMDRVREG g_DrvVKATOss;
 
 #endif /* VBoxDDVKAT_h__ */

trunk/src/VBox/ValidationKit/utils/audio/Makefile.kmk

@@ -52 +52 @@
 
 ifdef VBOX_WITH_AUDIO_PULSE
+ AudioTest_DEFS    += VBOX_WITH_AUDIO_PULSE
  AudioTest_SOURCES += \
         $(VKAT_PATH_AUDIO)/DrvHostAudioPulseAudioStubs.cpp \
@@ -58 +59 @@
 
 ifdef VBOX_WITH_AUDIO_ALSA
+ AudioTest_DEFS    += VBOX_WITH_AUDIO_ALSA
  AudioTest_SOURCES += \
         $(VKAT_PATH_AUDIO)/DrvHostAudioAlsa.cpp \
@@ -64 +66 @@
 
 ifdef VBOX_WITH_AUDIO_OSS
+ AudioTest_DEFS    += VBOX_WITH_AUDIO_OSS
  AudioTest_SOURCES += \
         $(VKAT_PATH_AUDIO)/DrvHostAudioOss.cpp

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

@@ -165 +165 @@
 static const RTGETOPTDEF g_aCmdTestOptions[] =
 {
+    { "--backend",          'b',                          RTGETOPT_REQ_STRING  },
     { "--exclude",          'e',                          RTGETOPT_REQ_UINT32  },
     { "--exclude-all",      'a',                          RTGETOPT_REQ_NOTHING },
@@ -304 +305 @@
     AssertReturn(pDrvReg->cbInstance, VERR_INVALID_PARAMETER); /** @todo Very crude; improve. */
 
+    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Initializing backend '%s' ...\n", pDrvReg->szName);
+
     pDrvIns->pvInstanceData = RTMemAllocZ(pDrvReg->cbInstance);
+    AssertPtrReturn(pDrvIns->pvInstanceData, VERR_NO_MEMORY);
 
     int rc = pDrvReg->pfnConstruct(pDrvIns, NULL /* PCFGMNODE */, 0 /* fFlags */);
@@ -448 +452 @@
     audioTestParmsInit(&TstCust);
 
+    RT_ZERO(g_DrvIns);
+    const PDMDRVREG *pDrvReg = NULL;
+
     RTGETOPTUNION ValueUnion;
     RTGETOPTSTATE GetState;
-    RTGetOptInit(&GetState, argc, argv, g_aCmdTestOptions, RT_ELEMENTS(g_aCmdTestOptions), 1, 0 /* fFlags */);
+    RTGetOptInit(&GetState, argc, argv, g_aCmdTestOptions, RT_ELEMENTS(g_aCmdTestOptions), 0, 0 /* fFlags */);
     while ((rc = RTGetOpt(&GetState, &ValueUnion)))
     {
@@ -481 +488 @@
             }
 
+            case 'b':
+            {
+#ifdef VBOX_WITH_AUDIO_PULSE
+                if (   !RTStrICmp(ValueUnion.psz, "pulseaudio")
+                    || !RTStrICmp(ValueUnion.psz, "pa"))
+                    pDrvReg = &g_DrvVKATPulseAudio;
+#endif
+#ifdef VBOX_WITH_AUDIO_ALSA
+                if (   !RTStrICmp(ValueUnion.psz, "alsa"))
+                    pDrvReg = &g_DrvVKATAlsa;
+#endif
+#ifdef VBOX_WITH_AUDIO_OSS
+                if (   !RTStrICmp(ValueUnion.psz, "oss"))
+                    pDrvReg = &g_DrvVKATOss;
+#endif
+                /** @todo Add more backends here. */
+
+                if (pDrvReg == NULL)
+                    return RTMsgErrorExit(RTEXITCODE_SYNTAX, "Invalid / unsupported backend '%s' specified\n", ValueUnion.psz);
+                break;
+            }
+
             case 'i':
             {
@@ -556 +585 @@
     RTTestBanner(g_hTest);
 
-    const PDMDRVREG *pDrvReg = &g_DrvVKATAlsa;
-
-    RT_ZERO(g_DrvIns);
+    /* If no backend is specified, go with the ALSA one by default. */
+    if (pDrvReg == NULL)
+        pDrvReg = &g_DrvVKATAlsa;
 
     PPDMIHOSTAUDIO pDrvAudio;