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

HLE DSP: More of it

Browse source
This commit is contained in:
wheremyfoodat 2024-04-05 19:42:18 +03:00
parent 2548bde538
commit 5da93d17bd
2 changed files with 48 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
include/audio/hle_core.hpp
View file

@ -6,6 +6,27 @@
#include "memory.hpp" #include "memory.hpp"
namespace Audio { namespace Audio {
struct DSPSource {
std::array<float, 3> gain0, gain1, gain2;
// Audio buffer information
// https://www.3dbrew.org/wiki/DSP_Memory_Region
struct Buffer {
u32 paddr; // Physical address of the buffer
u32 sampleCount; // Total number of samples
u8 adpcmScale; // ADPCM predictor/scale
u8 pad; // Unknown
std::array<s16, 2> previousSamples; // ADPCM y[n-1] and y[n-2]
bool adpcmDirty;
bool looping;
u16 bufferID;
};
void reset();
DSPSource() { reset(); }
};
class HLE_DSP : public DSPCore { class HLE_DSP : public DSPCore {
// The audio frame types are public in case we want to use them for unit tests // The audio frame types are public in case we want to use them for unit tests
public: public:
@ -24,6 +45,7 @@ namespace Audio {
template <typename T> template <typename T>
using QuadFrame = Frame<T, 4>; using QuadFrame = Frame<T, 4>;
using Source = Audio::DSPSource;
private: private:
enum class DSPState : u32 { enum class DSPState : u32 {
Off, Off,
@ -61,7 +83,7 @@ namespace Audio {
Audio::HLE::SharedMemory& readRegion() { return readRegionIndex() == 0 ? dspRam.region0 : dspRam.region1; } Audio::HLE::SharedMemory& readRegion() { return readRegionIndex() == 0 ? dspRam.region0 : dspRam.region1; }
Audio::HLE::SharedMemory& writeRegion() { return readRegionIndex() == 0 ? dspRam.region1 : dspRam.region0; } Audio::HLE::SharedMemory& writeRegion() { return readRegionIndex() == 0 ? dspRam.region1 : dspRam.region0; }
StereoFrame<s16> generateFrame(); void generateFrame(StereoFrame<s16>& frame);
void outputFrame(); void outputFrame();
public: public:
HLE_DSP(Memory& mem, Scheduler& scheduler, DSPService& dspService) : DSPCore(mem, scheduler, dspService) {} HLE_DSP(Memory& mem, Scheduler& scheduler, DSPService& dspService) : DSPCore(mem, scheduler, dspService) {}

27
src/core/audio/hle_core.cpp
View file

@ -1,5 +1,7 @@
#include "audio/hle_core.hpp" #include "audio/hle_core.hpp"
#include <thread>
#include "services/dsp.hpp" #include "services/dsp.hpp"
namespace Audio { namespace Audio {
@ -168,7 +170,28 @@ namespace Audio {
} }
void HLE_DSP::outputFrame() { void HLE_DSP::outputFrame() {
StereoFrame<s16> frame = generateFrame(); StereoFrame<s16> frame;
Helpers::panic("HLE DSP: Output frame"); generateFrame(frame);
if (audioEnabled) {
// Wait until we've actually got room to push our frame
while (sampleBuffer.size() + 2 > sampleBuffer.Capacity()) {
std::this_thread::sleep_for(std::chrono::milliseconds{1});
} }
sampleBuffer.push(frame.data(), frame.size());
}
}
void HLE_DSP::generateFrame(StereoFrame<s16>& frame) {
using namespace Audio::HLE;
SharedMemory& read = readRegion();
SharedMemory& write = writeRegion();
for (int source = 0; source < sourceCount; source++) {
Helpers::panic("Panda");
}
}
void DSPSource::reset() {}
} // namespace Audio } // namespace Audio