diff options
Diffstat (limited to 'src/audio_core')
| -rw-r--r-- | src/audio_core/opus/parameters.h | 4 | ||||
| -rw-r--r-- | src/audio_core/renderer/behavior/info_updater.cpp | 7 | ||||
| -rw-r--r-- | src/audio_core/renderer/memory/pool_mapper.cpp | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/audio_core/opus/parameters.h b/src/audio_core/opus/parameters.h index 4c54b2825..47c418b9f 100644 --- a/src/audio_core/opus/parameters.h +++ b/src/audio_core/opus/parameters.h | |||
| @@ -20,7 +20,7 @@ struct OpusParametersEx { | |||
| 20 | /* 0x00 */ u32 sample_rate; | 20 | /* 0x00 */ u32 sample_rate; |
| 21 | /* 0x04 */ u32 channel_count; | 21 | /* 0x04 */ u32 channel_count; |
| 22 | /* 0x08 */ bool use_large_frame_size; | 22 | /* 0x08 */ bool use_large_frame_size; |
| 23 | /* 0x09 */ INSERT_PADDING_BYTES(7); | 23 | /* 0x09 */ INSERT_PADDING_BYTES_NOINIT(7); |
| 24 | }; // size = 0x10 | 24 | }; // size = 0x10 |
| 25 | static_assert(sizeof(OpusParametersEx) == 0x10, "OpusParametersEx has the wrong size!"); | 25 | static_assert(sizeof(OpusParametersEx) == 0x10, "OpusParametersEx has the wrong size!"); |
| 26 | 26 | ||
| @@ -40,7 +40,7 @@ struct OpusMultiStreamParametersEx { | |||
| 40 | /* 0x08 */ u32 total_stream_count; | 40 | /* 0x08 */ u32 total_stream_count; |
| 41 | /* 0x0C */ u32 stereo_stream_count; | 41 | /* 0x0C */ u32 stereo_stream_count; |
| 42 | /* 0x10 */ bool use_large_frame_size; | 42 | /* 0x10 */ bool use_large_frame_size; |
| 43 | /* 0x11 */ INSERT_PADDING_BYTES(7); | 43 | /* 0x11 */ INSERT_PADDING_BYTES_NOINIT(7); |
| 44 | /* 0x18 */ std::array<u8, OpusStreamCountMax + 1> mappings; | 44 | /* 0x18 */ std::array<u8, OpusStreamCountMax + 1> mappings; |
| 45 | }; // size = 0x118 | 45 | }; // size = 0x118 |
| 46 | static_assert(sizeof(OpusMultiStreamParametersEx) == 0x118, | 46 | static_assert(sizeof(OpusMultiStreamParametersEx) == 0x118, |
diff --git a/src/audio_core/renderer/behavior/info_updater.cpp b/src/audio_core/renderer/behavior/info_updater.cpp index 163127789..3dae6069f 100644 --- a/src/audio_core/renderer/behavior/info_updater.cpp +++ b/src/audio_core/renderer/behavior/info_updater.cpp | |||
| @@ -19,9 +19,10 @@ namespace AudioCore::Renderer { | |||
| 19 | 19 | ||
| 20 | InfoUpdater::InfoUpdater(std::span<const u8> input_, std::span<u8> output_, | 20 | InfoUpdater::InfoUpdater(std::span<const u8> input_, std::span<u8> output_, |
| 21 | Kernel::KProcess* process_handle_, BehaviorInfo& behaviour_) | 21 | Kernel::KProcess* process_handle_, BehaviorInfo& behaviour_) |
| 22 | : input{input_.data() + sizeof(UpdateDataHeader)}, input_origin{input_}, | 22 | : input{input_.data() + sizeof(UpdateDataHeader)}, |
| 23 | output{output_.data() + sizeof(UpdateDataHeader)}, output_origin{output_}, | 23 | input_origin{input_}, output{output_.data() + sizeof(UpdateDataHeader)}, |
| 24 | in_header{reinterpret_cast<const UpdateDataHeader*>(input_origin.data())}, | 24 | output_origin{output_}, in_header{reinterpret_cast<const UpdateDataHeader*>( |
| 25 | input_origin.data())}, | ||
| 25 | out_header{reinterpret_cast<UpdateDataHeader*>(output_origin.data())}, | 26 | out_header{reinterpret_cast<UpdateDataHeader*>(output_origin.data())}, |
| 26 | expected_input_size{input_.size()}, expected_output_size{output_.size()}, | 27 | expected_input_size{input_.size()}, expected_output_size{output_.size()}, |
| 27 | process_handle{process_handle_}, behaviour{behaviour_} { | 28 | process_handle{process_handle_}, behaviour{behaviour_} { |
diff --git a/src/audio_core/renderer/memory/pool_mapper.cpp b/src/audio_core/renderer/memory/pool_mapper.cpp index 1df786feb..e47eb66d5 100644 --- a/src/audio_core/renderer/memory/pool_mapper.cpp +++ b/src/audio_core/renderer/memory/pool_mapper.cpp | |||
| @@ -13,8 +13,8 @@ PoolMapper::PoolMapper(Kernel::KProcess* process_handle_, bool force_map_) | |||
| 13 | 13 | ||
| 14 | PoolMapper::PoolMapper(Kernel::KProcess* process_handle_, std::span<MemoryPoolInfo> pool_infos_, | 14 | PoolMapper::PoolMapper(Kernel::KProcess* process_handle_, std::span<MemoryPoolInfo> pool_infos_, |
| 15 | u32 pool_count_, bool force_map_) | 15 | u32 pool_count_, bool force_map_) |
| 16 | : process_handle{process_handle_}, pool_infos{pool_infos_.data()}, pool_count{pool_count_}, | 16 | : process_handle{process_handle_}, pool_infos{pool_infos_.data()}, |
| 17 | force_map{force_map_} {} | 17 | pool_count{pool_count_}, force_map{force_map_} {} |
| 18 | 18 | ||
| 19 | void PoolMapper::ClearUseState(std::span<MemoryPoolInfo> pools, const u32 count) { | 19 | void PoolMapper::ClearUseState(std::span<MemoryPoolInfo> pools, const u32 count) { |
| 20 | for (u32 i = 0; i < count; i++) { | 20 | for (u32 i = 0; i < count; i++) { |