diff --git a/src/codecs/CMakeLists.txt b/src/codecs/CMakeLists.txt index a1221adf..a6a48c84 100644 --- a/src/codecs/CMakeLists.txt +++ b/src/codecs/CMakeLists.txt @@ -4,7 +4,7 @@ idf_component_register( SRCS "dr_flac.cpp" "codec.cpp" "mad.cpp" "opus.cpp" "vorbis.cpp" - "source_buffer.cpp" "sample.cpp" "wav.cpp" + "source_buffer.cpp" "sample.cpp" "wav.cpp" "native.cpp" INCLUDE_DIRS "include" REQUIRES "result" "libmad" "drflac" "tremor" "opusfile" "memory" "util" "komihash") diff --git a/src/codecs/codec.cpp b/src/codecs/codec.cpp index c8e1a72c..af5702ff 100644 --- a/src/codecs/codec.cpp +++ b/src/codecs/codec.cpp @@ -11,6 +11,7 @@ #include "dr_flac.hpp" #include "mad.hpp" +#include "native.hpp" #include "opus.hpp" #include "types.hpp" #include "vorbis.hpp" @@ -30,6 +31,8 @@ auto StreamTypeToString(StreamType t) -> std::string { return "Flac"; case StreamType::kOpus: return "Opus"; + case StreamType::kNative: + return "Native"; default: return ""; } @@ -47,6 +50,8 @@ auto CreateCodecForType(StreamType type) -> std::optional { return new XiphOpusDecoder(); case StreamType::kWav: return new WavDecoder(); + case StreamType::kNative: + return new NativeDecoder(); default: return {}; } diff --git a/src/codecs/include/native.hpp b/src/codecs/include/native.hpp new file mode 100644 index 00000000..8f544e13 --- /dev/null +++ b/src/codecs/include/native.hpp @@ -0,0 +1,41 @@ +/* + * Copyright 2023 jacqueline + * + * SPDX-License-Identifier: GPL-3.0-only + */ + +#pragma once + +#include +#include +#include +#include +#include +#include + +#include "mad.h" +#include "sample.hpp" +#include "source_buffer.hpp" + +#include "codec.hpp" + +namespace codecs { + +class NativeDecoder : public ICodec { + public: + NativeDecoder(); + + auto OpenStream(std::shared_ptr input, uint32_t offset) + -> cpp::result override; + + auto DecodeTo(std::span destination) + -> cpp::result override; + + NativeDecoder(const NativeDecoder&) = delete; + NativeDecoder& operator=(const NativeDecoder&) = delete; + + private: + std::shared_ptr input_; +}; + +} // namespace codecs diff --git a/src/codecs/include/types.hpp b/src/codecs/include/types.hpp index c6dcb486..2bc63b10 100644 --- a/src/codecs/include/types.hpp +++ b/src/codecs/include/types.hpp @@ -16,8 +16,9 @@ enum class StreamType { kFlac, kOpus, kWav, + kNative, }; auto StreamTypeToString(StreamType t) -> std::string; - + } // namespace codecs diff --git a/src/codecs/native.cpp b/src/codecs/native.cpp new file mode 100644 index 00000000..124434e8 --- /dev/null +++ b/src/codecs/native.cpp @@ -0,0 +1,48 @@ +/* + * Copyright 2023 jacqueline + * + * SPDX-License-Identifier: GPL-3.0-only + */ + +#include "native.hpp" + +#include +#include +#include + +#include "esp_heap_caps.h" +#include "mad.h" + +#include "codec.hpp" +#include "esp_log.h" +#include "result.hpp" +#include "sample.hpp" +#include "types.hpp" + +namespace codecs { + +NativeDecoder::NativeDecoder() : input_() {} + +auto NativeDecoder::OpenStream(std::shared_ptr input, uint32_t offset) + -> cpp::result { + input_ = input; + return OutputFormat{ + .num_channels = 1, + .sample_rate_hz = 48000, + .total_samples = {}, + }; +} + +auto NativeDecoder::DecodeTo(std::span output) + -> cpp::result { + size_t bytes = input_->Read({ + reinterpret_cast(output.data()), + output.size_bytes(), + }); + return OutputInfo{ + .samples_written = bytes / sizeof(sample::Sample), + .is_stream_finished = false, + }; +} + +} // namespace codecs