diff --git a/src/audio_core/renderer/behavior/info_updater.cpp b/src/audio_core/renderer/behavior/info_updater.cpp index 39bbc91ded..498675879b 100644 --- a/src/audio_core/renderer/behavior/info_updater.cpp +++ b/src/audio_core/renderer/behavior/info_updater.cpp @@ -616,12 +616,11 @@ Result InfoUpdater::UpdateErrorInfo(const BehaviorInfo& behaviour_) { } Result InfoUpdater::UpdateSplitterInfo(SplitterContext& splitter_context) { - u32 consumed_size{0}; - if (!splitter_context.Update(input, consumed_size)) { + if (!splitter_context.Update(input)) { return Service::Audio::ResultInvalidUpdateInfo; } - input += consumed_size; + input += in_header->splitter_size; return ResultSuccess; } diff --git a/src/audio_core/renderer/behavior/info_updater.h b/src/audio_core/renderer/behavior/info_updater.h index 4f27a817e2..f77fceb4d5 100644 --- a/src/audio_core/renderer/behavior/info_updater.h +++ b/src/audio_core/renderer/behavior/info_updater.h @@ -35,7 +35,7 @@ class InfoUpdater { /* 0x18 */ u32 mix_size{}; /* 0x1C */ u32 sinks_size{}; /* 0x20 */ u32 performance_buffer_size{}; - /* 0x24 */ char unk24[4]; + /* 0x24 */ u32 splitter_size{}; /* 0x28 */ u32 render_info_size{}; /* 0x2C */ char unk2C[0x10]; /* 0x3C */ u32 size{sizeof(UpdateDataHeader)}; diff --git a/src/audio_core/renderer/splitter/splitter_context.cpp b/src/audio_core/renderer/splitter/splitter_context.cpp index 1ba5daebe9..37aeae4a82 100644 --- a/src/audio_core/renderer/splitter/splitter_context.cpp +++ b/src/audio_core/renderer/splitter/splitter_context.cpp @@ -93,16 +93,14 @@ bool SplitterContext::Initialize(const BehaviorInfo& behavior, return true; } -bool SplitterContext::Update(const u8* input, u32& consumed_size) { +bool SplitterContext::Update(const u8* input) { auto in_params{reinterpret_cast(input)}; if (destinations_count == 0 || info_count == 0) { - consumed_size = 0; return true; } if (in_params->magic != GetSplitterInParamHeaderMagic()) { - consumed_size = 0; return false; } @@ -113,8 +111,6 @@ bool SplitterContext::Update(const u8* input, u32& consumed_size) { u32 offset{sizeof(InParameterHeader)}; offset = UpdateInfo(input, offset, in_params->info_count); offset = UpdateData(input, offset, in_params->destination_count); - - consumed_size = Common::AlignUp(offset, 0x10); return true; } diff --git a/src/audio_core/renderer/splitter/splitter_context.h b/src/audio_core/renderer/splitter/splitter_context.h index c71ce3d7c4..ecf28794a7 100644 --- a/src/audio_core/renderer/splitter/splitter_context.h +++ b/src/audio_core/renderer/splitter/splitter_context.h @@ -104,9 +104,8 @@ public: * * @param input - Input buffer with the new info, * expected to point to a InParameterHeader. - * @param consumed_size - Output with the number of bytes consumed from input. */ - bool Update(const u8* input, u32& consumed_size); + bool Update(const u8* input); /** * Update the splitters.