diff options
| author | Merry <MerryMage@users.noreply.github.com> | 2017-09-26 08:47:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-26 08:47:37 +0100 |
| commit | 0c20da7fde7ed659977ce145e003c6b2f42b7290 (patch) | |
| tree | fb0624e37338033ae84a8948be5c235ec8d4f1dd /src/audio_core/codec.cpp | |
| parent | fd30d48ceb7d513923d01a68e568668b6d4d3e7f (diff) | |
| parent | d7459354f58d1b71fc0c5ec48de9242e6a2fd00c (diff) | |
Merge pull request #2958 from Subv/audio_buffer_datatype
Audio: Use std::deque instead of std::vector for the audio buffer type (StereoBuffer16)
Diffstat (limited to 'src/audio_core/codec.cpp')
| -rw-r--r-- | src/audio_core/codec.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/audio_core/codec.cpp b/src/audio_core/codec.cpp index 7a3bd7eb3e..6fba9fdae7 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; |