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

HLE DSP: Add passthrough mix detection

Browse source
This commit is contained in:
wheremyfoodat 2024-11-10 14:53:07 +02:00
parent 6a79309722
commit 7a4f3f4836
2 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/audio/hle_core.hpp
View file

@ -61,6 +61,10 @@ namespace Audio {
// There's one gain configuration for each of the 3 intermediate mixing stages // There's one gain configuration for each of the 3 intermediate mixing stages
// And each gain configuration is composed of 4 gain values, one for each sample in a quad-channel sample // And each gain configuration is composed of 4 gain values, one for each sample in a quad-channel sample
std::array<std::array<float, 4>, 3> gains; std::array<std::array<float, 4>, 3> gains;
// Of the 3 intermediate mix stages, typically only the first one is actually enabled and the other ones do nothing
// Ie their gain is vec4(0.0). We track which stages are disabled (have a gain of all 0s) using this bitfield and skip them
// In order to save up on CPU time.
uint enabledMixStages = 0;
u32 samplePosition; // Sample number into the current audio buffer u32 samplePosition; // Sample number into the current audio buffer
float rateMultiplier; float rateMultiplier;

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

@ -255,6 +255,11 @@ namespace Audio {
// If the source is still enabled, mix its output into the intermediate mix buffers // If the source is still enabled, mix its output into the intermediate mix buffers
if (source.enabled) { if (source.enabled) {
for (int mix = 0; mix < mixes.size(); mix++) { for (int mix = 0; mix < mixes.size(); mix++) {
// Check if this stage is passthrough, and if it is, then skip it
if ((source.enabledMixStages & (1u << mix)) == 0) {
continue;
}
IntermediateMix& intermediateMix = mixes[mix]; IntermediateMix& intermediateMix = mixes[mix];
const std::array<float, 4>& gains = source.gains[mix]; const std::array<float, 4>& gains = source.gains[mix];
@ -397,16 +402,23 @@ namespace Audio {
} }
} }
#define CONFIG_GAIN(index) \ #define CONFIG_GAIN(index) \
if (config.gain##index##Dirty) { \ if (config.gain##index##Dirty) { \
auto& dest = source.gains[index]; \ auto& dest = source.gains[index]; \
auto& source = config.gain[index]; \ auto& sourceGain = config.gain[index]; \
\ \
dest[0] = float(source[0]); \ dest[0] = float(sourceGain[0]); \
dest[1] = float(source[1]); \ dest[1] = float(sourceGain[1]); \
dest[2] = float(source[2]); \ dest[2] = float(sourceGain[2]); \
dest[3] = float(source[3]); \ dest[3] = float(sourceGain[3]); \
\
if (dest[0] == 0.f && dest[1] == 0.f && dest[2] == 0.f && dest[3] == 0.f) { \
source.enabledMixStages &= ~(1u << index); \
} else { \
source.enabledMixStages |= (1u << index); \
} \
} }
CONFIG_GAIN(0); CONFIG_GAIN(0);
CONFIG_GAIN(1); CONFIG_GAIN(1);
CONFIG_GAIN(2); CONFIG_GAIN(2);
@ -744,5 +756,6 @@ namespace Audio {
currentSamples.clear(); currentSamples.clear();
gains.fill({}); gains.fill({});
enabledMixStages = 0;
} }
} // namespace Audio } // namespace Audio