MightyPork/tangara-fw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix (improve?) libtremor strangeness

Browse Source 
something fucky
This commit is contained in:
jacqueline
2024-02-13 16:39:56 +11:00
parent 3bb002b6b8
commit b31bc07555
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/tremor/CMakeLists.txt
+2
View File
@@ -6,3 +6,5 @@ idf_component_register(
res012.c sharedbook.c synthesis.c vorbisfile.c window.c res012.c sharedbook.c synthesis.c vorbisfile.c window.c
INCLUDE_DIRS "." INCLUDE_DIRS "."
REQUIRES "ogg") REQUIRES "ogg")
target_compile_options("${COMPONENT_LIB}" PRIVATE -Og)
src/codecs/include/vorbis.hpp
+1 -1
View File
@@ -41,7 +41,7 @@ class TremorVorbisDecoder : public ICodec {
private: private:
std::shared_ptr<IStream> input_; std::shared_ptr<IStream> input_;
OggVorbis_File vorbis_; std::unique_ptr<OggVorbis_File> vorbis_;
}; };
} // namespace codecs } // namespace codecs
src/codecs/vorbis.cpp
+15 -10
View File
@@ -78,17 +78,21 @@ static const ov_callbacks kCallbacks{
.tell_func = tell_cb, // Not seekable .tell_func = tell_cb, // Not seekable
}; };
TremorVorbisDecoder::TremorVorbisDecoder() : input_(), vorbis_() {} TremorVorbisDecoder::TremorVorbisDecoder()
: input_(),
vorbis_(reinterpret_cast<OggVorbis_File*>(
heap_caps_malloc(sizeof(OggVorbis_File),
MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT))) {}
TremorVorbisDecoder::~TremorVorbisDecoder() { TremorVorbisDecoder::~TremorVorbisDecoder() {
ov_clear(&vorbis_); ov_clear(vorbis_.get());
} }
auto TremorVorbisDecoder::OpenStream(std::shared_ptr<IStream> input) auto TremorVorbisDecoder::OpenStream(std::shared_ptr<IStream> input)
-> cpp::result<OutputFormat, Error> { -> cpp::result<OutputFormat, Error> {
int res = ov_open_callbacks(input.get(), &vorbis_, NULL, 0, kCallbacks); int res = ov_open_callbacks(input.get(), vorbis_.get(), NULL, 0, kCallbacks);
if (res < 0) { if (res < 0) {
std::pmr::string err; std::string err;
switch (res) { switch (res) {
case OV_EREAD: case OV_EREAD:
err = "OV_EREAD"; err = "OV_EREAD";
@@ -112,13 +116,13 @@ auto TremorVorbisDecoder::OpenStream(std::shared_ptr<IStream> input)
return cpp::fail(Error::kMalformedData); return cpp::fail(Error::kMalformedData);
} }
vorbis_info* info = ov_info(&vorbis_, -1); vorbis_info* info = ov_info(vorbis_.get(), -1);
if (info == NULL) { if (info == NULL) {
ESP_LOGE(kTag, "failed to get stream info"); ESP_LOGE(kTag, "failed to get stream info");
return cpp::fail(Error::kMalformedData); return cpp::fail(Error::kMalformedData);
} }
auto l = ov_pcm_total(&vorbis_, -1); auto l = ov_pcm_total(vorbis_.get(), -1);
std::optional<uint32_t> length; std::optional<uint32_t> length;
if (l > 0) { if (l > 0) {
length = l * info->channels; length = l * info->channels;
@@ -133,9 +137,10 @@ auto TremorVorbisDecoder::OpenStream(std::shared_ptr<IStream> input)
auto TremorVorbisDecoder::DecodeTo(cpp::span<sample::Sample> output) auto TremorVorbisDecoder::DecodeTo(cpp::span<sample::Sample> output)
-> cpp::result<OutputInfo, Error> { -> cpp::result<OutputInfo, Error> {
int bitstream = 0; int unused = 0;
long bytes_written = ov_read(&vorbis_, reinterpret_cast<char*>(output.data()), long bytes_written =
output.size_bytes(), &bitstream); ov_read(vorbis_.get(), reinterpret_cast<char*>(output.data()),
((output.size() - 1) * sizeof(sample::Sample)), &unused);
if (bytes_written == OV_HOLE) { if (bytes_written == OV_HOLE) {
ESP_LOGE(kTag, "got OV_HOLE"); ESP_LOGE(kTag, "got OV_HOLE");
return cpp::fail(Error::kMalformedData); return cpp::fail(Error::kMalformedData);
@@ -152,7 +157,7 @@ auto TremorVorbisDecoder::DecodeTo(cpp::span<sample::Sample> output)
} }
auto TremorVorbisDecoder::SeekTo(size_t target) -> cpp::result<void, Error> { auto TremorVorbisDecoder::SeekTo(size_t target) -> cpp::result<void, Error> {
if (ov_pcm_seek(&vorbis_, target) != 0) { if (ov_pcm_seek(vorbis_.get(), target) != 0) {
return cpp::fail(Error::kInternalError); return cpp::fail(Error::kInternalError);
} }
return {}; return {};