diff options
| author | jacqueline <me@jacqueline.id.au> | 2023-05-23 09:12:26 +1000 |
|---|---|---|
| committer | jacqueline <me@jacqueline.id.au> | 2023-05-23 09:13:22 +1000 |
| commit | 4bff06c76c223a156a14adc478ab1a9b083fd7b2 (patch) | |
| tree | 107eec046f70ecbdc6a942fc714b9f68f0b0b23d /src/audio/include | |
| parent | ecee01fe97422c65e2b01979742d01ece31bc28d (diff) | |
| download | tangara-fw-4bff06c76c223a156a14adc478ab1a9b083fd7b2.tar.gz | |
Drop himem audio buffers (for now?)
For some reason the spinlocks required now block forever? Very odd.
On the plus side, this turned out to be the issue that was stopping the
audio pipeline from running on the app core.
Diffstat (limited to 'src/audio/include')
| -rw-r--r-- | src/audio/include/pipeline.hpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/audio/include/pipeline.hpp b/src/audio/include/pipeline.hpp index 7a658a38..1fa7da83 100644 --- a/src/audio/include/pipeline.hpp +++ b/src/audio/include/pipeline.hpp @@ -8,7 +8,6 @@ #include "freertos/portmacro.h" #include "audio_element.hpp" -#include "himem.hpp" #include "stream_info.hpp" namespace audio { @@ -25,10 +24,9 @@ class Pipeline { auto NumInputs() const -> std::size_t; - auto InStreams(std::vector<MappableRegion<kPipelineBufferSize>>*, - std::vector<RawStream>*) -> void; + auto InStreams(std::vector<RawStream>*) -> void; - auto OutStream(MappableRegion<kPipelineBufferSize>*) -> RawStream; + auto OutStream() -> RawStream; auto GetIterationOrder() -> std::vector<Pipeline*>; @@ -36,7 +34,7 @@ class Pipeline { IAudioElement* root_; std::vector<std::unique_ptr<Pipeline>> subtrees_; - HimemAlloc<kPipelineBufferSize> output_buffer_; + std::array<std::byte, kPipelineBufferSize> output_buffer_; StreamInfo output_info_; }; |
