prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

audio_renderer: mixing: Fix single-channel mixing and cleanups.

Browse Source
This commit is contained in:
bunnei
2020-02-22 23:35:50 -05:00
committed by FearlessTobi
parent 3177e22dd1
commit 36ddf72f47
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/audio_core/audio_renderer.cpp
View File

@@ -355,6 +355,17 @@ static constexpr s16 ClampToS16(s32 value) {
return static_cast<s16>(std::clamp(value, -32768, 32767));
}
static std::size_t GetMixVolumeIndex(const VoiceInfo& voice_info, std::size_t offset) {
switch (voice_info.channel_count) {
case 1:
return 0;
case 2:
return offset % 2;
default:
UNIMPLEMENTED_MSG("Unimplemented channel_count={}", voice_info.channel_count);
}
}
void AudioRenderer::QueueMixedBuffer(Buffer::Tag tag) {
constexpr std::size_t BUFFER_SIZE{512};
std::vector<s16> buffer(BUFFER_SIZE * stream->GetNumChannels());
@@ -376,15 +387,15 @@ void AudioRenderer::QueueMixedBuffer(Buffer::Tag tag) {
samples_remaining -= samples.size() / stream->GetNumChannels();
// TODO(FearlessTobi): Implement Surround mixing
const auto& mix = channels[voice.GetInfo().id].GetInfo().mix;
const auto& mix_volumes{channels[voice.GetInfo().id].GetInfo().mix_volume};
for (const auto& sample : samples) {
const s32 buffer_sample{buffer[offset]};
// index 0 is for the left ear, 1 is for the right
const float submix = mix[offset % 2];
// Index 0 is for the left channel, 1 is for the right channel
const float mix_volume{mix_volumes[GetMixVolumeIndex(voice.GetInfo(), offset)]};
buffer[offset++] = ClampToS16(
buffer_sample + static_cast<s32>(sample * voice.GetInfo().volume * submix));
buffer_sample + static_cast<s32>(sample * voice.GetInfo().volume * mix_volume));
}
}
}

2
src/audio_core/audio_renderer.h
View File

@@ -150,7 +150,7 @@ static_assert(sizeof(VoiceOutStatus) == 0x10, "VoiceOutStatus has wrong size");
struct ChannelInfoIn {
u32_le id;
std::array<float_le, 24> mix;
std::array<float_le, 24> mix_volume;
bool is_used;
INSERT_PADDING_BYTES(11);
};