diff options
| author | bunnei <bunneidev@gmail.com> | 2020-09-30 00:16:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-30 00:16:24 +0200 |
| commit | 09609dd50ed862a7f1d00b704acbce5bff498994 (patch) | |
| tree | 903a6d5b566fca0797014c29011f7cf63eb3fd08 | |
| parent | Merge pull request #4722 from lioncash/casting (diff) | |
| parent | command_generator: Make lookup table static constexpr (diff) | |
| download | yuzu-09609dd50ed862a7f1d00b704acbce5bff498994.tar yuzu-09609dd50ed862a7f1d00b704acbce5bff498994.tar.gz yuzu-09609dd50ed862a7f1d00b704acbce5bff498994.tar.bz2 yuzu-09609dd50ed862a7f1d00b704acbce5bff498994.tar.lz yuzu-09609dd50ed862a7f1d00b704acbce5bff498994.tar.xz yuzu-09609dd50ed862a7f1d00b704acbce5bff498994.tar.zst yuzu-09609dd50ed862a7f1d00b704acbce5bff498994.zip | |
| -rw-r--r-- | src/audio_core/codec.cpp | 5 | ||||
| -rw-r--r-- | src/audio_core/codec.h | 2 | ||||
| -rw-r--r-- | src/audio_core/command_generator.cpp | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/audio_core/codec.cpp b/src/audio_core/codec.cpp index c5a0d98ce..2fb91c13a 100644 --- a/src/audio_core/codec.cpp +++ b/src/audio_core/codec.cpp @@ -16,8 +16,9 @@ std::vector<s16> DecodeADPCM(const u8* const data, std::size_t size, const ADPCM constexpr std::size_t FRAME_LEN = 8; constexpr std::size_t SAMPLES_PER_FRAME = 14; - constexpr std::array<int, 16> SIGNED_NIBBLES = { - {0, 1, 2, 3, 4, 5, 6, 7, -8, -7, -6, -5, -4, -3, -2, -1}}; + static constexpr std::array<int, 16> SIGNED_NIBBLES{ + 0, 1, 2, 3, 4, 5, 6, 7, -8, -7, -6, -5, -4, -3, -2, -1, + }; const std::size_t sample_count = (size / FRAME_LEN) * SAMPLES_PER_FRAME; const std::size_t ret_size = diff --git a/src/audio_core/codec.h b/src/audio_core/codec.h index ef2ce01a8..9507abb1b 100644 --- a/src/audio_core/codec.h +++ b/src/audio_core/codec.h @@ -38,7 +38,7 @@ using ADPCM_Coeff = std::array<s16, 16>; * @param state ADPCM state, this is updated with new state * @return Decoded stereo signed PCM16 data, sample_count in length */ -std::vector<s16> DecodeADPCM(const u8* const data, std::size_t size, const ADPCM_Coeff& coeff, +std::vector<s16> DecodeADPCM(const u8* data, std::size_t size, const ADPCM_Coeff& coeff, ADPCMState& state); }; // namespace AudioCore::Codec diff --git a/src/audio_core/command_generator.cpp b/src/audio_core/command_generator.cpp index 7f2597257..bba40d13d 100644 --- a/src/audio_core/command_generator.cpp +++ b/src/audio_core/command_generator.cpp @@ -727,8 +727,9 @@ s32 CommandGenerator::DecodeAdpcm(ServerVoiceInfo& voice_info, VoiceState& dsp_s return 0; } - constexpr std::array<int, 16> SIGNED_NIBBLES = { - {0, 1, 2, 3, 4, 5, 6, 7, -8, -7, -6, -5, -4, -3, -2, -1}}; + static constexpr std::array<int, 16> SIGNED_NIBBLES{ + 0, 1, 2, 3, 4, 5, 6, 7, -8, -7, -6, -5, -4, -3, -2, -1, + }; constexpr std::size_t FRAME_LEN = 8; constexpr std::size_t NIBBLES_PER_SAMPLE = 16; |