summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMerryMage <MerryMage@users.noreply.github.com>2016-08-31 17:55:10 +0200
committerMerryMage <MerryMage@users.noreply.github.com>2016-08-31 17:55:10 +0200
commit0ef4185644def3e7d99d88af3c8dd27d40660c82 (patch)
tree0a6b8f018184ea30b5b8471520bd426b6de52b65
parentMerge pull request #2034 from JayFoxRox/avoid-glsl-error (diff)
downloadyuzu-0ef4185644def3e7d99d88af3c8dd27d40660c82.tar
yuzu-0ef4185644def3e7d99d88af3c8dd27d40660c82.tar.gz
yuzu-0ef4185644def3e7d99d88af3c8dd27d40660c82.tar.bz2
yuzu-0ef4185644def3e7d99d88af3c8dd27d40660c82.tar.lz
yuzu-0ef4185644def3e7d99d88af3c8dd27d40660c82.tar.xz
yuzu-0ef4185644def3e7d99d88af3c8dd27d40660c82.tar.zst
yuzu-0ef4185644def3e7d99d88af3c8dd27d40660c82.zip
-rw-r--r--src/audio_core/hle/dsp.cpp3
-rw-r--r--src/audio_core/null_sink.h2
-rw-r--r--src/audio_core/sdl2_sink.cpp6
-rw-r--r--src/audio_core/sdl2_sink.h2
-rw-r--r--src/audio_core/sink.h5
5 files changed, 9 insertions, 9 deletions
diff --git a/src/audio_core/hle/dsp.cpp b/src/audio_core/hle/dsp.cpp
index 0640e1eff..a195bc74c 100644
--- a/src/audio_core/hle/dsp.cpp
+++ b/src/audio_core/hle/dsp.cpp
@@ -90,7 +90,8 @@ static AudioCore::TimeStretcher time_stretcher;
static void OutputCurrentFrame(const StereoFrame16& frame) {
time_stretcher.AddSamples(&frame[0][0], frame.size());
- sink->EnqueueSamples(time_stretcher.Process(sink->SamplesInQueue()));
+ std::vector<s16> stretched_samples = time_stretcher.Process(sink->SamplesInQueue());
+ sink->EnqueueSamples(stretched_samples.data(), stretched_samples.size() / 2);
}
// Public Interface
diff --git a/src/audio_core/null_sink.h b/src/audio_core/null_sink.h
index faf0ee4e1..9931c4778 100644
--- a/src/audio_core/null_sink.h
+++ b/src/audio_core/null_sink.h
@@ -19,7 +19,7 @@ public:
return native_sample_rate;
}
- void EnqueueSamples(const std::vector<s16>&) override {}
+ void EnqueueSamples(const s16*, size_t) override {}
size_t SamplesInQueue() const override {
return 0;
diff --git a/src/audio_core/sdl2_sink.cpp b/src/audio_core/sdl2_sink.cpp
index dc75c04ee..311dd5b59 100644
--- a/src/audio_core/sdl2_sink.cpp
+++ b/src/audio_core/sdl2_sink.cpp
@@ -71,14 +71,12 @@ unsigned int SDL2Sink::GetNativeSampleRate() const {
return impl->sample_rate;
}
-void SDL2Sink::EnqueueSamples(const std::vector<s16>& samples) {
+void SDL2Sink::EnqueueSamples(const s16* samples, size_t sample_count) {
if (impl->audio_device_id <= 0)
return;
- ASSERT_MSG(samples.size() % 2 == 0, "Samples must be in interleaved stereo PCM16 format (size must be a multiple of two)");
-
SDL_LockAudioDevice(impl->audio_device_id);
- impl->queue.emplace_back(samples);
+ impl->queue.emplace_back(samples, samples + sample_count * 2);
SDL_UnlockAudioDevice(impl->audio_device_id);
}
diff --git a/src/audio_core/sdl2_sink.h b/src/audio_core/sdl2_sink.h
index 0f296b673..b13827214 100644
--- a/src/audio_core/sdl2_sink.h
+++ b/src/audio_core/sdl2_sink.h
@@ -18,7 +18,7 @@ public:
unsigned int GetNativeSampleRate() const override;
- void EnqueueSamples(const std::vector<s16>& samples) override;
+ void EnqueueSamples(const s16* samples, size_t sample_count) override;
size_t SamplesInQueue() const override;
diff --git a/src/audio_core/sink.h b/src/audio_core/sink.h
index 1c881c3d2..a06fc3dcc 100644
--- a/src/audio_core/sink.h
+++ b/src/audio_core/sink.h
@@ -23,9 +23,10 @@ public:
/**
* Feed stereo samples to sink.
- * @param samples Samples in interleaved stereo PCM16 format. Size of vector must be multiple of two.
+ * @param samples Samples in interleaved stereo PCM16 format.
+ * @param sample_count Number of samples.
*/
- virtual void EnqueueSamples(const std::vector<s16>& samples) = 0;
+ virtual void EnqueueSamples(const s16* samples, size_t sample_count) = 0;
/// Samples enqueued that have not been played yet.
virtual std::size_t SamplesInQueue() const = 0;