diff options
author | Merry <MerryMage@users.noreply.github.com> | 2017-09-26 09:47:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-26 09:47:37 +0200 |
commit | 0c20da7fde7ed659977ce145e003c6b2f42b7290 (patch) | |
tree | fb0624e37338033ae84a8948be5c235ec8d4f1dd /src | |
parent | Merge pull request #2947 from Subv/selfncch_factory (diff) | |
parent | Audio: Use std::deque instead of std::vector for the audio buffer type (StereoBuffer16). (diff) | |
download | yuzu-0c20da7fde7ed659977ce145e003c6b2f42b7290.tar yuzu-0c20da7fde7ed659977ce145e003c6b2f42b7290.tar.gz yuzu-0c20da7fde7ed659977ce145e003c6b2f42b7290.tar.bz2 yuzu-0c20da7fde7ed659977ce145e003c6b2f42b7290.tar.lz yuzu-0c20da7fde7ed659977ce145e003c6b2f42b7290.tar.xz yuzu-0c20da7fde7ed659977ce145e003c6b2f42b7290.tar.zst yuzu-0c20da7fde7ed659977ce145e003c6b2f42b7290.zip |
Diffstat (limited to '')
-rw-r--r-- | src/audio_core/codec.cpp | 4 | ||||
-rw-r--r-- | src/audio_core/codec.h | 4 | ||||
-rw-r--r-- | src/audio_core/hle/source.h | 2 | ||||
-rw-r--r-- | src/audio_core/interpolate.cpp | 2 | ||||
-rw-r--r-- | src/audio_core/interpolate.h | 4 |
5 files changed, 9 insertions, 7 deletions
diff --git a/src/audio_core/codec.cpp b/src/audio_core/codec.cpp index 7a3bd7eb3..6fba9fdae 100644 --- a/src/audio_core/codec.cpp +++ b/src/audio_core/codec.cpp @@ -117,7 +117,9 @@ StereoBuffer16 DecodePCM16(const unsigned num_channels, const u8* const data, ret[i].fill(sample); } } else { - std::memcpy(ret.data(), data, sample_count * 2 * sizeof(u16)); + for (size_t i = 0; i < sample_count; ++i) { + std::memcpy(&ret[i], data + i * sizeof(s16) * 2, 2 * sizeof(s16)); + } } return ret; diff --git a/src/audio_core/codec.h b/src/audio_core/codec.h index 2b0c395e6..877b2202d 100644 --- a/src/audio_core/codec.h +++ b/src/audio_core/codec.h @@ -5,13 +5,13 @@ #pragma once #include <array> -#include <vector> +#include <deque> #include "common/common_types.h" namespace Codec { /// A variable length buffer of signed PCM16 stereo samples. -using StereoBuffer16 = std::vector<std::array<s16, 2>>; +using StereoBuffer16 = std::deque<std::array<s16, 2>>; /// See: Codec::DecodeADPCM struct ADPCMState { diff --git a/src/audio_core/hle/source.h b/src/audio_core/hle/source.h index ccb7f064f..c4d2debc2 100644 --- a/src/audio_core/hle/source.h +++ b/src/audio_core/hle/source.h @@ -108,7 +108,7 @@ private: u32 current_sample_number = 0; u32 next_sample_number = 0; - std::vector<std::array<s16, 2>> current_buffer; + AudioInterp::StereoBuffer16 current_buffer; // buffer_id state diff --git a/src/audio_core/interpolate.cpp b/src/audio_core/interpolate.cpp index 16e68bc5c..83573d772 100644 --- a/src/audio_core/interpolate.cpp +++ b/src/audio_core/interpolate.cpp @@ -47,7 +47,7 @@ static void StepOverSamples(State& state, StereoBuffer16& input, float rate, state.xn1 = input[inputi + 1]; state.fposition = fposition - inputi * scale_factor; - input.erase(input.begin(), input.begin() + inputi + 2); + input.erase(input.begin(), std::next(input.begin(), inputi + 2)); } void None(State& state, StereoBuffer16& input, float rate, DSP::HLE::StereoFrame16& output, diff --git a/src/audio_core/interpolate.h b/src/audio_core/interpolate.h index 59f59bc14..8dff6111a 100644 --- a/src/audio_core/interpolate.h +++ b/src/audio_core/interpolate.h @@ -5,14 +5,14 @@ #pragma once #include <array> -#include <vector> +#include <deque> #include "audio_core/hle/common.h" #include "common/common_types.h" namespace AudioInterp { /// A variable length buffer of signed PCM16 stereo samples. -using StereoBuffer16 = std::vector<std::array<s16, 2>>; +using StereoBuffer16 = std::deque<std::array<s16, 2>>; struct State { /// Two historical samples. |