summaryrefslogtreecommitdiff
path: root/src/audio_core/info_updater.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/audio_core/info_updater.cpp')
-rw-r--r--src/audio_core/info_updater.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/audio_core/info_updater.cpp b/src/audio_core/info_updater.cpp
index 2940e53a9..d3ac90827 100644
--- a/src/audio_core/info_updater.cpp
+++ b/src/audio_core/info_updater.cpp
@@ -14,9 +14,9 @@
14 14
15namespace AudioCore { 15namespace AudioCore {
16 16
17InfoUpdater::InfoUpdater(const std::vector<u8>& in_params, std::vector<u8>& out_params, 17InfoUpdater::InfoUpdater(const std::vector<u8>& in_params_, std::vector<u8>& out_params_,
18 BehaviorInfo& behavior_info) 18 BehaviorInfo& behavior_info_)
19 : in_params(in_params), out_params(out_params), behavior_info(behavior_info) { 19 : in_params(in_params_), out_params(out_params_), behavior_info(behavior_info_) {
20 ASSERT( 20 ASSERT(
21 AudioCommon::CanConsumeBuffer(in_params.size(), 0, sizeof(AudioCommon::UpdateDataHeader))); 21 AudioCommon::CanConsumeBuffer(in_params.size(), 0, sizeof(AudioCommon::UpdateDataHeader)));
22 std::memcpy(&input_header, in_params.data(), sizeof(AudioCommon::UpdateDataHeader)); 22 std::memcpy(&input_header, in_params.data(), sizeof(AudioCommon::UpdateDataHeader));
@@ -135,8 +135,8 @@ bool InfoUpdater::UpdateVoiceChannelResources(VoiceContext& voice_context) {
135} 135}
136 136
137bool InfoUpdater::UpdateVoices(VoiceContext& voice_context, 137bool InfoUpdater::UpdateVoices(VoiceContext& voice_context,
138 std::vector<ServerMemoryPoolInfo>& memory_pool_info, 138 [[maybe_unused]] std::vector<ServerMemoryPoolInfo>& memory_pool_info,
139 VAddr audio_codec_dsp_addr) { 139 [[maybe_unused]] VAddr audio_codec_dsp_addr) {
140 const auto voice_count = voice_context.GetVoiceCount(); 140 const auto voice_count = voice_context.GetVoiceCount();
141 std::vector<VoiceInfo::InParams> voice_in(voice_count); 141 std::vector<VoiceInfo::InParams> voice_in(voice_count);
142 std::vector<VoiceInfo::OutParams> voice_out(voice_count); 142 std::vector<VoiceInfo::OutParams> voice_out(voice_count);
@@ -165,28 +165,28 @@ bool InfoUpdater::UpdateVoices(VoiceContext& voice_context,
165 165
166 // Update our voices 166 // Update our voices
167 for (std::size_t i = 0; i < voice_count; i++) { 167 for (std::size_t i = 0; i < voice_count; i++) {
168 auto& in_params = voice_in[i]; 168 auto& voice_in_params = voice_in[i];
169 const auto channel_count = static_cast<std::size_t>(in_params.channel_count); 169 const auto channel_count = static_cast<std::size_t>(voice_in_params.channel_count);
170 // Skip if it's not currently in use 170 // Skip if it's not currently in use
171 if (!in_params.is_in_use) { 171 if (!voice_in_params.is_in_use) {
172 continue; 172 continue;
173 } 173 }
174 // Voice states for each channel 174 // Voice states for each channel
175 std::array<VoiceState*, AudioCommon::MAX_CHANNEL_COUNT> voice_states{}; 175 std::array<VoiceState*, AudioCommon::MAX_CHANNEL_COUNT> voice_states{};
176 ASSERT(static_cast<std::size_t>(in_params.id) < voice_count); 176 ASSERT(static_cast<std::size_t>(voice_in_params.id) < voice_count);
177 177
178 // Grab our current voice info 178 // Grab our current voice info
179 auto& voice_info = voice_context.GetInfo(static_cast<std::size_t>(in_params.id)); 179 auto& voice_info = voice_context.GetInfo(static_cast<std::size_t>(voice_in_params.id));
180 180
181 ASSERT(channel_count <= AudioCommon::MAX_CHANNEL_COUNT); 181 ASSERT(channel_count <= AudioCommon::MAX_CHANNEL_COUNT);
182 182
183 // Get all our channel voice states 183 // Get all our channel voice states
184 for (std::size_t channel = 0; channel < channel_count; channel++) { 184 for (std::size_t channel = 0; channel < channel_count; channel++) {
185 voice_states[channel] = 185 voice_states[channel] =
186 &voice_context.GetState(in_params.voice_channel_resource_ids[channel]); 186 &voice_context.GetState(voice_in_params.voice_channel_resource_ids[channel]);
187 } 187 }
188 188
189 if (in_params.is_new) { 189 if (voice_in_params.is_new) {
190 // Default our values for our voice 190 // Default our values for our voice
191 voice_info.Initialize(); 191 voice_info.Initialize();
192 if (channel_count == 0 || channel_count > AudioCommon::MAX_CHANNEL_COUNT) { 192 if (channel_count == 0 || channel_count > AudioCommon::MAX_CHANNEL_COUNT) {
@@ -200,12 +200,12 @@ bool InfoUpdater::UpdateVoices(VoiceContext& voice_context,
200 } 200 }
201 201
202 // Update our voice 202 // Update our voice
203 voice_info.UpdateParameters(in_params, behavior_info); 203 voice_info.UpdateParameters(voice_in_params, behavior_info);
204 // TODO(ogniK): Handle mapping errors with behavior info based on in params response 204 // TODO(ogniK): Handle mapping errors with behavior info based on in params response
205 205
206 // Update our wave buffers 206 // Update our wave buffers
207 voice_info.UpdateWaveBuffers(in_params, voice_states, behavior_info); 207 voice_info.UpdateWaveBuffers(voice_in_params, voice_states, behavior_info);
208 voice_info.WriteOutStatus(voice_out[i], in_params, voice_states); 208 voice_info.WriteOutStatus(voice_out[i], voice_in_params, voice_states);
209 } 209 }
210 210
211 if (!AudioCommon::CanConsumeBuffer(out_params.size(), output_offset, voice_out_size)) { 211 if (!AudioCommon::CanConsumeBuffer(out_params.size(), output_offset, voice_out_size)) {
@@ -445,7 +445,7 @@ bool InfoUpdater::UpdatePerformanceBuffer() {
445 return true; 445 return true;
446} 446}
447 447
448bool InfoUpdater::UpdateErrorInfo(BehaviorInfo& in_behavior_info) { 448bool InfoUpdater::UpdateErrorInfo([[maybe_unused]] BehaviorInfo& in_behavior_info) {
449 const auto total_beahvior_info_out = sizeof(BehaviorInfo::OutParams); 449 const auto total_beahvior_info_out = sizeof(BehaviorInfo::OutParams);
450 450
451 if (!AudioCommon::CanConsumeBuffer(out_params.size(), output_offset, total_beahvior_info_out)) { 451 if (!AudioCommon::CanConsumeBuffer(out_params.size(), output_offset, total_beahvior_info_out)) {