diff options
author | MerryMage <MerryMage@users.noreply.github.com> | 2018-09-09 10:16:48 +0200 |
---|---|---|
committer | MerryMage <MerryMage@users.noreply.github.com> | 2018-09-09 10:51:46 +0200 |
commit | 55af5bda5574a34716680b23aab6482d340a00ed (patch) | |
tree | a97b3aa2bc3084163b62bfd083d14477215a9dbd | |
parent | cubeb_sink: Perform audio stretching (diff) | |
download | yuzu-55af5bda5574a34716680b23aab6482d340a00ed.tar yuzu-55af5bda5574a34716680b23aab6482d340a00ed.tar.gz yuzu-55af5bda5574a34716680b23aab6482d340a00ed.tar.bz2 yuzu-55af5bda5574a34716680b23aab6482d340a00ed.tar.lz yuzu-55af5bda5574a34716680b23aab6482d340a00ed.tar.xz yuzu-55af5bda5574a34716680b23aab6482d340a00ed.tar.zst yuzu-55af5bda5574a34716680b23aab6482d340a00ed.zip |
Diffstat (limited to '')
-rw-r--r-- | src/audio_core/cubeb_sink.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/audio_core/cubeb_sink.cpp b/src/audio_core/cubeb_sink.cpp index 7982306b3..067dc98d2 100644 --- a/src/audio_core/cubeb_sink.cpp +++ b/src/audio_core/cubeb_sink.cpp @@ -17,8 +17,8 @@ class CubebSinkStream final : public SinkStream { public: CubebSinkStream(cubeb* ctx, u32 sample_rate, u32 num_channels_, cubeb_devid output_device, const std::string& name) - : ctx{ctx}, is_6_channel{num_channels_ == 6}, num_channels{std::min(num_channels_, 2u)}, - time_stretch{sample_rate, num_channels} { + : ctx{ctx}, num_channels{std::min(num_channels_, 2u)}, time_stretch{sample_rate, + num_channels} { cubeb_stream_params params{}; params.rate = sample_rate; @@ -57,15 +57,15 @@ public: cubeb_stream_destroy(stream_backend); } - void EnqueueSamples(u32 num_channels, const std::vector<s16>& samples) override { - if (is_6_channel) { + void EnqueueSamples(u32 source_num_channels, const std::vector<s16>& samples) override { + if (source_num_channels > num_channels) { // Downsample 6 channels to 2 - const size_t sample_count_copy_size = samples.size() * 2; std::vector<s16> buf; - buf.reserve(sample_count_copy_size); - for (size_t i = 0; i < samples.size(); i += num_channels) { - buf.push_back(samples[i]); - buf.push_back(samples[i + 1]); + buf.reserve(samples.size() * num_channels / source_num_channels); + for (size_t i = 0; i < samples.size(); i += source_num_channels) { + for (size_t ch = 0; ch < num_channels; ch++) { + buf.push_back(samples[i + ch]); + } } queue.Push(buf); return; @@ -91,7 +91,6 @@ private: cubeb* ctx{}; cubeb_stream* stream_backend{}; u32 num_channels{}; - bool is_6_channel{}; Common::RingBuffer<s16, 0x10000> queue; std::array<s16, 2> last_frame; |