From 4118d880c3f20dbd9304a3f50d6d111f194592c8 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Mon, 7 Aug 2023 09:47:44 +1000 Subject: Fix dangle build issues, do some tweaks to investigate performance --- src/audio/sink_mixer.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/audio/sink_mixer.cpp') diff --git a/src/audio/sink_mixer.cpp b/src/audio/sink_mixer.cpp index ba306626..8a40fd63 100644 --- a/src/audio/sink_mixer.cpp +++ b/src/audio/sink_mixer.cpp @@ -15,7 +15,6 @@ #include "freertos/projdefs.h" #include "resample.hpp" #include "sample.hpp" -#include "samplerate.h" #include "stream_info.hpp" #include "tasks.hpp" @@ -23,7 +22,7 @@ static constexpr char kTag[] = "mixer"; static constexpr std::size_t kSourceBufferLength = 2 * 1024; -static constexpr std::size_t kSampleBufferLength = 4 * 1024; +static constexpr std::size_t kSampleBufferLength = 2 * 1024; namespace audio { @@ -33,8 +32,8 @@ SinkMixer::SinkMixer(StreamBufferHandle_t dest) resampler_(nullptr), source_(xStreamBufferCreate(kSourceBufferLength, 1)), sink_(dest) { - input_stream_.reset(new RawStream(kSampleBufferLength)); - resampled_stream_.reset(new RawStream(kSampleBufferLength)); + input_stream_.reset(new RawStream(kSampleBufferLength, MALLOC_CAP_SPIRAM)); + resampled_stream_.reset(new RawStream(kSampleBufferLength, MALLOC_CAP_SPIRAM)); tasks::StartPersistent([&]() { Main(); }); } @@ -188,9 +187,6 @@ auto SinkMixer::Resample(InputStream& in, OutputStream& out) -> bool { auto res = resampler_->Process(in.data_as(), out.data_as(), false); - ESP_LOGI(kTag, "resampler sent %u samples, consumed %u, produced %u", - in.data().size(), res.first, res.second); - in.consume(res.first * sizeof(sample::Sample)); out.add(res.first * sizeof(sample::Sample)); -- cgit v1.2.3