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/opus.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/codecs/opus.cpp') diff --git a/src/codecs/opus.cpp b/src/codecs/opus.cpp index e4917a33..2f700510 100644 --- a/src/codecs/opus.cpp +++ b/src/codecs/opus.cpp @@ -78,7 +78,7 @@ XiphOpusDecoder::~XiphOpusDecoder() { } } -auto XiphOpusDecoder::OpenStream(std::shared_ptr input) +auto XiphOpusDecoder::OpenStream(std::shared_ptr input,uint32_t offset) -> cpp::result { input_ = input; -- cgit v1.2.3 From aece1c6b58587aaeda0d1ce082df13e409f930f1 Mon Sep 17 00:00:00 2001 From: ailurux Date: Fri, 16 Feb 2024 16:48:53 +1100 Subject: Opus seeking impl --- src/codecs/opus.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/codecs/opus.cpp') diff --git a/src/codecs/opus.cpp b/src/codecs/opus.cpp index 2f700510..ec587bc7 100644 --- a/src/codecs/opus.cpp +++ b/src/codecs/opus.cpp @@ -128,6 +128,10 @@ auto XiphOpusDecoder::OpenStream(std::shared_ptr input,uint32_t offset) length = l * 2; } + if (offset) { + SeekTo(offset * 48000); + } + return OutputFormat{ .num_channels = 2, .sample_rate_hz = 48000, -- 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/opus.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'src/codecs/opus.cpp') diff --git a/src/codecs/opus.cpp b/src/codecs/opus.cpp index ec587bc7..a5220c4b 100644 --- a/src/codecs/opus.cpp +++ b/src/codecs/opus.cpp @@ -78,7 +78,8 @@ XiphOpusDecoder::~XiphOpusDecoder() { } } -auto XiphOpusDecoder::OpenStream(std::shared_ptr input,uint32_t offset) +auto XiphOpusDecoder::OpenStream(std::shared_ptr input, + uint32_t offset) -> cpp::result { input_ = input; @@ -128,8 +129,8 @@ auto XiphOpusDecoder::OpenStream(std::shared_ptr input,uint32_t offset) length = l * 2; } - if (offset) { - SeekTo(offset * 48000); + if (offset && op_pcm_seek(opus_, offset * 48000) != 0) { + return cpp::fail(Error::kInternalError); } return OutputFormat{ @@ -155,11 +156,4 @@ auto XiphOpusDecoder::DecodeTo(cpp::span output) }; } -auto XiphOpusDecoder::SeekTo(size_t target) -> cpp::result { - if (op_pcm_seek(opus_, target) != 0) { - return cpp::fail(Error::kInternalError); - } - return {}; -} - } // namespace codecs -- cgit v1.2.3