From 62f6179abe24339c2e5b7350528afbcad4c52067 Mon Sep 17 00:00:00 2001 From: ailurux Date: Thu, 15 Feb 2024 16:12:07 +1100 Subject: Added offset for track seeking, wav impl. only rn --- src/codecs/wav.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/codecs/wav.cpp') diff --git a/src/codecs/wav.cpp b/src/codecs/wav.cpp index a67f3ff4..652f4f88 100644 --- a/src/codecs/wav.cpp +++ b/src/codecs/wav.cpp @@ -84,7 +84,7 @@ WavDecoder::WavDecoder() : input_(), buffer_() {} WavDecoder::~WavDecoder() {} -auto WavDecoder::OpenStream(std::shared_ptr input) +auto WavDecoder::OpenStream(std::shared_ptr input,uint32_t offset) -> cpp::result { input_ = input; @@ -199,8 +199,10 @@ auto WavDecoder::OpenStream(std::shared_ptr input) return cpp::fail(Error::kUnsupportedFormat); } + auto data_offset = offset * samples_per_second * bits_per_sample; + // Seek track to start of data - input->SeekTo(data_chunk_index + 8, IStream::SeekFrom::kStartOfStream); + input->SeekTo(data_chunk_index + 8 + data_offset, IStream::SeekFrom::kStartOfStream); output_format_ = {.num_channels = (uint8_t)num_channels_, .sample_rate_hz = samples_per_second, -- cgit v1.2.3 From a49d754da6c293445be16ac643d10849c01ea96b Mon Sep 17 00:00:00 2001 From: ailurux Date: Fri, 16 Feb 2024 10:57:47 +1100 Subject: Seeking working with hardcoded event, wav only --- src/codecs/wav.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/codecs/wav.cpp') diff --git a/src/codecs/wav.cpp b/src/codecs/wav.cpp index 652f4f88..22cbd49c 100644 --- a/src/codecs/wav.cpp +++ b/src/codecs/wav.cpp @@ -199,7 +199,7 @@ auto WavDecoder::OpenStream(std::shared_ptr input,uint32_t offset) return cpp::fail(Error::kUnsupportedFormat); } - auto data_offset = offset * samples_per_second * bits_per_sample; + int64_t data_offset = offset * samples_per_second * bytes_per_sample_; // Seek track to start of data input->SeekTo(data_chunk_index + 8 + data_offset, IStream::SeekFrom::kStartOfStream); @@ -218,6 +218,7 @@ auto WavDecoder::DecodeTo(cpp::span output) buffer_.ConsumeBytes([&](cpp::span buf) -> size_t { size_t bytes_read = buf.size_bytes(); + ESP_LOGI(kTag, "Bytes read: %d", bytes_read); size_t frames_read = bytes_read / bytes_per_sample_ / output_format_.num_channels; @@ -243,6 +244,11 @@ auto WavDecoder::DecodeTo(cpp::span output) return samples_written * bytes_per_sample_; }); + ESP_LOGI(kTag, "Samples written %d", samples_written); + if (is_eof) { + ESP_LOGI(kTag, "EOF"); + } + return OutputInfo{.samples_written = samples_written, .is_stream_finished = samples_written == 0 && is_eof}; } -- cgit v1.2.3 From 665679b8854d34c13d8eb92167aa8a4691619d8b Mon Sep 17 00:00:00 2001 From: ailurux Date: Fri, 16 Feb 2024 12:55:11 +1100 Subject: WIP: seeking in lua example --- src/codecs/wav.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/codecs/wav.cpp') diff --git a/src/codecs/wav.cpp b/src/codecs/wav.cpp index 22cbd49c..5dd6f031 100644 --- a/src/codecs/wav.cpp +++ b/src/codecs/wav.cpp @@ -218,7 +218,6 @@ auto WavDecoder::DecodeTo(cpp::span output) buffer_.ConsumeBytes([&](cpp::span buf) -> size_t { size_t bytes_read = buf.size_bytes(); - ESP_LOGI(kTag, "Bytes read: %d", bytes_read); size_t frames_read = bytes_read / bytes_per_sample_ / output_format_.num_channels; @@ -244,10 +243,6 @@ auto WavDecoder::DecodeTo(cpp::span output) return samples_written * bytes_per_sample_; }); - ESP_LOGI(kTag, "Samples written %d", samples_written); - if (is_eof) { - ESP_LOGI(kTag, "EOF"); - } return OutputInfo{.samples_written = samples_written, .is_stream_finished = samples_written == 0 && is_eof}; -- cgit v1.2.3 From e7e6c70fb31d33ae1e79f9841f5b6fe227f6ebf3 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Thu, 29 Feb 2024 12:18:17 +1100 Subject: Remove unused 'SeekTo' method on codecs --- src/codecs/wav.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/codecs/wav.cpp') diff --git a/src/codecs/wav.cpp b/src/codecs/wav.cpp index 5dd6f031..143a7a4b 100644 --- a/src/codecs/wav.cpp +++ b/src/codecs/wav.cpp @@ -248,10 +248,6 @@ auto WavDecoder::DecodeTo(cpp::span output) .is_stream_finished = samples_written == 0 && is_eof}; } -auto WavDecoder::SeekTo(size_t target) -> cpp::result { - return {}; -} - auto codecs::WavDecoder::GetFormat() const -> uint16_t { if (wave_format_ == kWaveFormatExtensible) { return subformat_; -- cgit v1.2.3