From 8608f9367fc29e498f42f5249aa248dd2044d567 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Tue, 26 Sep 2023 17:23:34 +1000 Subject: Tune buffer sizes and locations for I2S --- src/audio/include/audio_sink.hpp | 5 ++--- src/audio/include/bt_audio_output.hpp | 2 +- src/audio/include/i2s_audio_output.hpp | 3 ++- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/audio/include') diff --git a/src/audio/include/audio_sink.hpp b/src/audio/include/audio_sink.hpp index 4baa4aa1..6a7f95bf 100644 --- a/src/audio/include/audio_sink.hpp +++ b/src/audio/include/audio_sink.hpp @@ -27,10 +27,9 @@ class IAudioOutput { StreamBufferHandle_t stream_; public: - IAudioOutput(size_t buffer_size, uint32_t caps) - : stream_(xStreamBufferCreateWithCaps(buffer_size, 1, caps)) {} + IAudioOutput(StreamBufferHandle_t stream) : stream_(stream) {} - virtual ~IAudioOutput() { vStreamBufferDeleteWithCaps(stream_); } + virtual ~IAudioOutput() {} /* * Indicates whether this output is currently being sent samples. If this is diff --git a/src/audio/include/bt_audio_output.hpp b/src/audio/include/bt_audio_output.hpp index 734a7ed1..d3d2bc19 100644 --- a/src/audio/include/bt_audio_output.hpp +++ b/src/audio/include/bt_audio_output.hpp @@ -21,7 +21,7 @@ namespace audio { class BluetoothAudioOutput : public IAudioOutput { public: - BluetoothAudioOutput(drivers::Bluetooth& bt); + BluetoothAudioOutput(StreamBufferHandle_t, drivers::Bluetooth& bt); ~BluetoothAudioOutput(); auto SetInUse(bool) -> void override; diff --git a/src/audio/include/i2s_audio_output.hpp b/src/audio/include/i2s_audio_output.hpp index 17f6b71a..004cb8f8 100644 --- a/src/audio/include/i2s_audio_output.hpp +++ b/src/audio/include/i2s_audio_output.hpp @@ -20,7 +20,8 @@ namespace audio { class I2SAudioOutput : public IAudioOutput { public: - I2SAudioOutput(drivers::IGpios& expander, + I2SAudioOutput(StreamBufferHandle_t, + drivers::IGpios& expander, std::unique_ptr dac); ~I2SAudioOutput(); -- cgit v1.2.3