lvella/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

Merge pull request #4671 from lioncash/nfp-copy

Browse source 
command_generator/nfp: Eliminate unnecessary copies
This commit is contained in:
Rodrigo Locatti 2020-09-17 21:19:12 +00:00 committed by GitHub
commit 131532b570
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/audio_core/command_generator.cpp
View file

@ -196,7 +196,7 @@ void CommandGenerator::PreCommand() {
for (std::size_t i = 0; i < splitter_context.GetInfoCount(); i++) { for (std::size_t i = 0; i < splitter_context.GetInfoCount(); i++) {
const auto& base = splitter_context.GetInfo(i); const auto& base = splitter_context.GetInfo(i);
std::string graph = fmt::format("b[{}]", i); std::string graph = fmt::format("b[{}]", i);
auto* head = base.GetHead(); const auto* head = base.GetHead();
while (head != nullptr) { while (head != nullptr) {
graph += fmt::format("->{}", head->GetMixId()); graph += fmt::format("->{}", head->GetMixId());
head = head->GetNextDestination(); head = head->GetNextDestination();
@ -214,7 +214,7 @@ void CommandGenerator::PostCommand() {
void CommandGenerator::GenerateDataSourceCommand(ServerVoiceInfo& voice_info, VoiceState& dsp_state, void CommandGenerator::GenerateDataSourceCommand(ServerVoiceInfo& voice_info, VoiceState& dsp_state,
s32 channel) { s32 channel) {
auto& in_params = voice_info.GetInParams(); const auto& in_params = voice_info.GetInParams();
const auto depop = in_params.should_depop; const auto depop = in_params.should_depop;
if (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) { void CommandGenerator::GenerateAuxCommand(s32 mix_buffer_offset, EffectBase* info, bool enabled) {
auto aux = dynamic_cast<EffectAuxInfo*>(info); auto* aux = dynamic_cast<EffectAuxInfo*>(info);
const auto& params = aux->GetParams(); const auto& params = aux->GetParams();
if (aux->GetSendBuffer() != 0 && aux->GetRecvBuffer() != 0) { if (aux->GetSendBuffer() != 0 && aux->GetRecvBuffer() != 0) {
const auto max_channels = params.count; const auto max_channels = params.count;
@ -571,7 +571,7 @@ void CommandGenerator::GenerateSubMixCommand(ServerMixInfo& mix_info) {
if (dumping_frame) { if (dumping_frame) {
LOG_DEBUG(Audio, "(DSP_TRACE) GenerateSubMixCommand"); 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, GenerateDepopForMixBuffersCommand(in_params.buffer_count, in_params.buffer_offset,
in_params.sample_rate); in_params.sample_rate);
@ -650,7 +650,7 @@ void CommandGenerator::GenerateFinalMixCommand() {
LOG_DEBUG(Audio, "(DSP_TRACE) GenerateFinalMixCommand"); LOG_DEBUG(Audio, "(DSP_TRACE) GenerateFinalMixCommand");
} }
auto& mix_info = mix_context.GetFinalMixInfo(); 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, GenerateDepopForMixBuffersCommand(in_params.buffer_count, in_params.buffer_offset,
in_params.sample_rate); in_params.sample_rate);
@ -674,7 +674,7 @@ void CommandGenerator::GenerateFinalMixCommand() {
s32 CommandGenerator::DecodePcm16(ServerVoiceInfo& voice_info, VoiceState& dsp_state, s32 CommandGenerator::DecodePcm16(ServerVoiceInfo& voice_info, VoiceState& dsp_state,
s32 sample_count, s32 channel, std::size_t mix_offset) { 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]; const auto& wave_buffer = in_params.wave_buffer[dsp_state.wave_buffer_index];
if (wave_buffer.buffer_address == 0) { if (wave_buffer.buffer_address == 0) {
return 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 CommandGenerator::DecodeAdpcm(ServerVoiceInfo& voice_info, VoiceState& dsp_state,
s32 sample_count, s32 channel, std::size_t mix_offset) { 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]; const auto& wave_buffer = in_params.wave_buffer[dsp_state.wave_buffer_index];
if (wave_buffer.buffer_address == 0) { if (wave_buffer.buffer_address == 0) {
return 0; return 0;
@ -766,8 +766,8 @@ s32 CommandGenerator::DecodeAdpcm(ServerVoiceInfo& voice_info, VoiceState& dsp_s
val = std::clamp<s32>(val, -32768, 32767); val = std::clamp<s32>(val, -32768, 32767);
// Advance output feedback. // Advance output feedback.
yn2 = yn1; yn2 = yn1;
yn1 = val; yn1 = static_cast<s16>(val);
return static_cast<s16>(val); return yn1;
}; };
std::size_t buffer_offset{}; std::size_t buffer_offset{};
@ -853,7 +853,7 @@ void CommandGenerator::DecodeFromWaveBuffers(ServerVoiceInfo& voice_info, s32* o
VoiceState& dsp_state, s32 channel, VoiceState& dsp_state, s32 channel,
s32 target_sample_rate, s32 sample_count, s32 target_sample_rate, s32 sample_count,
s32 node_id) { s32 node_id) {
auto& in_params = voice_info.GetInParams(); const auto& in_params = voice_info.GetInParams();
if (dumping_frame) { if (dumping_frame) {
LOG_DEBUG(Audio, LOG_DEBUG(Audio,
"(DSP_TRACE) DecodeFromWaveBuffers, node_id={}, channel={}, " "(DSP_TRACE) DecodeFromWaveBuffers, node_id={}, channel={}, "
@ -867,7 +867,8 @@ void CommandGenerator::DecodeFromWaveBuffers(ServerVoiceInfo& voice_info, s32* o
static_cast<float>(in_params.sample_rate) / static_cast<float>(target_sample_rate) * static_cast<float>(in_params.sample_rate) / static_cast<float>(target_sample_rate) *
static_cast<float>(static_cast<s32>(in_params.pitch * 32768.0f))); static_cast<float>(static_cast<s32>(in_params.pitch * 32768.0f)));
auto* output_base = output; 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<s32>(SCALED_MIX_BUFFER_SIZE - 4ULL)) {
return; return;
} }

23
src/core/hle/service/nfp/nfp.cpp
View file

@ -2,6 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <array>
#include <atomic> #include <atomic>
#include "common/logging/log.h" #include "common/logging/log.h"
@ -72,10 +73,10 @@ private:
std::array<u8, 10> uuid; std::array<u8, 10> uuid;
u8 uuid_length; // TODO(ogniK): Figure out if this is actual the uuid length or does it u8 uuid_length; // TODO(ogniK): Figure out if this is actual the uuid length or does it
// mean something else // mean something else
INSERT_PADDING_BYTES(0x15); std::array<u8, 0x15> padding_1;
u32_le protocol; u32_le protocol;
u32_le tag_type; u32_le tag_type;
INSERT_PADDING_BYTES(0x2c); std::array<u8, 0x2c> padding_2;
}; };
static_assert(sizeof(TagInfo) == 0x54, "TagInfo is an invalid size"); static_assert(sizeof(TagInfo) == 0x54, "TagInfo is an invalid size");
@ -213,13 +214,15 @@ private:
LOG_DEBUG(Service_NFP, "called"); LOG_DEBUG(Service_NFP, "called");
IPC::ResponseBuilder rb{ctx, 2}; IPC::ResponseBuilder rb{ctx, 2};
auto amiibo = nfp_interface.GetAmiiboBuffer(); const auto& amiibo = nfp_interface.GetAmiiboBuffer();
TagInfo tag_info{}; const TagInfo tag_info{
tag_info.uuid = amiibo.uuid; .uuid = amiibo.uuid,
tag_info.uuid_length = static_cast<u8>(tag_info.uuid.size()); .uuid_length = static_cast<u8>(tag_info.uuid.size()),
.padding_1 = {},
tag_info.protocol = 1; // TODO(ogniK): Figure out actual values .protocol = 1, // TODO(ogniK): Figure out actual values
tag_info.tag_type = 2; .tag_type = 2,
.padding_2 = {},
};
ctx.WriteBuffer(tag_info); ctx.WriteBuffer(tag_info);
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
} }
@ -236,7 +239,7 @@ private:
LOG_DEBUG(Service_NFP, "called"); LOG_DEBUG(Service_NFP, "called");
IPC::ResponseBuilder rb{ctx, 2}; IPC::ResponseBuilder rb{ctx, 2};
auto amiibo = nfp_interface.GetAmiiboBuffer(); const auto& amiibo = nfp_interface.GetAmiiboBuffer();
ctx.WriteBuffer(amiibo.model_info); ctx.WriteBuffer(amiibo.model_info);
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
} }