summaryrefslogtreecommitdiff
path: root/src/audio_core/codec.cpp
diff options
context:
space:
mode:
authorLC <mathew1800@gmail.com>2020-10-20 19:19:12 -0400
committerGitHub <noreply@github.com>2020-10-20 19:19:12 -0400
commit88d5140cf2f80d51dc297af3a128a4212215149f (patch)
treecd524e8ab111fba79f75a48cc672cb875251a32f /src/audio_core/codec.cpp
parent940c3bf68deff4f45c2dc3c2549c00cff4e1b586 (diff)
parentbe1954e04cb5a0c3a526f78ed5490a5e65310280 (diff)
Merge pull request #4796 from lioncash/clang
core: Fix clang build
Diffstat (limited to 'src/audio_core/codec.cpp')
-rw-r--r--src/audio_core/codec.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/audio_core/codec.cpp b/src/audio_core/codec.cpp
index 2fb91c13a..d89f94ea2 100644
--- a/src/audio_core/codec.cpp
+++ b/src/audio_core/codec.cpp
@@ -32,7 +32,7 @@ std::vector<s16> DecodeADPCM(const u8* const data, std::size_t size, const ADPCM
for (std::size_t framei = 0; framei < NUM_FRAMES; framei++) {
const int frame_header = data[framei * FRAME_LEN];
const int scale = 1 << (frame_header & 0xF);
- const int idx = (frame_header >> 4) & 0x7;
+ const auto idx = static_cast<size_t>((frame_header >> 4) & 0x7);
// Coefficients are fixed point with 11 bits fractional part.
const int coef1 = coeff[idx * 2 + 0];
@@ -57,11 +57,11 @@ std::vector<s16> DecodeADPCM(const u8* const data, std::size_t size, const ADPCM
std::size_t outputi = framei * SAMPLES_PER_FRAME;
std::size_t datai = framei * FRAME_LEN + 1;
for (std::size_t i = 0; i < SAMPLES_PER_FRAME && outputi < sample_count; i += 2) {
- const s16 sample1 = decode_sample(SIGNED_NIBBLES[data[datai] >> 4]);
+ const s16 sample1 = decode_sample(SIGNED_NIBBLES[static_cast<u32>(data[datai] >> 4)]);
ret[outputi] = sample1;
outputi++;
- const s16 sample2 = decode_sample(SIGNED_NIBBLES[data[datai] & 0xF]);
+ const s16 sample2 = decode_sample(SIGNED_NIBBLES[static_cast<u32>(data[datai] & 0xF)]);
ret[outputi] = sample2;
outputi++;