Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-06 22:25:41 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent app crash when miniaudio samples bigger than capacity (#596)

Browse source 
* Prevent app crash when miniaudio samples bigger than capacity

* Update miniaudio_device.cpp

---------

Co-authored-by: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
This commit is contained in:
Jonian Guveli 2024-09-07 16:20:41 +03:00 • committed by GitHub
parent f1b7830952
commit c12c3bce8d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core/audio/miniaudio_device.cpp
View file

@ -90,16 +90,17 @@ void MiniAudioDevice::init(Samples& samples, bool safe) {
deviceConfig.dataCallback = [](ma_device* device, void* out, const void* input, ma_uint32 frameCount) { deviceConfig.dataCallback = [](ma_device* device, void* out, const void* input, ma_uint32 frameCount) {
auto self = reinterpret_cast<MiniAudioDevice*>(device->pUserData); auto self = reinterpret_cast<MiniAudioDevice*>(device->pUserData);
s16* output = reinterpret_cast<ma_int16*>(out); s16* output = reinterpret_cast<ma_int16*>(out);
const usize maxSamples = std::min(self->samples->Capacity(), usize(frameCount * channelCount));
// Wait until there's enough samples to pop // Wait until there's enough samples to pop
while (self->samples->size() < frameCount * channelCount) { while (self->samples->size() < maxSamples) {
// If audio output is disabled from the emulator thread, make sure that this callback will return and not hang // If audio output is disabled from the emulator thread, make sure that this callback will return and not hang
if (!self->running) { if (!self->running) {
return; return;
} }
} }
self->samples->pop(output, frameCount * channelCount); self->samples->pop(output, maxSamples);
}; };
if (ma_device_init(&context, &deviceConfig, &device) != MA_SUCCESS) { if (ma_device_init(&context, &deviceConfig, &device) != MA_SUCCESS) {