We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

Patch to fix WASAPI device init for WinRT

wasapi_winrt.diff (text/plain), 2.44 KB, created by Ethan Lee on 2018-08-09 14:48:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ethan Lee

Created: 2018-08-09 14:48:32 UTC

Size: 2.44 KB

patch

obsolete

># HG changeset patch
># User Ethan Lee <flibitijibibo@flibitijibibo.com>
># Date 1533825525 14400
>#      Thu Aug 09 10:38:45 2018 -0400
># Node ID 4be9eef22dad1923e33420b16ccd924cfbf77a81
># Parent  abc706dbb7af0dce51f1edc9965a38761e83519b
>WinRT: Wait until audio device activation is complete and PrepDevice during OpenAudio
>
>diff -r abc706dbb7af -r 4be9eef22dad src/audio/wasapi/SDL_wasapi.c
>--- a/src/audio/wasapi/SDL_wasapi.c	Fri Jun 29 18:29:17 2018 +0300
>+++ b/src/audio/wasapi/SDL_wasapi.c	Thu Aug 09 10:38:45 2018 -0400
>@@ -725,6 +725,12 @@
>     WASAPI_PlatformThreadDeinit(this);
> }
> 
>+void
>+WASAPI_BeginLoopIteration(_THIS)
>+{
>+	/* no-op. */
>+}
>+
> static void
> WASAPI_Deinitialize(void)
> {
>diff -r abc706dbb7af -r 4be9eef22dad src/audio/wasapi/SDL_wasapi_win32.c
>--- a/src/audio/wasapi/SDL_wasapi_win32.c	Fri Jun 29 18:29:17 2018 +0300
>+++ b/src/audio/wasapi/SDL_wasapi_win32.c	Thu Aug 09 10:38:45 2018 -0400
>@@ -405,12 +405,6 @@
>     SDL_assert(!"This function should have only been called on WinRT.");
> }
> 
>-void
>-WASAPI_BeginLoopIteration(_THIS)
>-{
>-    /* no-op. */
>-}
>-
> #endif  /* SDL_AUDIO_DRIVER_WASAPI && !defined(__WINRT__) */
> 
> /* vi: set ts=4 sw=4 expandtab: */
>diff -r abc706dbb7af -r 4be9eef22dad src/audio/wasapi/SDL_wasapi_winrt.cpp
>--- a/src/audio/wasapi/SDL_wasapi_winrt.cpp	Fri Jun 29 18:29:17 2018 +0300
>+++ b/src/audio/wasapi/SDL_wasapi_winrt.cpp	Thu Aug 09 10:38:45 2018 -0400
>@@ -246,17 +246,23 @@
>         return WIN_SetErrorFromHRESULT("WASAPI can't activate requested audio endpoint", ret);
>     }
> 
>-    return 0;
>-}
>+    /* Spin until the async operation is complete.
>+     * If we don't PrepDevice before leaving this function, the bug list gets LONG:
>+     * - device.spec is not filled with the correct information
>+     * - The 'obtained' spec will be wrong for ALLOW_CHANGE properties
>+     * - SDL_AudioStreams will/will not be allocated at the right time
>+     * - SDL_assert(device->callbackspec.size == device->spec.size) will fail
>+     * - When the assert is ignored, skipping or a buffer overflow will occur
>+     */
>+    while (!SDL_AtomicCAS(&_this->hidden->just_activated, 1, 0)) {
>+        SDL_Delay(1);
>+    }
> 
>-void
>-WASAPI_BeginLoopIteration(_THIS)
>-{
>-    if (SDL_AtomicCAS(&_this->hidden->just_activated, 1, 0)) {
>-        if (WASAPI_PrepDevice(_this, SDL_TRUE) == -1) {
>-            SDL_OpenedAudioDeviceDisconnected(_this);
>-        } 
>+    if (WASAPI_PrepDevice(_this, SDL_TRUE) == -1) {
>+        return -1;
>     }
>+
>+    return 0;
> }
> 
> void

Actions: View

Attachments on bug 4224: 3277 | 3305 | 3311

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.