summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGravatar bunnei2019-02-27 11:26:54 -0500
committerGravatar GitHub2019-02-27 11:26:54 -0500
commit42f7c11021482212711df1d99687a380f07ad67a (patch)
treecadc22e865d26233921f2bc68f69795426b10b56 /src/core
parentMerge pull request #2170 from lioncash/emu-window (diff)
parentaudio_core/audio_renderer: Name previously unknown parameters of AudioRendere... (diff)
downloadyuzu-42f7c11021482212711df1d99687a380f07ad67a.tar.gz
yuzu-42f7c11021482212711df1d99687a380f07ad67a.tar.xz
yuzu-42f7c11021482212711df1d99687a380f07ad67a.zip
Merge pull request #2169 from lioncash/naming
audio_core/audio_renderer: Provide names for some parameters of AudioRendererParameter
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/service/audio/audren_u.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp
index 7e0cc64a8..49648394c 100644
--- a/src/core/hle/service/audio/audren_u.cpp
+++ b/src/core/hle/service/audio/audren_u.cpp
@@ -262,20 +262,20 @@ void AudRenU::GetAudioRendererWorkBufferSize(Kernel::HLERequestContext& ctx) {
262 LOG_DEBUG(Service_Audio, "called"); 262 LOG_DEBUG(Service_Audio, "called");
263 263
264 u64 buffer_sz = Common::AlignUp(4 * params.mix_buffer_count, 0x40); 264 u64 buffer_sz = Common::AlignUp(4 * params.mix_buffer_count, 0x40);
265 buffer_sz += params.unknown_c * 1024; 265 buffer_sz += params.submix_count * 1024;
266 buffer_sz += 0x940 * (params.unknown_c + 1); 266 buffer_sz += 0x940 * (params.submix_count + 1);
267 buffer_sz += 0x3F0 * params.voice_count; 267 buffer_sz += 0x3F0 * params.voice_count;
268 buffer_sz += Common::AlignUp(8 * (params.unknown_c + 1), 0x10); 268 buffer_sz += Common::AlignUp(8 * (params.submix_count + 1), 0x10);
269 buffer_sz += Common::AlignUp(8 * params.voice_count, 0x10); 269 buffer_sz += Common::AlignUp(8 * params.voice_count, 0x10);
270 buffer_sz += 270 buffer_sz += Common::AlignUp(
271 Common::AlignUp((0x3C0 * (params.sink_count + params.unknown_c) + 4 * params.sample_count) * 271 (0x3C0 * (params.sink_count + params.submix_count) + 4 * params.sample_count) *
272 (params.mix_buffer_count + 6), 272 (params.mix_buffer_count + 6),
273 0x40); 273 0x40);
274 274
275 if (IsFeatureSupported(AudioFeatures::Splitter, params.revision)) { 275 if (IsFeatureSupported(AudioFeatures::Splitter, params.revision)) {
276 u32 count = params.unknown_c + 1; 276 const u32 count = params.submix_count + 1;
277 u64 node_count = Common::AlignUp(count, 0x40); 277 u64 node_count = Common::AlignUp(count, 0x40);
278 u64 node_state_buffer_sz = 278 const u64 node_state_buffer_sz =
279 4 * (node_count * node_count) + 0xC * node_count + 2 * (node_count / 8); 279 4 * (node_count * node_count) + 0xC * node_count + 2 * (node_count / 8);
280 u64 edge_matrix_buffer_sz = 0; 280 u64 edge_matrix_buffer_sz = 0;
281 node_count = Common::AlignUp(count * count, 0x40); 281 node_count = Common::AlignUp(count * count, 0x40);
@@ -289,19 +289,19 @@ void AudRenU::GetAudioRendererWorkBufferSize(Kernel::HLERequestContext& ctx) {
289 289
290 buffer_sz += 0x20 * (params.effect_count + 4 * params.voice_count) + 0x50; 290 buffer_sz += 0x20 * (params.effect_count + 4 * params.voice_count) + 0x50;
291 if (IsFeatureSupported(AudioFeatures::Splitter, params.revision)) { 291 if (IsFeatureSupported(AudioFeatures::Splitter, params.revision)) {
292 buffer_sz += 0xE0 * params.unknown_2c; 292 buffer_sz += 0xE0 * params.num_splitter_send_channels;
293 buffer_sz += 0x20 * params.splitter_count; 293 buffer_sz += 0x20 * params.splitter_count;
294 buffer_sz += Common::AlignUp(4 * params.unknown_2c, 0x10); 294 buffer_sz += Common::AlignUp(4 * params.num_splitter_send_channels, 0x10);
295 } 295 }
296 buffer_sz = Common::AlignUp(buffer_sz, 0x40) + 0x170 * params.sink_count; 296 buffer_sz = Common::AlignUp(buffer_sz, 0x40) + 0x170 * params.sink_count;
297 u64 output_sz = buffer_sz + 0x280 * params.sink_count + 0x4B0 * params.effect_count + 297 u64 output_sz = buffer_sz + 0x280 * params.sink_count + 0x4B0 * params.effect_count +
298 ((params.voice_count * 256) | 0x40); 298 ((params.voice_count * 256) | 0x40);
299 299
300 if (params.unknown_1c >= 1) { 300 if (params.performance_frame_count >= 1) {
301 output_sz = Common::AlignUp(((16 * params.sink_count + 16 * params.effect_count + 301 output_sz = Common::AlignUp(((16 * params.sink_count + 16 * params.effect_count +
302 16 * params.voice_count + 16) + 302 16 * params.voice_count + 16) +
303 0x658) * 303 0x658) *
304 (params.unknown_1c + 1) + 304 (params.performance_frame_count + 1) +
305 0xc0, 305 0xc0,
306 0x40) + 306 0x40) +
307 output_sz; 307 output_sz;