Changeset 88959 in vbox

Timestamp:

May 10, 2021 7:19:31 AM (4 years ago)

Author:

vboxsync

Message:

Audio/VaKit: Added driver backends for MacOS and Windows. bugref:10008

Location:

trunk/src/VBox

Files:

• Devices/Audio/DrvHostAudioCoreAudio.cpp (modified) (1 diff)
• Devices/Audio/DrvHostAudioDSound.cpp (modified) (1 diff)
• Devices/Audio/DrvHostAudioWasApi.cpp (modified) (1 diff)
• Devices/Audio/VBoxDDVKAT.h (modified) (1 diff)
• ValidationKit/utils/audio/vkat.cpp (modified) (2 diffs)

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

@@ -25 +25 @@
 #include <VBox/vmm/pdmaudiohostenuminline.h>
 
-#include "VBoxDD.h"
+#ifdef VBOX_AUDIO_VKAT
+# include "VBoxDDVKAT.h"
+#else
+# include "VBoxDD.h"
+#endif
 
 #include <iprt/asm.h>

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

@@ -36 +36 @@
 #include <VBox/vmm/pdmaudiohostenuminline.h>
 
-#include "VBoxDD.h"
+#ifdef VBOX_AUDIO_VKAT
+# include "VBoxDDVKAT.h"
+#else
+# include "VBoxDD.h"
+#endif
+
 #ifdef VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT
 # include <new> /* For bad_alloc. */

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

@@ -45 +45 @@
 #include <new> /* std::bad_alloc */
 
-#include "VBoxDD.h"
+#ifdef VBOX_AUDIO_VKAT
+# include "VBoxDDVKAT.h"
+#else
+# include "VBoxDD.h"
+#endif
 
 

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

@@ -150 +150 @@
 extern const PDMDRVREG g_DrvHostOSSAudio;
 #endif
+#if defined(RT_OS_WINDOWS)
+extern const PDMDRVREG g_DrvHostAudioWas;
+extern const PDMDRVREG g_DrvHostDSound;
+#endif
+#if defined(RT_OS_DARWIN)
+extern const PDMDRVREG g_DrvHostCoreAudio;
+#endif
 
 #endif /* !VBOX_INCLUDED_SRC_Audio_VBoxDDVKAT_h */

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

@@ -503 +503 @@
                     pDrvReg = &g_DrvHostOSSAudio;
 #endif
-                /** @todo Add more backends here. */
-
+#if defined(RT_OS_DARWIN)
+                if (   !RTStrICmp(ValueUnion.psz, "coreaudio"))
+                    pDrvReg = &g_DrvHostCoreAudio;
+#endif
+#if defined(RT_OS_WINDOWS)
+                if (        !RTStrICmp(ValueUnion.psz, "wasapi"))
+                    pDrvReg = &g_DrvHostAudioWas;
+                else if (   !RTStrICmp(ValueUnion.psz, "directsound")
+                         || !RTStrICmp(ValueUnion.psz, "dsound")
+                    pDrvReg = &g_DrvHostDSound;
+#endif
                 if (pDrvReg == NULL)
                     return RTMsgErrorExit(RTEXITCODE_SYNTAX, "Invalid / unsupported backend '%s' specified\n", ValueUnion.psz);
@@ -585 +594 @@
     RTTestBanner(g_hTest);
 
-    /* If no backend is specified, go with the ALSA one by default. */
+    /* If no backend is specified, go with the default backend for that OS. */
     if (pDrvReg == NULL)
+#if defined(RT_OS_WINDOWS)
+        pDrvReg = &g_DrvHostAudioWas;
+#elif defined(RT_OS_DARWIN)
+        pDrvReg = &g_DrvHostCoreAudio;
+#elif defined(RT_OS_SOLARIS)
+        pDrvReg = &g_DrvHostOSSAudio;
+#else
         pDrvReg = &g_DrvHostALSAAudio;
+#endif
 
     PPDMIHOSTAUDIO pDrvAudio;