diff options
Diffstat (limited to 'src/audio_core/renderer')
22 files changed, 84 insertions, 82 deletions
diff --git a/src/audio_core/renderer/adsp/audio_renderer.cpp b/src/audio_core/renderer/adsp/audio_renderer.cpp index 78c15629b..42b4b167a 100644 --- a/src/audio_core/renderer/adsp/audio_renderer.cpp +++ b/src/audio_core/renderer/adsp/audio_renderer.cpp @@ -135,7 +135,7 @@ void AudioRenderer::ThreadFunc() { static constexpr char name[]{"AudioRenderer"}; MicroProfileOnThreadCreate(name); Common::SetCurrentThreadName(name); - Common::SetCurrentThreadPriority(Common::ThreadPriority::Critical); + Common::SetCurrentThreadPriority(Common::ThreadPriority::High); if (mailbox->ADSPWaitMessage() != RenderMessage::AudioRenderer_InitializeOK) { LOG_ERROR(Service_Audio, "ADSP Audio Renderer -- Failed to receive initialize message from host!"); @@ -165,7 +165,7 @@ void AudioRenderer::ThreadFunc() { // Check this buffer is valid, as it may not be used. if (command_buffer.buffer != 0) { // If there are no remaining commands (from the previous list), - // this is a new command list, initalize it. + // this is a new command list, initialize it. if (command_buffer.remaining_command_count == 0) { command_list_processor.Initialize(system, command_buffer.buffer, command_buffer.size, streams[index]); diff --git a/src/audio_core/renderer/audio_renderer.cpp b/src/audio_core/renderer/audio_renderer.cpp index 51aa17599..a8257eb2e 100644 --- a/src/audio_core/renderer/audio_renderer.cpp +++ b/src/audio_core/renderer/audio_renderer.cpp @@ -22,7 +22,7 @@ Result Renderer::Initialize(const AudioRendererParameterInternal& params, if (!manager.AddSystem(system)) { LOG_ERROR(Service_Audio, "Both Audio Render sessions are in use, cannot create any more"); - return Service::Audio::ERR_MAXIMUM_SESSIONS_REACHED; + return Service::Audio::ResultOutOfSessions; } system_registered = true; } diff --git a/src/audio_core/renderer/behavior/behavior_info.h b/src/audio_core/renderer/behavior/behavior_info.h index 15c948344..b52340229 100644 --- a/src/audio_core/renderer/behavior/behavior_info.h +++ b/src/audio_core/renderer/behavior/behavior_info.h @@ -155,7 +155,7 @@ public: /** * Check if a variadic command buffer is supported. * As of Rev 5 with the added optional performance metric logging, the command - * buffer can be a variable size, so take that into account for calcualting its size. + * buffer can be a variable size, so take that into account for calculating its size. * * @return True if supported, otherwise false. */ diff --git a/src/audio_core/renderer/behavior/info_updater.cpp b/src/audio_core/renderer/behavior/info_updater.cpp index 574cf0982..e312eb166 100644 --- a/src/audio_core/renderer/behavior/info_updater.cpp +++ b/src/audio_core/renderer/behavior/info_updater.cpp @@ -48,7 +48,7 @@ Result InfoUpdater::UpdateVoiceChannelResources(VoiceContext& voice_context) { LOG_ERROR(Service_Audio, "Consumed an incorrect voice resource size, header size={}, consumed={}", in_header->voice_resources_size, consumed_input_size); - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } input += consumed_input_size; @@ -123,7 +123,7 @@ Result InfoUpdater::UpdateVoices(VoiceContext& voice_context, if (consumed_input_size != in_header->voices_size) { LOG_ERROR(Service_Audio, "Consumed an incorrect voices size, header size={}, consumed={}", in_header->voices_size, consumed_input_size); - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } out_header->voices_size = consumed_output_size; @@ -184,7 +184,7 @@ Result InfoUpdater::UpdateEffectsVersion1(EffectContext& effect_context, const b if (consumed_input_size != in_header->effects_size) { LOG_ERROR(Service_Audio, "Consumed an incorrect effects size, header size={}, consumed={}", in_header->effects_size, consumed_input_size); - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } out_header->effects_size = consumed_output_size; @@ -239,7 +239,7 @@ Result InfoUpdater::UpdateEffectsVersion2(EffectContext& effect_context, const b if (consumed_input_size != in_header->effects_size) { LOG_ERROR(Service_Audio, "Consumed an incorrect effects size, header size={}, consumed={}", in_header->effects_size, consumed_input_size); - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } out_header->effects_size = consumed_output_size; @@ -267,7 +267,7 @@ Result InfoUpdater::UpdateMixes(MixContext& mix_context, const u32 mix_buffer_co } if (mix_buffer_count == 0) { - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } std::span<const MixInfo::InParameter> in_params{ @@ -281,13 +281,13 @@ Result InfoUpdater::UpdateMixes(MixContext& mix_context, const u32 mix_buffer_co total_buffer_count += params.buffer_count; if (params.dest_mix_id > static_cast<s32>(mix_context.GetCount()) && params.dest_mix_id != UnusedMixId && params.mix_id != FinalMixId) { - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } } } if (total_buffer_count > mix_buffer_count) { - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } bool mix_dirty{false}; @@ -317,7 +317,7 @@ Result InfoUpdater::UpdateMixes(MixContext& mix_context, const u32 mix_buffer_co if (mix_dirty) { if (behaviour.IsSplitterSupported() && splitter_context.UsingSplitter()) { if (!mix_context.TSortInfo(splitter_context)) { - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } } else { mix_context.SortInfo(); @@ -327,7 +327,7 @@ Result InfoUpdater::UpdateMixes(MixContext& mix_context, const u32 mix_buffer_co if (consumed_input_size != in_header->mix_size) { LOG_ERROR(Service_Audio, "Consumed an incorrect mixes size, header size={}, consumed={}", in_header->mix_size, consumed_input_size); - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } input += mix_count * sizeof(MixInfo::InParameter); @@ -384,7 +384,7 @@ Result InfoUpdater::UpdateSinks(SinkContext& sink_context, std::span<MemoryPoolI if (consumed_input_size != in_header->sinks_size) { LOG_ERROR(Service_Audio, "Consumed an incorrect sinks size, header size={}, consumed={}", in_header->sinks_size, consumed_input_size); - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } input += consumed_input_size; @@ -411,7 +411,7 @@ Result InfoUpdater::UpdateMemoryPools(std::span<MemoryPoolInfo> memory_pools, state != MemoryPoolInfo::ResultState::MapFailed && state != MemoryPoolInfo::ResultState::InUse) { LOG_WARNING(Service_Audio, "Invalid ResultState from updating memory pools"); - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } } @@ -423,7 +423,7 @@ Result InfoUpdater::UpdateMemoryPools(std::span<MemoryPoolInfo> memory_pools, LOG_ERROR(Service_Audio, "Consumed an incorrect memory pool size, header size={}, consumed={}", in_header->memory_pool_size, consumed_input_size); - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } input += consumed_input_size; @@ -453,7 +453,7 @@ Result InfoUpdater::UpdatePerformanceBuffer(std::span<u8> performance_output, LOG_ERROR(Service_Audio, "Consumed an incorrect performance size, header size={}, consumed={}", in_header->performance_buffer_size, consumed_input_size); - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } input += consumed_input_size; @@ -467,18 +467,18 @@ Result InfoUpdater::UpdateBehaviorInfo(BehaviorInfo& behaviour_) { const auto in_params{reinterpret_cast<const BehaviorInfo::InParameter*>(input)}; if (!CheckValidRevision(in_params->revision)) { - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } if (in_params->revision != behaviour_.GetUserRevision()) { - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } behaviour_.ClearError(); behaviour_.UpdateFlags(in_params->flags); if (in_header->behaviour_size != sizeof(BehaviorInfo::InParameter)) { - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } input += sizeof(BehaviorInfo::InParameter); @@ -500,7 +500,7 @@ Result InfoUpdater::UpdateErrorInfo(const BehaviorInfo& behaviour_) { Result InfoUpdater::UpdateSplitterInfo(SplitterContext& splitter_context) { u32 consumed_size{0}; if (!splitter_context.Update(input, consumed_size)) { - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } input += consumed_size; @@ -529,9 +529,9 @@ Result InfoUpdater::UpdateRendererInfo(const u64 elapsed_frames) { Result InfoUpdater::CheckConsumedSize() { if (CpuAddr(input) - CpuAddr(input_origin.data()) != expected_input_size) { - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } else if (CpuAddr(output) - CpuAddr(output_origin.data()) != expected_output_size) { - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } return ResultSuccess; } diff --git a/src/audio_core/renderer/command/effect/reverb.cpp b/src/audio_core/renderer/command/effect/reverb.cpp index 6fe844ff0..8b9b65214 100644 --- a/src/audio_core/renderer/command/effect/reverb.cpp +++ b/src/audio_core/renderer/command/effect/reverb.cpp @@ -308,7 +308,8 @@ static void ApplyReverbEffect(const ReverbInfo::ParameterVersion2& params, Rever } Common::FixedPoint<50, 14> pre_delay_sample{ - state.pre_delay_line.Read() * Common::FixedPoint<50, 14>::from_base(params.late_gain)}; + state.pre_delay_line.TapOut(state.pre_delay_time) * + Common::FixedPoint<50, 14>::from_base(params.late_gain)}; std::array<Common::FixedPoint<50, 14>, ReverbInfo::MaxDelayLines> mix_matrix{ state.prev_feedback_output[2] + state.prev_feedback_output[1] + pre_delay_sample, diff --git a/src/audio_core/renderer/effect/effect_info_base.h b/src/audio_core/renderer/effect/effect_info_base.h index 8525fde05..dbdccf278 100644 --- a/src/audio_core/renderer/effect/effect_info_base.h +++ b/src/audio_core/renderer/effect/effect_info_base.h @@ -192,7 +192,7 @@ public: /** * Get this effect's parameter data. * - * @return Pointer to the parametter, must be cast to the correct type. + * @return Pointer to the parameter, must be cast to the correct type. */ u8* GetParameter() { return parameter.data(); @@ -201,7 +201,7 @@ public: /** * Get this effect's parameter data. * - * @return Pointer to the parametter, must be cast to the correct type. + * @return Pointer to the parameter, must be cast to the correct type. */ u8* GetStateBuffer() { return state.data(); diff --git a/src/audio_core/renderer/effect/i3dl2.h b/src/audio_core/renderer/effect/i3dl2.h index 1ebbc5c4c..6e3ffd1d4 100644 --- a/src/audio_core/renderer/effect/i3dl2.h +++ b/src/audio_core/renderer/effect/i3dl2.h @@ -104,7 +104,8 @@ public: } void Write(const Common::FixedPoint<50, 14> sample) { - *(input++) = sample; + *input = sample; + input++; if (input >= buffer_end) { input = buffer.data(); } diff --git a/src/audio_core/renderer/effect/reverb.h b/src/audio_core/renderer/effect/reverb.h index a72475c3c..6cc345ef6 100644 --- a/src/audio_core/renderer/effect/reverb.h +++ b/src/audio_core/renderer/effect/reverb.h @@ -79,12 +79,10 @@ public: return; } sample_count = delay_time; - input = &buffer[(output - buffer.data() + sample_count) % (sample_count_max + 1)]; + input = &buffer[0]; } Common::FixedPoint<50, 14> Tick(const Common::FixedPoint<50, 14> sample) { - Write(sample); - auto out_sample{Read()}; output++; @@ -92,6 +90,7 @@ public: output = buffer.data(); } + Write(sample); return out_sample; } @@ -100,7 +99,8 @@ public: } void Write(const Common::FixedPoint<50, 14> sample) { - *(input++) = sample; + *input = sample; + input++; if (input >= buffer_end) { input = buffer.data(); } diff --git a/src/audio_core/renderer/memory/memory_pool_info.h b/src/audio_core/renderer/memory/memory_pool_info.h index 537a466ec..80c571bc1 100644 --- a/src/audio_core/renderer/memory/memory_pool_info.h +++ b/src/audio_core/renderer/memory/memory_pool_info.h @@ -29,7 +29,7 @@ public: */ enum class State { Invalid, - Aquired, + Acquired, RequestDetach, Detached, RequestAttach, diff --git a/src/audio_core/renderer/memory/pool_mapper.cpp b/src/audio_core/renderer/memory/pool_mapper.cpp index 2baf2ce08..7fd2b5f47 100644 --- a/src/audio_core/renderer/memory/pool_mapper.cpp +++ b/src/audio_core/renderer/memory/pool_mapper.cpp @@ -92,7 +92,7 @@ bool PoolMapper::TryAttachBuffer(BehaviorInfo::ErrorInfo& error_info, AddressInf address_info.Setup(address, size); if (!FillDspAddr(address_info)) { - error_info.error_code = Service::Audio::ERR_POOL_MAPPING_FAILED; + error_info.error_code = Service::Audio::ResultInvalidAddressInfo; error_info.address = address; return force_map; } diff --git a/src/audio_core/renderer/mix/mix_context.h b/src/audio_core/renderer/mix/mix_context.h index da3aa2829..bcd9637da 100644 --- a/src/audio_core/renderer/mix/mix_context.h +++ b/src/audio_core/renderer/mix/mix_context.h @@ -93,7 +93,7 @@ public: * Splitter sort, traverse the splitter node graph and sort the sorted mixes from results. * * @param splitter_context - Splitter context for the sort. - * @return True if the sort was successful, othewise false. + * @return True if the sort was successful, otherwise false. */ bool TSortInfo(const SplitterContext& splitter_context); diff --git a/src/audio_core/renderer/performance/performance_detail.h b/src/audio_core/renderer/performance/performance_detail.h index 3a4897e60..f603b9026 100644 --- a/src/audio_core/renderer/performance/performance_detail.h +++ b/src/audio_core/renderer/performance/performance_detail.h @@ -33,7 +33,7 @@ struct PerformanceDetailVersion1 { /* 0x0D */ PerformanceEntryType entry_type; }; static_assert(sizeof(PerformanceDetailVersion1) == 0x10, - "PerformanceDetailVersion1 has the worng size!"); + "PerformanceDetailVersion1 has the wrong size!"); struct PerformanceDetailVersion2 { /* 0x00 */ u32 node_id; @@ -45,6 +45,6 @@ struct PerformanceDetailVersion2 { /* 0x14 */ char unk14[0x4]; }; static_assert(sizeof(PerformanceDetailVersion2) == 0x18, - "PerformanceDetailVersion2 has the worng size!"); + "PerformanceDetailVersion2 has the wrong size!"); } // namespace AudioCore::AudioRenderer diff --git a/src/audio_core/renderer/performance/performance_entry.h b/src/audio_core/renderer/performance/performance_entry.h index d1b21406b..d6b1158db 100644 --- a/src/audio_core/renderer/performance/performance_entry.h +++ b/src/audio_core/renderer/performance/performance_entry.h @@ -22,7 +22,7 @@ struct PerformanceEntryVersion1 { /* 0x0C */ PerformanceEntryType entry_type; }; static_assert(sizeof(PerformanceEntryVersion1) == 0x10, - "PerformanceEntryVersion1 has the worng size!"); + "PerformanceEntryVersion1 has the wrong size!"); struct PerformanceEntryVersion2 { /* 0x00 */ u32 node_id; @@ -32,6 +32,6 @@ struct PerformanceEntryVersion2 { /* 0x0D */ char unk0D[0xB]; }; static_assert(sizeof(PerformanceEntryVersion2) == 0x18, - "PerformanceEntryVersion2 has the worng size!"); + "PerformanceEntryVersion2 has the wrong size!"); } // namespace AudioCore::AudioRenderer diff --git a/src/audio_core/renderer/performance/performance_frame_header.h b/src/audio_core/renderer/performance/performance_frame_header.h index 707cc0afb..b1848284e 100644 --- a/src/audio_core/renderer/performance/performance_frame_header.h +++ b/src/audio_core/renderer/performance/performance_frame_header.h @@ -16,7 +16,7 @@ struct PerformanceFrameHeaderVersion1 { /* 0x14 */ u32 frame_index; }; static_assert(sizeof(PerformanceFrameHeaderVersion1) == 0x18, - "PerformanceFrameHeaderVersion1 has the worng size!"); + "PerformanceFrameHeaderVersion1 has the wrong size!"); struct PerformanceFrameHeaderVersion2 { /* 0x00 */ u32 magic; // "PERF" @@ -31,6 +31,6 @@ struct PerformanceFrameHeaderVersion2 { /* 0x25 */ char unk25[0xB]; }; static_assert(sizeof(PerformanceFrameHeaderVersion2) == 0x30, - "PerformanceFrameHeaderVersion2 has the worng size!"); + "PerformanceFrameHeaderVersion2 has the wrong size!"); } // namespace AudioCore::AudioRenderer diff --git a/src/audio_core/renderer/splitter/splitter_context.h b/src/audio_core/renderer/splitter/splitter_context.h index cfd092b4f..1a63db1d3 100644 --- a/src/audio_core/renderer/splitter/splitter_context.h +++ b/src/audio_core/renderer/splitter/splitter_context.h @@ -55,7 +55,7 @@ public: /** * Get the total number of splitter destinations. * - * @return Number of destiantions. + * @return Number of destinations. */ u32 GetDataCount() const; diff --git a/src/audio_core/renderer/splitter/splitter_destinations_data.h b/src/audio_core/renderer/splitter/splitter_destinations_data.h index bd3d55748..d55ce0ad3 100644 --- a/src/audio_core/renderer/splitter/splitter_destinations_data.h +++ b/src/audio_core/renderer/splitter/splitter_destinations_data.h @@ -87,7 +87,7 @@ public: /** * Update this destination. * - * @param params - Inpout parameters to update the destination. + * @param params - Input parameters to update the destination. */ void Update(const InParameter& params); @@ -126,9 +126,9 @@ private: std::array<f32, MaxMixBuffers> prev_mix_volumes{0.0f}; /// Next destination in the mix chain SplitterDestinationData* next{}; - /// Is this destiantion in use? + /// Is this destination in use? bool in_use{}; - /// Does this destiantion need its volumes updated? + /// Does this destination need its volumes updated? bool need_update{}; }; diff --git a/src/audio_core/renderer/splitter/splitter_info.h b/src/audio_core/renderer/splitter/splitter_info.h index d1d75064c..b0ad01fe0 100644 --- a/src/audio_core/renderer/splitter/splitter_info.h +++ b/src/audio_core/renderer/splitter/splitter_info.h @@ -49,14 +49,14 @@ public: /** * Get the number of destinations in this splitter. * - * @return The number of destiantions. + * @return The number of destinations. */ u32 GetDestinationCount() const; /** * Set the number of destinations in this splitter. * - * @param count - The new number of destiantions. + * @param count - The new number of destinations. */ void SetDestinationCount(u32 count); diff --git a/src/audio_core/renderer/system.cpp b/src/audio_core/renderer/system.cpp index 31cbee282..28f063641 100644 --- a/src/audio_core/renderer/system.cpp +++ b/src/audio_core/renderer/system.cpp @@ -101,15 +101,15 @@ Result System::Initialize(const AudioRendererParameterInternal& params, Kernel::KTransferMemory* transfer_memory, u64 transfer_memory_size, u32 process_handle_, u64 applet_resource_user_id_, s32 session_id_) { if (!CheckValidRevision(params.revision)) { - return Service::Audio::ERR_INVALID_REVISION; + return Service::Audio::ResultInvalidRevision; } if (GetWorkBufferSize(params) > transfer_memory_size) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } if (process_handle_ == 0) { - return Service::Audio::ERR_INVALID_PROCESS_HANDLE; + return Service::Audio::ResultInvalidHandle; } behavior.SetUserLibRevision(params.revision); @@ -143,19 +143,19 @@ Result System::Initialize(const AudioRendererParameterInternal& params, samples_workbuffer = allocator.Allocate<s32>((voice_channels + mix_buffer_count) * sample_count, 0x10); if (samples_workbuffer.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } auto upsampler_workbuffer{allocator.Allocate<s32>( (voice_channels + mix_buffer_count) * TargetSampleCount * upsampler_count, 0x10)}; if (upsampler_workbuffer.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } depop_buffer = allocator.Allocate<s32>(Common::AlignUp(static_cast<u32>(mix_buffer_count), 0x40), 0x40); if (depop_buffer.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } // invalidate samples_workbuffer DSP cache @@ -166,12 +166,12 @@ Result System::Initialize(const AudioRendererParameterInternal& params, } if (voice_infos.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } auto sorted_voice_infos{allocator.Allocate<VoiceInfo*>(params.voices, 0x10)}; if (sorted_voice_infos.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } std::memset(sorted_voice_infos.data(), 0, sorted_voice_infos.size_bytes()); @@ -183,12 +183,12 @@ Result System::Initialize(const AudioRendererParameterInternal& params, } if (voice_channel_resources.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } auto voice_cpu_states{allocator.Allocate<VoiceState>(params.voices, 0x10)}; if (voice_cpu_states.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } for (auto& voice_state : voice_cpu_states) { @@ -198,7 +198,7 @@ Result System::Initialize(const AudioRendererParameterInternal& params, auto mix_infos{allocator.Allocate<MixInfo>(params.sub_mixes + 1, 0x10)}; if (mix_infos.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } u32 effect_process_order_count{0}; @@ -208,7 +208,7 @@ Result System::Initialize(const AudioRendererParameterInternal& params, effect_process_order_count = params.effects * (params.sub_mixes + 1); effect_process_order_buffer = allocator.Allocate<s32>(effect_process_order_count, 0x10); if (effect_process_order_buffer.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } } @@ -222,7 +222,7 @@ Result System::Initialize(const AudioRendererParameterInternal& params, auto sorted_mix_infos{allocator.Allocate<MixInfo*>(params.sub_mixes + 1, 0x10)}; if (sorted_mix_infos.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } std::memset(sorted_mix_infos.data(), 0, sorted_mix_infos.size_bytes()); @@ -235,7 +235,7 @@ Result System::Initialize(const AudioRendererParameterInternal& params, auto edge_matrix_workbuffer{allocator.Allocate<u8>(edge_matrix_size, 1)}; if (node_states_workbuffer.empty() || edge_matrix_workbuffer.size() == 0) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } mix_context.Initialize(sorted_mix_infos, mix_infos, params.sub_mixes + 1, @@ -250,7 +250,7 @@ Result System::Initialize(const AudioRendererParameterInternal& params, upsampler_manager = allocator.Allocate<UpsamplerManager>(1, 0x10).data(); if (upsampler_manager == nullptr) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } memory_pool_workbuffer = allocator.Allocate<MemoryPoolInfo>(memory_pool_count, 0x10); @@ -259,18 +259,18 @@ Result System::Initialize(const AudioRendererParameterInternal& params, } if (memory_pool_workbuffer.empty() && memory_pool_count > 0) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } if (!splitter_context.Initialize(behavior, params, allocator)) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } std::span<EffectResultState> effect_result_states_cpu{}; if (behavior.IsEffectInfoVersion2Supported() && params.effects > 0) { effect_result_states_cpu = allocator.Allocate<EffectResultState>(params.effects, 0x10); if (effect_result_states_cpu.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } std::memset(effect_result_states_cpu.data(), 0, effect_result_states_cpu.size_bytes()); } @@ -289,7 +289,7 @@ Result System::Initialize(const AudioRendererParameterInternal& params, upsampler_workbuffer); if (upsampler_infos.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } auto effect_infos{allocator.Allocate<EffectInfoBase>(params.effects, 0x40)}; @@ -298,14 +298,14 @@ Result System::Initialize(const AudioRendererParameterInternal& params, } if (effect_infos.empty() && params.effects > 0) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } std::span<EffectResultState> effect_result_states_dsp{}; if (behavior.IsEffectInfoVersion2Supported() && params.effects > 0) { effect_result_states_dsp = allocator.Allocate<EffectResultState>(params.effects, 0x40); if (effect_result_states_dsp.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } std::memset(effect_result_states_dsp.data(), 0, effect_result_states_dsp.size_bytes()); } @@ -319,14 +319,14 @@ Result System::Initialize(const AudioRendererParameterInternal& params, } if (sinks.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } sink_context.Initialize(sinks, params.sinks); auto voice_dsp_states{allocator.Allocate<VoiceState>(params.voices, 0x40)}; if (voice_dsp_states.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } for (auto& voice_state : voice_dsp_states) { @@ -344,7 +344,7 @@ Result System::Initialize(const AudioRendererParameterInternal& params, 0xC}; performance_workbuffer = allocator.Allocate<u8>(perf_workbuffer_size, 0x40); if (performance_workbuffer.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } std::memset(performance_workbuffer.data(), 0, performance_workbuffer.size_bytes()); performance_manager.Initialize(performance_workbuffer, performance_workbuffer.size_bytes(), @@ -360,7 +360,7 @@ Result System::Initialize(const AudioRendererParameterInternal& params, command_workbuffer_size = allocator.GetRemainingSize(); command_workbuffer = allocator.Allocate<u8>(command_workbuffer_size, 0x40); if (command_workbuffer.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } command_buffer_size = 0; diff --git a/src/audio_core/renderer/system.h b/src/audio_core/renderer/system.h index 429196e41..e328783b6 100644 --- a/src/audio_core/renderer/system.h +++ b/src/audio_core/renderer/system.h @@ -154,7 +154,7 @@ public: ExecutionMode GetExecutionMode() const; /** - * Get the rendering deivce for this system. + * Get the rendering device for this system. * This is unused. * * @return Rendering device for this system. @@ -241,7 +241,7 @@ private: std::span<u8> command_workbuffer{}; /// Size of command workbuffer u64 command_workbuffer_size{}; - /// Numebr of commands in the workbuffer + /// Number of commands in the workbuffer u64 command_buffer_size{}; /// Manager for upsamplers UpsamplerManager* upsampler_manager{}; diff --git a/src/audio_core/renderer/system_manager.h b/src/audio_core/renderer/system_manager.h index 81457a3a1..415ddb74f 100644 --- a/src/audio_core/renderer/system_manager.h +++ b/src/audio_core/renderer/system_manager.h @@ -36,7 +36,7 @@ public: /** * Initialize the system manager, called when any system is registered. * - * @return True if sucessfully initialized, otherwise false. + * @return True if successfully initialized, otherwise false. */ bool InitializeUnsafe(); @@ -50,7 +50,7 @@ public: * The manager does not own the system, so do not free it without calling Remove. * * @param system - The system to add. - * @return True if succesfully added, otherwise false. + * @return True if successfully added, otherwise false. */ bool Add(System& system); @@ -58,7 +58,7 @@ public: * Remove an audio render system from the manager. * * @param system - The system to remove. - * @return True if succesfully removed, otherwise false. + * @return True if successfully removed, otherwise false. */ bool Remove(System& system); diff --git a/src/audio_core/renderer/voice/voice_info.cpp b/src/audio_core/renderer/voice/voice_info.cpp index 1849eeb57..c0bfb23fc 100644 --- a/src/audio_core/renderer/voice/voice_info.cpp +++ b/src/audio_core/renderer/voice/voice_info.cpp @@ -181,7 +181,7 @@ void VoiceInfo::UpdateWaveBuffer(std::span<BehaviorInfo::ErrorInfo> error_info, if (wave_buffer_internal.start_offset * byte_size > wave_buffer_internal.size || wave_buffer_internal.end_offset * byte_size > wave_buffer_internal.size) { LOG_ERROR(Service_Audio, "Invalid PCM16 start/end wavebuffer sizes!"); - error_info[0].error_code = Service::Audio::ERR_INVALID_UPDATE_DATA; + error_info[0].error_code = Service::Audio::ResultInvalidUpdateInfo; error_info[0].address = wave_buffer_internal.address; return; } @@ -192,7 +192,7 @@ void VoiceInfo::UpdateWaveBuffer(std::span<BehaviorInfo::ErrorInfo> error_info, if (wave_buffer_internal.start_offset * byte_size > wave_buffer_internal.size || wave_buffer_internal.end_offset * byte_size > wave_buffer_internal.size) { LOG_ERROR(Service_Audio, "Invalid PCMFloat start/end wavebuffer sizes!"); - error_info[0].error_code = Service::Audio::ERR_INVALID_UPDATE_DATA; + error_info[0].error_code = Service::Audio::ResultInvalidUpdateInfo; error_info[0].address = wave_buffer_internal.address; return; } @@ -216,7 +216,7 @@ void VoiceInfo::UpdateWaveBuffer(std::span<BehaviorInfo::ErrorInfo> error_info, if (start > static_cast<s64>(wave_buffer_internal.size) || end > static_cast<s64>(wave_buffer_internal.size)) { LOG_ERROR(Service_Audio, "Invalid ADPCM start/end wavebuffer sizes!"); - error_info[0].error_code = Service::Audio::ERR_INVALID_UPDATE_DATA; + error_info[0].error_code = Service::Audio::ResultInvalidUpdateInfo; error_info[0].address = wave_buffer_internal.address; return; } @@ -228,7 +228,7 @@ void VoiceInfo::UpdateWaveBuffer(std::span<BehaviorInfo::ErrorInfo> error_info, if (wave_buffer_internal.start_offset < 0 || wave_buffer_internal.end_offset < 0) { LOG_ERROR(Service_Audio, "Invalid input start/end wavebuffer sizes!"); - error_info[0].error_code = Service::Audio::ERR_INVALID_UPDATE_DATA; + error_info[0].error_code = Service::Audio::ResultInvalidUpdateInfo; error_info[0].address = wave_buffer_internal.address; return; } diff --git a/src/audio_core/renderer/voice/voice_info.h b/src/audio_core/renderer/voice/voice_info.h index 930180895..3c5d3e04f 100644 --- a/src/audio_core/renderer/voice/voice_info.h +++ b/src/audio_core/renderer/voice/voice_info.h @@ -183,7 +183,7 @@ public: void Initialize(); /** - * Does this voice ned an update? + * Does this voice need an update? * * @param params - Input parameters to check matching. * @@ -236,7 +236,7 @@ public: * * @param error_info - Output array of errors. * @param wave_buffer - The wavebuffer to be updated. - * @param wave_buffer_internal - Input parametters to be used for the update. + * @param wave_buffer_internal - Input parameters to be used for the update. * @param sample_format - Sample format of the wavebuffer. * @param valid - Is this wavebuffer valid? * @param pool_mapper - Used to map the wavebuffers. |