diff options
| author |  bunnei | 2020-09-29 15:16:24 -0700 |
|---|---|---|
| committer |  GitHub | 2020-09-29 15:16:24 -0700 |
| commit | 09609dd50ed862a7f1d00b704acbce5bff498994 (patch) | |
| tree | 903a6d5b566fca0797014c29011f7cf63eb3fd08 /src/audio_core/codec.cpp | |
| parent | Merge pull request #4722 from lioncash/casting (diff) | |
| parent | command_generator: Make lookup table static constexpr (diff) | |
| download | yuzu-09609dd50ed862a7f1d00b704acbce5bff498994.tar.gz yuzu-09609dd50ed862a7f1d00b704acbce5bff498994.tar.xz yuzu-09609dd50ed862a7f1d00b704acbce5bff498994.zip | |
Merge pull request #4721 from lioncash/genfn
codec: Make lookup table static constexpr
Diffstat (limited to 'src/audio_core/codec.cpp')
| -rw-r--r-- | src/audio_core/codec.cpp | 5 |
1 files changed, 3 insertions, 2 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 | |||
| 16 | 16 | ||
| 17 | constexpr std::size_t FRAME_LEN = 8; | 17 | constexpr std::size_t FRAME_LEN = 8; |
| 18 | constexpr std::size_t SAMPLES_PER_FRAME = 14; | 18 | constexpr std::size_t SAMPLES_PER_FRAME = 14; |
| 19 | constexpr std::array<int, 16> SIGNED_NIBBLES = { | 19 | static constexpr std::array<int, 16> SIGNED_NIBBLES{ |
| 20 | {0, 1, 2, 3, 4, 5, 6, 7, -8, -7, -6, -5, -4, -3, -2, -1}}; | 20 | 0, 1, 2, 3, 4, 5, 6, 7, -8, -7, -6, -5, -4, -3, -2, -1, |
| 21 | }; | ||
| 21 | 22 | ||
| 22 | const std::size_t sample_count = (size / FRAME_LEN) * SAMPLES_PER_FRAME; | 23 | const std::size_t sample_count = (size / FRAME_LEN) * SAMPLES_PER_FRAME; |
| 23 | const std::size_t ret_size = | 24 | const std::size_t ret_size = |