drifty/emulator
1
0
Fork 0
mirror of https://git.citron-emu.org/citron/emulator synced 2025-12-21 19:43:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'collecting-main-patch-05267' into 'main'

Browse Source 
Audio Stability Fixes

See merge request citron/emulator!51
This commit is contained in:
Zephyron
2025-09-26 15:51:13 +10:00
parent 704c886d3d 97cd9112a1
commit 7acd55a005
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/audio_core/renderer/behavior/info_updater.cpp
View File

@@ -1,6 +1,8 @@
// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
// SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include <algorithm>
#include "audio_core/common/feature_support.h" #include "audio_core/common/feature_support.h"
#include "audio_core/renderer/behavior/behavior_info.h" #include "audio_core/renderer/behavior/behavior_info.h"
#include "audio_core/renderer/behavior/info_updater.h" #include "audio_core/renderer/behavior/info_updater.h"
@@ -101,14 +103,18 @@ Result InfoUpdater::UpdateVoicesInt(VoiceContext& voice_context,
auto& voice_info{voice_context.GetInfo(in_param.id)}; auto& voice_info{voice_context.GetInfo(in_param.id)};
for (u32 channel = 0; channel < in_param.channel_count; channel++) { // FIX: Calculate a safe channel count to prevent out-of-bounds access.
const u32 safe_channel_count = std::min(in_param.channel_count, static_cast<u32>(MaxChannels));
for (u32 channel = 0; channel < safe_channel_count; channel++) {
voice_states[channel] = &voice_context.GetState(in_param.channel_resource_ids[channel]); voice_states[channel] = &voice_context.GetState(in_param.channel_resource_ids[channel]);
} }
if (in_param.is_new) { if (in_param.is_new) {
voice_info.Initialize(); voice_info.Initialize();
for (u32 channel = 0; channel < in_param.channel_count; channel++) { // FIX: Use the same safe channel count for this loop.
for (u32 channel = 0; channel < safe_channel_count; channel++) {
*voice_states[channel] = {}; *voice_states[channel] = {};
} }
} }
@@ -184,14 +190,18 @@ Result InfoUpdater::UpdateVoicesFloat(VoiceContext& voice_context,
auto& voice_info{voice_context.GetInfo(in_param.id)}; auto& voice_info{voice_context.GetInfo(in_param.id)};
for (u32 channel = 0; channel < in_param.channel_count; channel++) { // FIX: Calculate a safe channel count to prevent out-of-bounds access.
const u32 safe_channel_count = std::min(in_param.channel_count, static_cast<u32>(MaxChannels));
for (u32 channel = 0; channel < safe_channel_count; channel++) {
voice_states[channel] = &voice_context.GetState(in_param.channel_resource_ids[channel]); voice_states[channel] = &voice_context.GetState(in_param.channel_resource_ids[channel]);
} }
if (in_param.is_new) { if (in_param.is_new) {
voice_info.Initialize(); voice_info.Initialize();
for (u32 channel = 0; channel < in_param.channel_count; channel++) { // FIX: Use the same safe channel count for this loop.
for (u32 channel = 0; channel < safe_channel_count; channel++) {
*voice_states[channel] = {}; *voice_states[channel] = {};
} }
} }