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

DSP HLE: Broken PCM16 and handle DSP voice status better

Browse source
This commit is contained in:
wheremyfoodat 2024-04-28 16:58:42 +03:00
parent 8e303d8d08
commit 2fc9c0a573
3 changed files with 138 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/audio/dsp_shared_mem.hpp
View file

@ -297,7 +297,7 @@ namespace Audio::HLE {
u8 isEnabled; ///< Is this channel enabled? (Doesn't have to be playing anything.)
u8 currentBufferIDDirty; ///< Non-zero when current_buffer_id changes
u16_le syncCount; ///< Is set by the DSP to the value of SourceConfiguration::sync_count
u32_dsp bufferPosition; ///< Number of samples into the current buffer
u32_dsp samplePosition; ///< Number of samples into the current buffer
u16_le currentBufferID; ///< Updated when a buffer finishes playing
u16_le lastBufferID; ///< Updated when all buffers in the queue finish playing
};

25
include/audio/hle_core.hpp
View file

@ -32,8 +32,8 @@ namespace Audio {
SampleFormat format;
SourceType sourceType;
bool fromQueue = false; // Is this buffer from the buffer queue or an embedded buffer?
bool hasPlayedOnce = false; // Has the buffer been played at least once before?
bool fromQueue = false; // Is this buffer from the buffer queue or an embedded buffer?
bool hasPlayedOnce = false; // Has the buffer been played at least once before?
bool operator<(const Buffer& other) const {
// Lower ID = Higher priority
@ -47,9 +47,17 @@ namespace Audio {
using BufferQueue = std::priority_queue<Buffer>;
BufferQueue buffers;
SampleFormat sampleFormat = SampleFormat::ADPCM;
SourceType sourceType = SourceType::Stereo;
std::array<float, 3> gain0, gain1, gain2;
u32 samplePosition; // Sample number into the current audio buffer
u16 syncCount;
bool enabled; // Is the source enabled?
u16 currentBufferID;
u16 previousBufferID;
bool enabled; // Is the source enabled?
bool isBufferIDDirty = false; // Did we change buffers?
// ADPCM decoding info:
// An array of fixed point S5.11 coefficients. These provide "weights" for the history samples
@ -65,6 +73,10 @@ namespace Audio {
int index = 0; // Index of the voice in [0, 23] for debugging
void reset();
// Push a buffer to the buffer queue
void pushBuffer(const Buffer& buffer) { buffers.push(buffer); }
// Pop a buffer from the buffer queue and return it
Buffer popBuffer() {
assert(!buffers.empty());
@ -114,9 +126,6 @@ namespace Audio {
std::array<Source, Audio::HLE::sourceCount> sources; // DSP voices
Audio::HLE::DspMemory dspRam;
SampleFormat sampleFormat = SampleFormat::ADPCM;
SourceType sourceType = SourceType::Stereo;
void resetAudioPipe();
bool loaded = false; // Have we loaded a component?
@ -159,9 +168,13 @@ namespace Audio {
void updateSourceConfig(Source& source, HLE::SourceConfiguration::Configuration& config, s16_le* adpcmCoefficients);
void generateFrame(StereoFrame<s16>& frame);
void generateFrame(DSPSource& source);
void outputFrame();
// Decode an entire buffer worth of audio
void decodeBuffer(DSPSource& source);
SampleBuffer decodePCM16(const u8* data, usize sampleCount, Source& source);
SampleBuffer decodeADPCM(const u8* data, usize sampleCount, Source& source);
public: