ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 0233286729 into 2c83a256ae

This commit is contained in:
Tilka 2025-01-17 21:22:12 +01:00 committed by GitHub
parent 2c83a256ae 0233286729
commit e37250eda7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1332,24 +1332,23 @@ void ZeldaAudioRenderer::AddVoice(u16 voice_id)
struct struct
{ {
MixingBuffer* buffer; MixingBuffer& buffer;
s16 volume; s16 volume;
s16 volume_delta; s16 volume_delta;
} buffers[8] = { } buffers[8] = {
{&m_buf_front_left, quadrant_volumes[0], volume_deltas[0]}, {m_buf_front_left, quadrant_volumes[0], volume_deltas[0]},
{&m_buf_back_left, quadrant_volumes[1], volume_deltas[1]}, {m_buf_back_left, quadrant_volumes[1], volume_deltas[1]},
{&m_buf_front_right, quadrant_volumes[2], volume_deltas[2]}, {m_buf_front_right, quadrant_volumes[2], volume_deltas[2]},
{&m_buf_back_right, quadrant_volumes[3], volume_deltas[3]}, {m_buf_back_right, quadrant_volumes[3], volume_deltas[3]},
{&m_buf_front_left_reverb, reverb_volumes[0], reverb_volume_deltas[0]}, {m_buf_front_left_reverb, reverb_volumes[0], reverb_volume_deltas[0]},
{&m_buf_back_left_reverb, reverb_volumes[1], reverb_volume_deltas[1]}, {m_buf_back_left_reverb, reverb_volumes[1], reverb_volume_deltas[1]},
{&m_buf_front_right_reverb, reverb_volumes[2], reverb_volume_deltas[2]}, {m_buf_front_right_reverb, reverb_volumes[2], reverb_volume_deltas[2]},
{&m_buf_back_right_reverb, reverb_volumes[3], reverb_volume_deltas[3]}, {m_buf_back_right_reverb, reverb_volumes[3], reverb_volume_deltas[3]},
}; };
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;
@ -1384,13 +1383,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);
@ -1402,9 +1399,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;
} }
} }

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

@ -51,6 +51,8 @@ private:
// See Zelda.cpp for the list of possible flags. // See Zelda.cpp for the list of possible flags.
u32 m_flags; u32 m_flags;
typedef std::array<s16, 0x50> MixingBuffer;
// Utility functions for audio operations. // Utility functions for audio operations.
// Apply volume to a buffer. The volume is a fixed point integer, usually // Apply volume to a buffer. The volume is a fixed point integer, usually
@ -77,25 +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? :)
template <size_t N>
s32 AddBuffersWithVolumeRamp(std::array<s16, N>* dst, const std::array<s16, N>& src, s32 vol,
s32 step)
{ {
if (!vol && !step) if (!start_volume && !delta)
return vol; return start_volume;
for (size_t i = 0; i < N; ++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
@ -120,7 +130,6 @@ private:
u16 m_output_volume = 0; u16 m_output_volume = 0;
// Mixing buffers. // Mixing buffers.
typedef std::array<s16, 0x50> MixingBuffer;
MixingBuffer m_buf_front_left{}; MixingBuffer m_buf_front_left{};
MixingBuffer m_buf_front_right{}; MixingBuffer m_buf_front_right{};
MixingBuffer m_buf_back_left{}; MixingBuffer m_buf_back_left{};