diff options
| author | 2020-10-20 22:08:53 -0400 | |
|---|---|---|
| committer | 2020-10-20 22:08:53 -0400 | |
| commit | 2e74b79e89fe1e6a21fe0d8650844e563b3c32f5 (patch) | |
| tree | 0dbc65ac86e609ae22087c7be9d4759ac6b73004 /src/audio_core/algorithm | |
| parent | kernel: Fix build with recent compiler flag changes (diff) | |
| parent | Revert "core: Fix clang build" (diff) | |
| download | yuzu-2e74b79e89fe1e6a21fe0d8650844e563b3c32f5.tar.gz yuzu-2e74b79e89fe1e6a21fe0d8650844e563b3c32f5.tar.xz yuzu-2e74b79e89fe1e6a21fe0d8650844e563b3c32f5.zip | |
Merge pull request #4814 from yuzu-emu/revert-4796-clang
Revert "core: Fix clang build"
Diffstat (limited to 'src/audio_core/algorithm')
| -rw-r--r-- | src/audio_core/algorithm/interpolate.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/audio_core/algorithm/interpolate.cpp b/src/audio_core/algorithm/interpolate.cpp index 587ee5b7b..699fcb84c 100644 --- a/src/audio_core/algorithm/interpolate.cpp +++ b/src/audio_core/algorithm/interpolate.cpp | |||
| @@ -167,8 +167,8 @@ std::vector<s16> Interpolate(InterpolationState& state, std::vector<s16> input, | |||
| 167 | output.reserve(static_cast<std::size_t>(static_cast<double>(input.size()) / ratio + | 167 | output.reserve(static_cast<std::size_t>(static_cast<double>(input.size()) / ratio + |
| 168 | InterpolationState::taps)); | 168 | InterpolationState::taps)); |
| 169 | 169 | ||
| 170 | for (std::size_t frame = 0; frame < num_frames; ++frame) { | 170 | for (std::size_t frame{}; frame < num_frames; ++frame) { |
| 171 | const auto lut_index{static_cast<size_t>(state.fraction >> 8) * InterpolationState::taps}; | 171 | const std::size_t lut_index{(state.fraction >> 8) * InterpolationState::taps}; |
| 172 | 172 | ||
| 173 | std::rotate(state.history.begin(), state.history.end() - 1, state.history.end()); | 173 | std::rotate(state.history.begin(), state.history.end() - 1, state.history.end()); |
| 174 | state.history[0][0] = input[frame * 2 + 0]; | 174 | state.history[0][0] = input[frame * 2 + 0]; |
| @@ -225,7 +225,7 @@ void Resample(s32* output, const s32* input, s32 pitch, s32& fraction, std::size | |||
| 225 | 225 | ||
| 226 | output[i] = (l0 * s0 + l1 * s1 + l2 * s2 + l3 * s3) >> 15; | 226 | output[i] = (l0 * s0 + l1 * s1 + l2 * s2 + l3 * s3) >> 15; |
| 227 | fraction += pitch; | 227 | fraction += pitch; |
| 228 | index += static_cast<size_t>(fraction >> 15); | 228 | index += (fraction >> 15); |
| 229 | fraction &= 0x7fff; | 229 | fraction &= 0x7fff; |
| 230 | } | 230 | } |
| 231 | } | 231 | } |