franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #656 from ogniK5377/audren-mem-init 

Initialized memory for RequestUpdateAudioRenderer and fixed MemoryPoolSection to be more accurate
This commit is contained in:
bunnei 2018-07-12 19:12:47 -07:00 committed by GitHub
parent 64b5e5d5d9 8bd8d1e3da
commit ce23ae3ede
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/hle/service/audio/audren_u.cpp
View File

@ -47,7 +47,7 @@ public:
// Start the audio event // Start the audio event
CoreTiming::ScheduleEvent(audio_ticks, audio_event); CoreTiming::ScheduleEvent(audio_ticks, audio_event);
voice_status_list.reserve(worker_params.voice_count); voice_status_list.resize(worker_params.voice_count);
} }
~IAudioRenderer() { ~IAudioRenderer() {
CoreTiming::UnscheduleEvent(audio_event, 0); CoreTiming::UnscheduleEvent(audio_event, 0);
@ -87,8 +87,6 @@ private:
memory_pool[i].state = MemoryPoolStates::Attached; memory_pool[i].state = MemoryPoolStates::Attached;
else if (mem_pool_info[i].pool_state == MemoryPoolStates::RequestDetach) else if (mem_pool_info[i].pool_state == MemoryPoolStates::RequestDetach)
memory_pool[i].state = MemoryPoolStates::Detached; memory_pool[i].state = MemoryPoolStates::Detached;
else
memory_pool[i].state = mem_pool_info[i].pool_state;
} }
std::memcpy(output.data() + sizeof(UpdateDataHeader), memory_pool.data(), std::memcpy(output.data() + sizeof(UpdateDataHeader), memory_pool.data(),
response_data.memory_pools_size); response_data.memory_pools_size);
@ -183,7 +181,9 @@ private:
behavior_size = 0xb0; behavior_size = 0xb0;
memory_pools_size = (config.effect_count + (config.voice_count * 4)) * 0x10; memory_pools_size = (config.effect_count + (config.voice_count * 4)) * 0x10;
voices_size = config.voice_count * 0x10; voices_size = config.voice_count * 0x10;
voice_resource_size = 0x0;
effects_size = config.effect_count * 0x10; effects_size = config.effect_count * 0x10;
mixes_size = 0x0;
sinks_size = config.sink_count * 0x20; sinks_size = config.sink_count * 0x20;
performance_manager_size = 0x10; performance_manager_size = 0x10;
total_size = sizeof(UpdateDataHeader) + behavior_size + memory_pools_size + total_size = sizeof(UpdateDataHeader) + behavior_size + memory_pools_size +