The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-03 11:32:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

DSPHLE/Zelda: use MixingBuffer type (NFC)

Browse Source
This commit is contained in:
Tillmann Karras 2024-01-14 02:21:53 +00:00
parent 69aca2fbfc
commit 4f5e3674e1
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1233,24 +1233,24 @@ 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 << 16,
(buffer.volume_delta << 16) / (s32)buffer.buffer->size()); (buffer.volume_delta << 16) / (s32)buffer.buffer.size());
} }
vpb.dolby_volume_current = vpb.dolby_volume_target; vpb.dolby_volume_current = vpb.dolby_volume_target;
@ -1303,7 +1303,7 @@ void ZeldaAudioRenderer::AddVoice(u16 voice_id)
continue; continue;
} }
s32 new_volume = AddBuffersWithVolumeRamp(dst_buffer, input_samples, s32 new_volume = AddBuffersWithVolumeRamp(*dst_buffer, input_samples,
vpb.channels[i].current_volume << 16, volume_step); vpb.channels[i].current_volume << 16, volume_step);
vpb.channels[i].current_volume = new_volume >> 16; vpb.channels[i].current_volume = new_volume >> 16;
} }

10
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
@ -82,16 +84,15 @@ private:
// //
// Note: On a real GC, the stepping happens in 32 steps instead. But hey, // Note: On a real GC, the stepping happens in 32 steps instead. But hey,
// we can do better here with very low risk. Why not? :) // we can do better here with very low risk. Why not? :)
template <size_t N> s32 AddBuffersWithVolumeRamp(MixingBuffer& dst, const MixingBuffer& src, s32 vol,
s32 AddBuffersWithVolumeRamp(std::array<s16, N>* dst, const std::array<s16, N>& src, s32 vol,
s32 step) s32 step)
{ {
if (!vol && !step) if (!vol && !step)
return vol; return vol;
for (size_t i = 0; i < N; ++i) for (size_t i = 0; i < 0x50; ++i)
{ {
(*dst)[i] += ((vol >> 16) * src[i]) >> 16; dst[i] += ((vol >> 16) * src[i]) >> 16;
vol += step; vol += step;
} }
@ -120,7 +121,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{};