summaryrefslogtreecommitdiff
path: root/src/audio_core/audio_renderer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/audio_core/audio_renderer.cpp')
-rw-r--r--src/audio_core/audio_renderer.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/audio_core/audio_renderer.cpp b/src/audio_core/audio_renderer.cpp
index a75cd3be5..ed3b7defc 100644
--- a/src/audio_core/audio_renderer.cpp
+++ b/src/audio_core/audio_renderer.cpp
@@ -52,8 +52,8 @@ std::vector<u8> AudioRenderer::UpdateAudioRenderer(const std::vector<u8>& input_
52 memory_pool_count * sizeof(MemoryPoolInfo)); 52 memory_pool_count * sizeof(MemoryPoolInfo));
53 53
54 // Copy VoiceInfo structs 54 // Copy VoiceInfo structs
55 size_t offset{sizeof(UpdateDataHeader) + config.behavior_size + config.memory_pools_size + 55 std::size_t offset{sizeof(UpdateDataHeader) + config.behavior_size + config.memory_pools_size +
56 config.voice_resource_size}; 56 config.voice_resource_size};
57 for (auto& voice : voices) { 57 for (auto& voice : voices) {
58 std::memcpy(&voice.Info(), input_params.data() + offset, sizeof(VoiceInfo)); 58 std::memcpy(&voice.Info(), input_params.data() + offset, sizeof(VoiceInfo));
59 offset += sizeof(VoiceInfo); 59 offset += sizeof(VoiceInfo);
@@ -72,7 +72,7 @@ std::vector<u8> AudioRenderer::UpdateAudioRenderer(const std::vector<u8>& input_
72 72
73 // Update memory pool state 73 // Update memory pool state
74 std::vector<MemoryPoolEntry> memory_pool(memory_pool_count); 74 std::vector<MemoryPoolEntry> memory_pool(memory_pool_count);
75 for (size_t index = 0; index < memory_pool.size(); ++index) { 75 for (std::size_t index = 0; index < memory_pool.size(); ++index) {
76 if (mem_pool_info[index].pool_state == MemoryPoolStates::RequestAttach) { 76 if (mem_pool_info[index].pool_state == MemoryPoolStates::RequestAttach) {
77 memory_pool[index].state = MemoryPoolStates::Attached; 77 memory_pool[index].state = MemoryPoolStates::Attached;
78 } else if (mem_pool_info[index].pool_state == MemoryPoolStates::RequestDetach) { 78 } else if (mem_pool_info[index].pool_state == MemoryPoolStates::RequestDetach) {
@@ -93,7 +93,7 @@ std::vector<u8> AudioRenderer::UpdateAudioRenderer(const std::vector<u8>& input_
93 response_data.memory_pools_size); 93 response_data.memory_pools_size);
94 94
95 // Copy output voice status 95 // Copy output voice status
96 size_t voice_out_status_offset{sizeof(UpdateDataHeader) + response_data.memory_pools_size}; 96 std::size_t voice_out_status_offset{sizeof(UpdateDataHeader) + response_data.memory_pools_size};
97 for (const auto& voice : voices) { 97 for (const auto& voice : voices) {
98 std::memcpy(output_params.data() + voice_out_status_offset, &voice.GetOutStatus(), 98 std::memcpy(output_params.data() + voice_out_status_offset, &voice.GetOutStatus(),
99 sizeof(VoiceOutStatus)); 99 sizeof(VoiceOutStatus));
@@ -103,12 +103,12 @@ std::vector<u8> AudioRenderer::UpdateAudioRenderer(const std::vector<u8>& input_
103 return output_params; 103 return output_params;
104} 104}
105 105
106void AudioRenderer::VoiceState::SetWaveIndex(size_t index) { 106void AudioRenderer::VoiceState::SetWaveIndex(std::size_t index) {
107 wave_index = index & 3; 107 wave_index = index & 3;
108 is_refresh_pending = true; 108 is_refresh_pending = true;
109} 109}
110 110
111std::vector<s16> AudioRenderer::VoiceState::DequeueSamples(size_t sample_count) { 111std::vector<s16> AudioRenderer::VoiceState::DequeueSamples(std::size_t sample_count) {
112 if (!IsPlaying()) { 112 if (!IsPlaying()) {
113 return {}; 113 return {};
114 } 114 }
@@ -117,9 +117,9 @@ std::vector<s16> AudioRenderer::VoiceState::DequeueSamples(size_t sample_count)
117 RefreshBuffer(); 117 RefreshBuffer();
118 } 118 }
119 119
120 const size_t max_size{samples.size() - offset}; 120 const std::size_t max_size{samples.size() - offset};
121 const size_t dequeue_offset{offset}; 121 const std::size_t dequeue_offset{offset};
122 size_t size{sample_count * STREAM_NUM_CHANNELS}; 122 std::size_t size{sample_count * STREAM_NUM_CHANNELS};
123 if (size > max_size) { 123 if (size > max_size) {
124 size = max_size; 124 size = max_size;
125 } 125 }
@@ -184,7 +184,7 @@ void AudioRenderer::VoiceState::RefreshBuffer() {
184 case 1: 184 case 1:
185 // 1 channel is upsampled to 2 channel 185 // 1 channel is upsampled to 2 channel
186 samples.resize(new_samples.size() * 2); 186 samples.resize(new_samples.size() * 2);
187 for (size_t index = 0; index < new_samples.size(); ++index) { 187 for (std::size_t index = 0; index < new_samples.size(); ++index) {
188 samples[index * 2] = new_samples[index]; 188 samples[index * 2] = new_samples[index];
189 samples[index * 2 + 1] = new_samples[index]; 189 samples[index * 2 + 1] = new_samples[index];
190 } 190 }
@@ -210,7 +210,7 @@ static constexpr s16 ClampToS16(s32 value) {
210} 210}
211 211
212void AudioRenderer::QueueMixedBuffer(Buffer::Tag tag) { 212void AudioRenderer::QueueMixedBuffer(Buffer::Tag tag) {
213 constexpr size_t BUFFER_SIZE{512}; 213 constexpr std::size_t BUFFER_SIZE{512};
214 std::vector<s16> buffer(BUFFER_SIZE * stream->GetNumChannels()); 214 std::vector<s16> buffer(BUFFER_SIZE * stream->GetNumChannels());
215 215
216 for (auto& voice : voices) { 216 for (auto& voice : voices) {
@@ -218,7 +218,7 @@ void AudioRenderer::QueueMixedBuffer(Buffer::Tag tag) {
218 continue; 218 continue;
219 } 219 }
220 220
221 size_t offset{}; 221 std::size_t offset{};
222 s64 samples_remaining{BUFFER_SIZE}; 222 s64 samples_remaining{BUFFER_SIZE};
223 while (samples_remaining > 0) { 223 while (samples_remaining > 0) {
224 const std::vector<s16> samples{voice.DequeueSamples(samples_remaining)}; 224 const std::vector<s16> samples{voice.DequeueSamples(samples_remaining)};