From aca36211463f5551a2212e05dbd9dccf83baaef8 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 17 Sep 2020 13:34:47 -0400 Subject: nfp: Eliminate two unnecessary copies GetAmiiboBuffer() returns by const reference, so we can use a reference instead of taking the returned buffer by value. --- src/core/hle/service/nfp/nfp.cpp | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/core/hle/service/nfp/nfp.cpp b/src/core/hle/service/nfp/nfp.cpp index 5e2d769a4..a0469ffbd 100644 --- a/src/core/hle/service/nfp/nfp.cpp +++ b/src/core/hle/service/nfp/nfp.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include #include "common/logging/log.h" @@ -72,10 +73,10 @@ private: std::array uuid; u8 uuid_length; // TODO(ogniK): Figure out if this is actual the uuid length or does it // mean something else - INSERT_PADDING_BYTES(0x15); + std::array padding_1; u32_le protocol; u32_le tag_type; - INSERT_PADDING_BYTES(0x2c); + std::array padding_2; }; static_assert(sizeof(TagInfo) == 0x54, "TagInfo is an invalid size"); @@ -213,13 +214,15 @@ private: LOG_DEBUG(Service_NFP, "called"); IPC::ResponseBuilder rb{ctx, 2}; - auto amiibo = nfp_interface.GetAmiiboBuffer(); - TagInfo tag_info{}; - tag_info.uuid = amiibo.uuid; - tag_info.uuid_length = static_cast(tag_info.uuid.size()); - - tag_info.protocol = 1; // TODO(ogniK): Figure out actual values - tag_info.tag_type = 2; + const auto& amiibo = nfp_interface.GetAmiiboBuffer(); + const TagInfo tag_info{ + .uuid = amiibo.uuid, + .uuid_length = static_cast(tag_info.uuid.size()), + .padding_1 = {}, + .protocol = 1, // TODO(ogniK): Figure out actual values + .tag_type = 2, + .padding_2 = {}, + }; ctx.WriteBuffer(tag_info); rb.Push(RESULT_SUCCESS); } @@ -236,7 +239,7 @@ private: LOG_DEBUG(Service_NFP, "called"); IPC::ResponseBuilder rb{ctx, 2}; - auto amiibo = nfp_interface.GetAmiiboBuffer(); + const auto& amiibo = nfp_interface.GetAmiiboBuffer(); ctx.WriteBuffer(amiibo.model_info); rb.Push(RESULT_SUCCESS); } -- cgit v1.2.3 From 9539e4d8fd3d4985d524a7a64ec432e4d3bbb2b6 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 17 Sep 2020 13:45:24 -0400 Subject: audio_core/command_generator: Avoid an unnecessary copy in GenerateFinalMixCommand() --- src/audio_core/command_generator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/audio_core/command_generator.cpp b/src/audio_core/command_generator.cpp index 84782cde6..7f65511ff 100644 --- a/src/audio_core/command_generator.cpp +++ b/src/audio_core/command_generator.cpp @@ -650,7 +650,7 @@ void CommandGenerator::GenerateFinalMixCommand() { LOG_DEBUG(Audio, "(DSP_TRACE) GenerateFinalMixCommand"); } auto& mix_info = mix_context.GetFinalMixInfo(); - const auto in_params = mix_info.GetInParams(); + const auto& in_params = mix_info.GetInParams(); GenerateDepopForMixBuffersCommand(in_params.buffer_count, in_params.buffer_offset, in_params.sample_rate); -- cgit v1.2.3 From 362e2940be51803ff1513535eed7f55ac7e51570 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 17 Sep 2020 13:52:32 -0400 Subject: audio_core/command_generator: Use const references where applicable In a lot of cases, we can make use of const references rather than non-const references. While we're in the area we can silence some truncation and sign conversion warnings. --- src/audio_core/command_generator.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/audio_core/command_generator.cpp b/src/audio_core/command_generator.cpp index 7f65511ff..8f7da49e6 100644 --- a/src/audio_core/command_generator.cpp +++ b/src/audio_core/command_generator.cpp @@ -196,7 +196,7 @@ void CommandGenerator::PreCommand() { for (std::size_t i = 0; i < splitter_context.GetInfoCount(); i++) { const auto& base = splitter_context.GetInfo(i); std::string graph = fmt::format("b[{}]", i); - auto* head = base.GetHead(); + const auto* head = base.GetHead(); while (head != nullptr) { graph += fmt::format("->{}", head->GetMixId()); head = head->GetNextDestination(); @@ -214,7 +214,7 @@ void CommandGenerator::PostCommand() { void CommandGenerator::GenerateDataSourceCommand(ServerVoiceInfo& voice_info, VoiceState& dsp_state, s32 channel) { - auto& in_params = voice_info.GetInParams(); + const auto& in_params = voice_info.GetInParams(); const auto depop = in_params.should_depop; if (depop) { @@ -405,7 +405,7 @@ void CommandGenerator::GenerateBiquadFilterEffectCommand(s32 mix_buffer_offset, } void CommandGenerator::GenerateAuxCommand(s32 mix_buffer_offset, EffectBase* info, bool enabled) { - auto aux = dynamic_cast(info); + auto* aux = dynamic_cast(info); const auto& params = aux->GetParams(); if (aux->GetSendBuffer() != 0 && aux->GetRecvBuffer() != 0) { const auto max_channels = params.count; @@ -571,7 +571,7 @@ void CommandGenerator::GenerateSubMixCommand(ServerMixInfo& mix_info) { if (dumping_frame) { LOG_DEBUG(Audio, "(DSP_TRACE) GenerateSubMixCommand"); } - auto& in_params = mix_info.GetInParams(); + const auto& in_params = mix_info.GetInParams(); GenerateDepopForMixBuffersCommand(in_params.buffer_count, in_params.buffer_offset, in_params.sample_rate); @@ -674,7 +674,7 @@ void CommandGenerator::GenerateFinalMixCommand() { s32 CommandGenerator::DecodePcm16(ServerVoiceInfo& voice_info, VoiceState& dsp_state, s32 sample_count, s32 channel, std::size_t mix_offset) { - auto& in_params = voice_info.GetInParams(); + const auto& in_params = voice_info.GetInParams(); const auto& wave_buffer = in_params.wave_buffer[dsp_state.wave_buffer_index]; if (wave_buffer.buffer_address == 0) { return 0; @@ -714,7 +714,7 @@ s32 CommandGenerator::DecodePcm16(ServerVoiceInfo& voice_info, VoiceState& dsp_s s32 CommandGenerator::DecodeAdpcm(ServerVoiceInfo& voice_info, VoiceState& dsp_state, s32 sample_count, s32 channel, std::size_t mix_offset) { - auto& in_params = voice_info.GetInParams(); + const auto& in_params = voice_info.GetInParams(); const auto& wave_buffer = in_params.wave_buffer[dsp_state.wave_buffer_index]; if (wave_buffer.buffer_address == 0) { return 0; @@ -766,8 +766,8 @@ s32 CommandGenerator::DecodeAdpcm(ServerVoiceInfo& voice_info, VoiceState& dsp_s val = std::clamp(val, -32768, 32767); // Advance output feedback. yn2 = yn1; - yn1 = val; - return static_cast(val); + yn1 = static_cast(val); + return yn1; }; std::size_t buffer_offset{}; @@ -853,7 +853,7 @@ void CommandGenerator::DecodeFromWaveBuffers(ServerVoiceInfo& voice_info, s32* o VoiceState& dsp_state, s32 channel, s32 target_sample_rate, s32 sample_count, s32 node_id) { - auto& in_params = voice_info.GetInParams(); + const auto& in_params = voice_info.GetInParams(); if (dumping_frame) { LOG_DEBUG(Audio, "(DSP_TRACE) DecodeFromWaveBuffers, node_id={}, channel={}, " @@ -867,7 +867,8 @@ void CommandGenerator::DecodeFromWaveBuffers(ServerVoiceInfo& voice_info, s32* o static_cast(in_params.sample_rate) / static_cast(target_sample_rate) * static_cast(static_cast(in_params.pitch * 32768.0f))); auto* output_base = output; - if ((dsp_state.fraction + sample_count * resample_rate) > (SCALED_MIX_BUFFER_SIZE - 4ULL)) { + if (dsp_state.fraction + sample_count * resample_rate > + static_cast(SCALED_MIX_BUFFER_SIZE - 4ULL)) { return; } -- cgit v1.2.3