summaryrefslogtreecommitdiff
path: root/src/audio_core/cubeb_sink.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/audio_core/cubeb_sink.cpp')
-rw-r--r--src/audio_core/cubeb_sink.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/audio_core/cubeb_sink.cpp b/src/audio_core/cubeb_sink.cpp
index 0b0e9a053..1501ef1f4 100644
--- a/src/audio_core/cubeb_sink.cpp
+++ b/src/audio_core/cubeb_sink.cpp
@@ -61,25 +61,24 @@ public:
61 cubeb_stream_destroy(stream_backend); 61 cubeb_stream_destroy(stream_backend);
62 } 62 }
63 63
64 void EnqueueSamples(u32 num_channels, const s16* samples, size_t sample_count) override { 64 void EnqueueSamples(u32 num_channels, const std::vector<s16>& samples) override {
65 if (!ctx) { 65 if (!ctx) {
66 return; 66 return;
67 } 67 }
68 68
69 queue.reserve(queue.size() + sample_count * GetNumChannels()); 69 queue.reserve(queue.size() + samples.size() * GetNumChannels());
70 70
71 if (is_6_channel) { 71 if (is_6_channel) {
72 // Downsample 6 channels to 2 72 // Downsample 6 channels to 2
73 const size_t sample_count_copy_size = sample_count * num_channels * 2; 73 const size_t sample_count_copy_size = samples.size() * 2;
74 queue.reserve(sample_count_copy_size); 74 queue.reserve(sample_count_copy_size);
75 for (size_t i = 0; i < sample_count * num_channels; i += num_channels) { 75 for (size_t i = 0; i < samples.size(); i += num_channels) {
76 queue.push_back(samples[i]); 76 queue.push_back(samples[i]);
77 queue.push_back(samples[i + 1]); 77 queue.push_back(samples[i + 1]);
78 } 78 }
79 } else { 79 } else {
80 // Copy as-is 80 // Copy as-is
81 std::copy(samples, samples + sample_count * GetNumChannels(), 81 std::copy(samples.begin(), samples.end(), std::back_inserter(queue));
82 std::back_inserter(queue));
83 } 82 }
84 } 83 }
85 84