The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-24 06:51:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

DSPHLE/Zelda: use precise 32-step volume ramping

Browse Source 
Whilst the 80-step approach theoretically improves ramping smoothness,
in practice it causes accumulating rounding errors because the delta
value is not always a multiple of the buffer size.

Also pull the step computation into AddBuffersWithVolumeRamp() so that
all ramping related math is in the same place.
This commit is contained in:
Tillmann Karras 2024-01-14 02:23:01 +00:00
parent 4f5e3674e1
commit 0233286729
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp
View File

@ -1249,8 +1249,7 @@ void ZeldaAudioRenderer::AddVoice(u16 voice_id)
}; };
for (const auto& buffer : buffers) for (const auto& buffer : buffers)
{ {
AddBuffersWithVolumeRamp(buffer.buffer, input_samples, buffer.volume << 16, AddBuffersWithVolumeRamp(buffer.buffer, input_samples, buffer.volume, buffer.volume_delta);
(buffer.volume_delta << 16) / (s32)buffer.buffer.size());
} }
vpb.dolby_volume_current = vpb.dolby_volume_target; vpb.dolby_volume_current = vpb.dolby_volume_target;
@ -1285,13 +1284,11 @@ void ZeldaAudioRenderer::AddVoice(u16 voice_id)
else else
volume_delta = vpb.channels[i].target_volume - vpb.channels[i].current_volume; volume_delta = vpb.channels[i].target_volume - vpb.channels[i].current_volume;
s32 volume_step = (volume_delta << 16) / (s32)input_samples.size(); // In 1.31 format.
// TODO: The last value of each channel structure is used to // TODO: The last value of each channel structure is used to
// determine whether a channel should be skipped or not. Not // determine whether a channel should be skipped or not. Not
// implemented yet. // implemented yet.
if (!vpb.channels[i].current_volume && !volume_step) if (!vpb.channels[i].current_volume && !volume_delta)
continue; continue;
MixingBuffer* dst_buffer = BufferForID(vpb.channels[i].id); MixingBuffer* dst_buffer = BufferForID(vpb.channels[i].id);
@ -1303,9 +1300,9 @@ void ZeldaAudioRenderer::AddVoice(u16 voice_id)
continue; continue;
} }
s32 new_volume = AddBuffersWithVolumeRamp(*dst_buffer, input_samples, s16 new_volume = AddBuffersWithVolumeRamp(*dst_buffer, input_samples,
vpb.channels[i].current_volume << 16, volume_step); vpb.channels[i].current_volume, volume_delta);
vpb.channels[i].current_volume = new_volume >> 16; vpb.channels[i].current_volume = new_volume;
} }
} }

31
Source/Core/Core/HW/DSPHLE/UCodes/Zelda.h
View File

@ -79,24 +79,33 @@ private:
ApplyVolumeInPlace<N, 4>(buf, vol); ApplyVolumeInPlace<N, 4>(buf, vol);
} }
// Mixes two buffers together while applying a volume to one of them. The // Mixes two buffers together while applying a volume to one of them.
// volume ramps up/down in N steps using the provided step delta value. // We try to match LLE, hence the slightly odd ramping.
// s16 AddBuffersWithVolumeRamp(MixingBuffer& dst, const MixingBuffer& src, s16 start_volume,
// Note: On a real GC, the stepping happens in 32 steps instead. But hey, s16 delta)
// we can do better here with very low risk. Why not? :)
s32 AddBuffersWithVolumeRamp(MixingBuffer& dst, const MixingBuffer& src, s32 vol,
s32 step)
{ {
if (!vol && !step) if (!start_volume && !delta)
return vol; return start_volume;
for (size_t i = 0; i < 0x50; ++i) // The delta is applied in 32 steps over the first 64 samples.
s32 vol = start_volume << 16;
s32 step = delta << (16 - 5);
for (size_t i = 0; i < 0x40;)
{ {
dst[i] += ((vol >> 16) * src[i]) >> 16; dst[i] += ((vol >> 16) * src[i]) >> 16;
++i;
dst[i] += ((vol >> 16) * src[i]) >> 16;
++i;
vol += step; vol += step;
} }
return vol; // The last 16 samples are mixed at the target volume.
for (size_t i = 0x40; i < 0x50; ++i)
{
dst[i] += ((vol >> 16) * src[i]) >> 16;
}
return vol >> 16;
} }
// Does not use std::array because it needs to be able to process partial // Does not use std::array because it needs to be able to process partial