diff options
author | bunnei <bunneidev@gmail.com> | 2020-10-14 00:30:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-14 00:30:30 +0200 |
commit | ca416a0fb87ced0e471729fe344b9f34a090e7b5 (patch) | |
tree | d1a143eb839744bc1515700c861ec7e5d04d130e /src/audio_core/algorithm | |
parent | Merge pull request #4786 from lioncash/flags (diff) | |
parent | audio_core/CMakeLists: Make warnings consistent with core (diff) | |
download | yuzu-ca416a0fb87ced0e471729fe344b9f34a090e7b5.tar yuzu-ca416a0fb87ced0e471729fe344b9f34a090e7b5.tar.gz yuzu-ca416a0fb87ced0e471729fe344b9f34a090e7b5.tar.bz2 yuzu-ca416a0fb87ced0e471729fe344b9f34a090e7b5.tar.lz yuzu-ca416a0fb87ced0e471729fe344b9f34a090e7b5.tar.xz yuzu-ca416a0fb87ced0e471729fe344b9f34a090e7b5.tar.zst yuzu-ca416a0fb87ced0e471729fe344b9f34a090e7b5.zip |
Diffstat (limited to 'src/audio_core/algorithm')
-rw-r--r-- | src/audio_core/algorithm/filter.cpp | 3 | ||||
-rw-r--r-- | src/audio_core/algorithm/interpolate.cpp | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/audio_core/algorithm/filter.cpp b/src/audio_core/algorithm/filter.cpp index f65bf64f7..f34a5b9f3 100644 --- a/src/audio_core/algorithm/filter.cpp +++ b/src/audio_core/algorithm/filter.cpp @@ -55,7 +55,8 @@ void Filter::Process(std::vector<s16>& signal) { /// @param total_count The total number of biquads to be cascaded. /// @param index 0-index of the biquad to calculate the Q value for. static double CascadingBiquadQ(std::size_t total_count, std::size_t index) { - const double pole = M_PI * (2 * index + 1) / (4.0 * total_count); + const auto pole = + M_PI * static_cast<double>(2 * index + 1) / (4.0 * static_cast<double>(total_count)); return 1.0 / (2.0 * std::cos(pole)); } diff --git a/src/audio_core/algorithm/interpolate.cpp b/src/audio_core/algorithm/interpolate.cpp index 689a54508..699fcb84c 100644 --- a/src/audio_core/algorithm/interpolate.cpp +++ b/src/audio_core/algorithm/interpolate.cpp @@ -146,7 +146,7 @@ std::vector<s16> Interpolate(InterpolationState& state, std::vector<s16> input, return {}; if (ratio <= 0) { - LOG_CRITICAL(Audio, "Nonsensical interpolation ratio {}", ratio); + LOG_ERROR(Audio, "Nonsensical interpolation ratio {}", ratio); return input; } @@ -164,7 +164,8 @@ std::vector<s16> Interpolate(InterpolationState& state, std::vector<s16> input, const std::size_t num_frames{input.size() / 2}; std::vector<s16> output; - output.reserve(static_cast<std::size_t>(input.size() / ratio + InterpolationState::taps)); + output.reserve(static_cast<std::size_t>(static_cast<double>(input.size()) / ratio + + InterpolationState::taps)); for (std::size_t frame{}; frame < num_frames; ++frame) { const std::size_t lut_index{(state.fraction >> 8) * InterpolationState::taps}; |