summaryrefslogtreecommitdiff
path: root/src/audio_core/codec.cpp
diff options
context:
space:
mode:
authorGravatar Merry2017-09-26 08:47:37 +0100
committerGravatar GitHub2017-09-26 08:47:37 +0100
commit0c20da7fde7ed659977ce145e003c6b2f42b7290 (patch)
treefb0624e37338033ae84a8948be5c235ec8d4f1dd /src/audio_core/codec.cpp
parentMerge pull request #2947 from Subv/selfncch_factory (diff)
parentAudio: Use std::deque instead of std::vector for the audio buffer type (Stere... (diff)
downloadyuzu-0c20da7fde7ed659977ce145e003c6b2f42b7290.tar.gz
yuzu-0c20da7fde7ed659977ce145e003c6b2f42b7290.tar.xz
yuzu-0c20da7fde7ed659977ce145e003c6b2f42b7290.zip
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.cpp4
1 files changed, 3 insertions, 1 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,
117 ret[i].fill(sample); 117 ret[i].fill(sample);
118 } 118 }
119 } else { 119 } else {
120 std::memcpy(ret.data(), data, sample_count * 2 * sizeof(u16)); 120 for (size_t i = 0; i < sample_count; ++i) {
121 std::memcpy(&ret[i], data + i * sizeof(s16) * 2, 2 * sizeof(s16));
122 }
121 } 123 }
122 124
123 return ret; 125 return ret;