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

Semi-proper audio output

Browse source
This commit is contained in:
wheremyfoodat 2024-02-22 03:37:12 +02:00
parent 21ced6fae7
commit e0c1d4511b
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,8 @@
#include "helpers.hpp" #include "helpers.hpp"
static constexpr uint channelCount = 2;
MiniAudioDevice::MiniAudioDevice() : initialized(false), running(false), samples(nullptr) {} MiniAudioDevice::MiniAudioDevice() : initialized(false), running(false), samples(nullptr) {}
void MiniAudioDevice::init(Samples& samples, bool safe) { void MiniAudioDevice::init(Samples& samples, bool safe) {
@ -79,10 +81,10 @@ void MiniAudioDevice::init(Samples& samples, bool safe) {
deviceConfig = ma_device_config_init(ma_device_type_playback); deviceConfig = ma_device_config_init(ma_device_type_playback);
// The 3DS outputs s16 stereo audio @ 32768 Hz // The 3DS outputs s16 stereo audio @ 32768 Hz
deviceConfig.playback.format = ma_format_s16; deviceConfig.playback.format = ma_format_s16;
deviceConfig.playback.channels = 2; deviceConfig.playback.channels = channelCount;
deviceConfig.sampleRate = 32768; deviceConfig.sampleRate = 32768;
//deviceConfig.periodSizeInFrames = 64; //deviceConfig.periodSizeInFrames = 64;
//deviceConfig.periods = 2; //deviceConfig.periods = 16;
deviceConfig.pUserData = this; deviceConfig.pUserData = this;
deviceConfig.aaudio.usage = ma_aaudio_usage_game; deviceConfig.aaudio.usage = ma_aaudio_usage_game;
deviceConfig.wasapi.noAutoConvertSRC = true; deviceConfig.wasapi.noAutoConvertSRC = true;
@ -91,7 +93,8 @@ void MiniAudioDevice::init(Samples& samples, bool safe) {
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);
self->samples->pop(output, frameCount); while (self->samples->size() < frameCount * channelCount) {}
self->samples->pop(output, frameCount * 2);
}; };
if (ma_device_init(&context, &deviceConfig, &device) != MA_SUCCESS) { if (ma_device_init(&context, &deviceConfig, &device) != MA_SUCCESS) {

6
src/core/audio/teakra_core.cpp
View file

@ -55,7 +55,11 @@ TeakraDSP::TeakraDSP(Memory& mem, Scheduler& scheduler, DSPService& dspService)
ahbm.write32 = [&](u32 addr, u32 value) { *(u32*)&mem.getFCRAM()[addr - PhysicalAddrs::FCRAM] = value; }; ahbm.write32 = [&](u32 addr, u32 value) { *(u32*)&mem.getFCRAM()[addr - PhysicalAddrs::FCRAM] = value; };
teakra.SetAHBMCallback(ahbm); teakra.SetAHBMCallback(ahbm);
teakra.SetAudioCallback([=](std::array<s16, 2> sample) { sampleBuffer.push(sample.data(), 2); }); teakra.SetAudioCallback([=](std::array<s16, 2> sample) {
while (sampleBuffer.size() + 2 > sampleBuffer.Capacity()) {}
sampleBuffer.push(sample.data(), 2);
});
// Set up event handlers. These handlers forward a hardware interrupt to the DSP service, which is responsible // Set up event handlers. These handlers forward a hardware interrupt to the DSP service, which is responsible
// For triggering the appropriate DSP kernel events // For triggering the appropriate DSP kernel events