From 4e27de21e49900963ffa61cc9c0a676bb028f992 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Wed, 16 Aug 2023 10:57:55 +1000 Subject: clean up a bunch of obselete audio code --- src/audio/chunk.cpp | 71 ----------------------------------------------------- 1 file changed, 71 deletions(-) delete mode 100644 src/audio/chunk.cpp (limited to 'src/audio/chunk.cpp') diff --git a/src/audio/chunk.cpp b/src/audio/chunk.cpp deleted file mode 100644 index 11503b2b..00000000 --- a/src/audio/chunk.cpp +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright 2023 jacqueline - * - * SPDX-License-Identifier: GPL-3.0-only - */ - -#include "chunk.hpp" - -#include -#include -#include -#include -#include - -#include "cbor.h" -#include "esp_log.h" - -#include "stream_buffer.hpp" -#include "stream_message.hpp" - -namespace audio { - -static const std::size_t kWorkingBufferMultiple = 2; - -ChunkReader::ChunkReader(std::size_t chunk_size) - : raw_working_buffer_(static_cast( - heap_caps_malloc(chunk_size * kWorkingBufferMultiple, - MALLOC_CAP_SPIRAM))), - working_buffer_(raw_working_buffer_, - chunk_size * kWorkingBufferMultiple) {} - -ChunkReader::~ChunkReader() { - free(raw_working_buffer_); -} - -auto ChunkReader::HandleNewData(cpp::span data) - -> cpp::span { - assert(leftover_bytes_ + data.size() <= working_buffer_.size()); - // Copy the new data onto the front for anything that was left over from the - // last portion. Note: this could be optimised for the '0 leftover bytes' - // case, which technically shouldn't need a copy. - std::copy(data.begin(), data.end(), - working_buffer_.begin() + leftover_bytes_); - last_data_in_working_buffer_ = - working_buffer_.first(leftover_bytes_ + data.size()); - leftover_bytes_ = 0; - return last_data_in_working_buffer_; -} - -auto ChunkReader::HandleBytesUsed(std::size_t bytes_used) -> void { - HandleBytesLeftOver(last_data_in_working_buffer_.size() - bytes_used); -} -auto ChunkReader::HandleBytesLeftOver(std::size_t bytes_left) -> void { - leftover_bytes_ = bytes_left; - - // Ensure that we don't have more than a chunk of leftever bytes. This is - // bad, because we probably won't have enough data to store the next chunk. - assert(leftover_bytes_ <= working_buffer_.size() / kWorkingBufferMultiple); - - if (leftover_bytes_ > 0) { - auto data_to_keep = last_data_in_working_buffer_.last(leftover_bytes_); - std::copy(data_to_keep.begin(), data_to_keep.end(), - working_buffer_.begin()); - } -} - -auto ChunkReader::GetLeftovers() -> cpp::span { - return working_buffer_.first(leftover_bytes_); -} - -} // namespace audio -- cgit v1.2.3