Leahnaya/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-10-01 14:47:02 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

HW/GBACore: Flush audio buffer on sample rate change and don't dynamically allocate intermediary buffer.

Browse Source
This commit is contained in:
Jordan Woyak
2026-04-02 10:02:21 -05:00
parent e20f52ce7c
commit 38674f5152
2 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Source/Core/Core/HW/GBACore.cpp
View File

@@ -454,34 +454,43 @@ void Core::AddCallbacks()
m_core->addCoreCallbacks(m_core, &callbacks);
}
static void ReadAudioBufferIntoMixer(mAudioBuffer* audio_buffer, Mixer* mixer,
std::size_t device_number)
{
std::array<s16, AUDIO_BUFFER_SIZE> sample_buffer;
const auto read_size = sample_buffer.size() / audio_buffer->channels;
while (true)
{
const auto sample_count = mAudioBufferRead(audio_buffer, sample_buffer.data(), read_size);
if (sample_count == 0)
break;
mixer->PushGBASamples(device_number, sample_buffer.data(), sample_count);
}
}
void Core::SetAVStream()
{
m_stream = {};
m_stream.core = this;
m_stream.videoDimensionsChanged = [](mAVStream* stream, unsigned width, unsigned height) {
auto core = static_cast<AVStream*>(stream)->core;
m_stream = {
.core = this,
.mixer = m_system.GetSoundStream()->GetMixer(),
};
m_stream.videoDimensionsChanged = [](mAVStream* stream, unsigned /*width*/, unsigned /*height*/) {
auto* core = static_cast<AVStream*>(stream)->core;
core->SetVideoBuffer();
};
m_stream.audioRateChanged = [](mAVStream* stream, unsigned rate) {
auto* core = static_cast<AVStream*>(stream)->core;
auto* const sound_stream = core->m_system.GetSoundStream();
sound_stream->GetMixer()->SetGBAInputSampleRate(core->m_device_number, rate);
auto* const av_stream = static_cast<AVStream*>(stream);
auto* const core = av_stream->core;
auto* const audio_buffer = core->GetAudioBuffer();
ReadAudioBufferIntoMixer(audio_buffer, av_stream->mixer, av_stream->core->m_device_number);
av_stream->mixer->SetGBAInputSampleRate(core->m_device_number, rate);
};
m_stream.postAudioBuffer = [](mAVStream* stream, mAudioBuffer* audio_buffer) {
size_t sample_count = mAudioBufferAvailable(audio_buffer);
const size_t required_buffer_size = sample_count * audio_buffer->channels;
auto* const av_stream = static_cast<AVStream*>(stream);
if (required_buffer_size > av_stream->sample_buffer.size())
av_stream->sample_buffer.reset(required_buffer_size);
sample_count = mAudioBufferRead(audio_buffer, av_stream->sample_buffer.data(), sample_count);
auto* const core = av_stream->core;
auto* const sound_stream = core->m_system.GetSoundStream();
sound_stream->GetMixer()->PushGBASamples(core->m_device_number, av_stream->sample_buffer.data(),
sample_count);
ReadAudioBufferIntoMixer(audio_buffer, av_stream->mixer, av_stream->core->m_device_number);
};
m_core->setAVStream(m_core, &m_stream);
}

4
Source/Core/Core/HW/GBACore.h
View File

@@ -18,11 +18,11 @@
#include <mgba/core/core.h>
#include <mgba/gba/interface.h>
#include "Common/Buffer.h"
#include "Common/CommonTypes.h"
#include "Common/WorkQueueThread.h"
class GBAHostInterface;
class Mixer;
class PointerWrap;
namespace Core
{
@@ -39,7 +39,7 @@ struct SIODriver : GBASIODriver
struct AVStream : mAVStream
{
Core* core;
Common::UniqueBuffer<s16> sample_buffer;
Mixer* mixer;
};
struct CoreInfo