summaryrefslogtreecommitdiff
path: root/src/audio/include
diff options
context:
space:
mode:
authorjacqueline <me@jacqueline.id.au>2023-09-26 17:23:34 +1000
committerjacqueline <me@jacqueline.id.au>2023-09-26 17:23:34 +1000
commit8608f9367fc29e498f42f5249aa248dd2044d567 (patch)
treec8564bfe6bbc6c5a9413bbd29b4e52f2cf3bd35c /src/audio/include
parent4d99d22e10a3cb2a421da1618c127128816613c9 (diff)
downloadtangara-fw-8608f9367fc29e498f42f5249aa248dd2044d567.tar.gz
Tune buffer sizes and locations for I2S
Diffstat (limited to 'src/audio/include')
-rw-r--r--src/audio/include/audio_sink.hpp5
-rw-r--r--src/audio/include/bt_audio_output.hpp2
-rw-r--r--src/audio/include/i2s_audio_output.hpp3
3 files changed, 5 insertions, 5 deletions
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<drivers::I2SDac> dac);
~I2SAudioOutput();