thirdpartymirrors/UnleashedRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/UnleashedRecomp.git synced 2025-12-20 06:52:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use readerwriterqueue for SDL2 audio.

Browse source
This commit is contained in:
Skyth 2024-12-01 13:55:50 +03:00
parent d51ba31f27
commit e7494667ad
4 changed files with 17 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
UnleashedRecomp/CMakeLists.txt
View file

@ -160,6 +160,7 @@ find_package(unofficial-concurrentqueue REQUIRED)
find_package(imgui CONFIG REQUIRED) find_package(imgui CONFIG REQUIRED)
find_package(magic_enum CONFIG REQUIRED) find_package(magic_enum CONFIG REQUIRED)
find_package(unofficial-tiny-aes-c CONFIG REQUIRED) find_package(unofficial-tiny-aes-c CONFIG REQUIRED)
find_path(READERWRITERQUEUE_INCLUDE_DIRS "readerwriterqueue/atomicops.h")
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/D3D12) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/D3D12)
add_custom_command(TARGET UnleashedRecomp POST_BUILD add_custom_command(TARGET UnleashedRecomp POST_BUILD
@ -207,6 +208,7 @@ target_include_directories(UnleashedRecomp PRIVATE
${LIBMSPACK_PATH} ${LIBMSPACK_PATH}
${Stb_INCLUDE_DIR} ${Stb_INCLUDE_DIR}
${SMOLV_SOURCE_DIR} ${SMOLV_SOURCE_DIR}
${READERWRITERQUEUE_INCLUDE_DIRS}
) )
target_precompile_headers(UnleashedRecomp PUBLIC ${SWA_PRECOMPILED_HEADERS}) target_precompile_headers(UnleashedRecomp PUBLIC ${SWA_PRECOMPILED_HEADERS})

44
UnleashedRecomp/apu/driver/sdl2_driver.cpp
View file

@ -5,35 +5,22 @@
#include <kernel/heap.h> #include <kernel/heap.h>
#define SDLAUDIO_DRIVER_KEY (uint32_t)('SDLA') #define SDLAUDIO_DRIVER_KEY (uint32_t)('SDLA')
constexpr uint32_t g_semaphoreCount = 16;
constexpr uint32_t g_audioFrameSize = XAUDIO_NUM_SAMPLES * XAUDIO_NUM_CHANNELS;
PPCFunc* volatile g_clientCallback{}; static constexpr uint32_t AUDIO_FRAME_SIZE = XAUDIO_NUM_SAMPLES * XAUDIO_NUM_CHANNELS;
DWORD g_clientCallbackParam{}; // pointer in guest memory
SDL_AudioDeviceID g_audioDevice{}; static std::atomic<PPCFunc*> g_clientCallback{};
SDL_sem* g_audioSemaphore{ SDL_CreateSemaphore(g_semaphoreCount) }; static DWORD g_clientCallbackParam{}; // pointer in guest memory
uint32_t g_audioFrames[g_audioFrameSize * g_semaphoreCount];
uint32_t g_audioFrameIndex = 0; static SDL_AudioDeviceID g_audioDevice{};
uint32_t g_renderFrameIndex = 0; // Index of frame that's being rendered static moodycamel::BlockingReaderWriterCircularBuffer<std::array<uint32_t, AUDIO_FRAME_SIZE>> g_audioQueue(16);
uint32_t g_numRenderFrames = 0; // Number of frames to render
Mutex g_framesMutex{};
static void SDLAudioCallback(void*, uint8_t* frames, int len) static void SDLAudioCallback(void*, uint8_t* frames, int len)
{ {
std::lock_guard guard{ g_framesMutex }; std::array<uint32_t, AUDIO_FRAME_SIZE> audioFrame;
if (g_numRenderFrames == 0) if (g_audioQueue.try_dequeue(audioFrame))
{ memcpy(frames, &audioFrame, sizeof(audioFrame));
memset(frames, 0, len);
}
else else
{ memset(frames, 0, len);
g_renderFrameIndex = (g_renderFrameIndex + 1) % g_semaphoreCount;
auto* srcFrames = &g_audioFrames[g_renderFrameIndex * g_audioFrameSize];
memcpy(frames, srcFrames, g_audioFrameSize * sizeof(float));
--g_numRenderFrames;
}
SDL_SemPost(g_audioSemaphore);
} }
static PPC_FUNC(DriverLoop) static PPC_FUNC(DriverLoop)
@ -43,11 +30,8 @@ static PPC_FUNC(DriverLoop)
while (true) while (true)
{ {
if (!g_clientCallback) if (!g_clientCallback)
{
continue; continue;
}
SDL_SemWait(g_audioSemaphore);
ctx.r3.u64 = g_clientCallbackParam; ctx.r3.u64 = g_clientCallbackParam;
GuestCode::Run((void*)g_clientCallback, &ctx); GuestCode::Run((void*)g_clientCallback, &ctx);
} }
@ -55,8 +39,6 @@ static PPC_FUNC(DriverLoop)
void XAudioInitializeSystem() void XAudioInitializeSystem()
{ {
assert(g_audioSemaphore);
SDL_SetHint(SDL_HINT_AUDIO_CATEGORY, "playback"); SDL_SetHint(SDL_HINT_AUDIO_CATEGORY, "playback");
SDL_SetHint(SDL_HINT_AUDIO_DEVICE_APP_NAME, "SWA"); SDL_SetHint(SDL_HINT_AUDIO_DEVICE_APP_NAME, "SWA");
@ -87,9 +69,7 @@ void XAudioRegisterClient(PPCFunc* callback, uint32_t param)
void XAudioSubmitFrame(void* samples) void XAudioSubmitFrame(void* samples)
{ {
std::lock_guard guard{ g_framesMutex }; std::array<uint32_t, AUDIO_FRAME_SIZE> audioFrame;
uint32_t* audioFrame = &g_audioFrames[g_audioFrameSize * g_audioFrameIndex];
g_audioFrameIndex = (g_audioFrameIndex + 1) % g_semaphoreCount;
for (size_t i = 0; i < XAUDIO_NUM_SAMPLES; i++) for (size_t i = 0; i < XAUDIO_NUM_SAMPLES; i++)
{ {
@ -97,5 +77,5 @@ void XAudioSubmitFrame(void* samples)
audioFrame[i * XAUDIO_NUM_CHANNELS + j] = std::byteswap(((uint32_t*)samples)[j * XAUDIO_NUM_SAMPLES + i]); audioFrame[i * XAUDIO_NUM_CHANNELS + j] = std::byteswap(((uint32_t*)samples)[j * XAUDIO_NUM_SAMPLES + i]);
} }
++g_numRenderFrames; g_audioQueue.wait_enqueue(audioFrame);
} }

1
UnleashedRecomp/stdafx.h
View file

@ -32,6 +32,7 @@
#include <wrl/client.h> #include <wrl/client.h>
#include <smolv.h> #include <smolv.h>
#include <print> #include <print>
#include <readerwriterqueue/readerwritercircularbuffer.h>
using Microsoft::WRL::ComPtr; using Microsoft::WRL::ComPtr;

3
vcpkg.json
View file

@ -21,6 +21,7 @@
"name": "imgui", "name": "imgui",
"features": [ "sdl2-binding" ] "features": [ "sdl2-binding" ]
}, },
"magic-enum" "magic-enum",
"readerwriterqueue"
] ]
} }