pacnpal/citron
1
0
Fork 0
mirror of https://git.eden-emu.dev/archive/citron synced 2026-04-13 08:10:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

audio/am: Improve audio effect versioning

Browse Source 
Signed-off-by: Collecting <collecting@noreply.localhost>
This commit is contained in:
Collecting
2026-01-14 02:42:44 +00:00
parent 3f1eff1d34
commit b10dcde92b
1 changed files with 2 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/audio_core/renderer/effect/biquad_filter.cpp
View File

@@ -10,12 +10,10 @@ void BiquadFilterInfo::Update(BehaviorInfo::ErrorInfo& error_info,
const InParameterVersion1& in_params, const PoolMapper& pool_mapper) { const InParameterVersion1& in_params, const PoolMapper& pool_mapper) {
auto in_specific{reinterpret_cast<const ParameterVersion1*>(in_params.specific.data())}; auto in_specific{reinterpret_cast<const ParameterVersion1*>(in_params.specific.data())};
auto params{reinterpret_cast<ParameterVersion1*>(parameter.data())}; auto params{reinterpret_cast<ParameterVersion1*>(parameter.data())};
std::memcpy(params, in_specific, sizeof(ParameterVersion1)); std::memcpy(params, in_specific, sizeof(ParameterVersion1));
mix_id = in_params.mix_id; mix_id = in_params.mix_id;
process_order = in_params.process_order; process_order = in_params.process_order;
enabled = in_params.enabled; enabled = in_params.enabled;
error_info.error_code = ResultSuccess; error_info.error_code = ResultSuccess;
error_info.address = CpuAddr(0); error_info.address = CpuAddr(0);
} }
@@ -24,12 +22,10 @@ void BiquadFilterInfo::Update(BehaviorInfo::ErrorInfo& error_info,
const InParameterVersion2& in_params, const PoolMapper& pool_mapper) { const InParameterVersion2& in_params, const PoolMapper& pool_mapper) {
auto in_specific{reinterpret_cast<const ParameterVersion2*>(in_params.specific.data())}; auto in_specific{reinterpret_cast<const ParameterVersion2*>(in_params.specific.data())};
auto params{reinterpret_cast<ParameterVersion2*>(parameter.data())}; auto params{reinterpret_cast<ParameterVersion2*>(parameter.data())};
std::memcpy(params, in_specific, sizeof(ParameterVersion2)); std::memcpy(params, in_specific, sizeof(ParameterVersion2));
mix_id = in_params.mix_id; mix_id = in_params.mix_id;
process_order = in_params.process_order; process_order = in_params.process_order;
enabled = in_params.enabled; enabled = in_params.enabled;
error_info.error_code = ResultSuccess; error_info.error_code = ResultSuccess;
error_info.address = CpuAddr(0); error_info.address = CpuAddr(0);
} }
@@ -40,34 +36,10 @@ void BiquadFilterInfo::UpdateForCommandGeneration() {
} else { } else {
usage_state = UsageState::Disabled; usage_state = UsageState::Disabled;
} }
// State update is moved to Generator to handle version-specific offsets.
// Determine which version structure is being used
// Version 1: state at offset 0x17, structure size ~24 bytes
// Version 2: state at offset 0x25, structure size ~40 bytes
auto params_v1{reinterpret_cast<ParameterVersion1*>(parameter.data())};
auto params_v2{reinterpret_cast<ParameterVersion2*>(parameter.data())};
// Check which state location contains a valid ParameterState value (0-2)
// Valid states: Initialized (0), Updating (1), Updated (2)
const auto state_v1_raw = *reinterpret_cast<const u8*>(&params_v1->state);
const auto state_v2_raw = *reinterpret_cast<const u8*>(&params_v2->state);
if (state_v1_raw <= 2) {
// Version 1 location has valid state, update there
params_v1->state = ParameterState::Updated;
} else if (state_v2_raw <= 2) {
// Version 2 location has valid state, update there
params_v2->state = ParameterState::Updated;
} else {
// Neither looks valid, update both (one will be wrong but command generator handles it)
params_v1->state = ParameterState::Updated;
params_v2->state = ParameterState::Updated;
}
} }
void BiquadFilterInfo::InitializeResultState(EffectResultState& result_state) {} void BiquadFilterInfo::InitializeResultState(EffectResultState& result_state) {}
void BiquadFilterInfo::UpdateResultState(EffectResultState& cpu_state, EffectResultState& dsp_state) {}
void BiquadFilterInfo::UpdateResultState(EffectResultState& cpu_state,
EffectResultState& dsp_state) {}
} // namespace AudioCore::Renderer } // namespace AudioCore::Renderer