Merge branch 'v0.24.x'

Author: MaxKellermann

NEWS

@@ -13,6 +13,7 @@ ver 0.25 (not yet released)
 ver 0.24.6 (not yet released)
 * decoder
   - mpg123: another workaround for libmpg123 ID3 corruption bug
+  - opus: fix seeking in files with large OpusTags
 
 ver 0.24.5 (2025/07/31)
 * database

src/decoder/plugins/OggDecoder.cxx

@@ -75,7 +75,7 @@ OggDecoder::SeekGranulePos(ogg_int64_t where_granulepos)
 	static const ogg_int64_t MARGIN_BEFORE = 44100 / 3;
 	static const ogg_int64_t MARGIN_AFTER = 44100 / 10;
 
-	offset_type min_offset = 0, max_offset = input_stream.GetSize();
+	offset_type min_offset = first_offset, max_offset = input_stream.GetSize();
 	ogg_int64_t min_granule = 0, max_granule = end_granulepos;
 
 	while (true) {

src/decoder/plugins/OggDecoder.hxx

@@ -9,6 +9,23 @@
 #include "input/Offset.hxx"
 
 class OggDecoder : public OggVisitor {
+	/**
+	 * The file offset of the first audio packet (starts at
+	 * granulepos 0).  This is used by SeekGranulePos() to
+	 * interpolate the seek offset between this offset and
+	 * end-of-file, possibly skipping (large) tags preceding the
+	 * first audio packet.
+	 */
+	offset_type first_offset = 0;
+
+	/**
+	 * The granulepos at the end of the last packet.  This is used
+	 * to calculate the song duration and to calculate seek file
+	 * offsets.
+	 *
+	 * This field is uninitialized until UpdateEndGranulePos() is
+	 * called.
+	 */
 	ogg_int64_t end_granulepos;
 
 protected:
@@ -30,6 +47,25 @@ private:
 	ogg_int64_t LoadEndGranulePos() const;
 
 protected:
+	bool HasFirstOffset() const noexcept {
+		return first_offset > 0;
+	}
+
+	void SetFirstOffset(offset_type _first_offset) noexcept {
+		first_offset = _first_offset;
+	}
+
+	/**
+	 * If currently unset, set the #first_offset field to the
+	 * start of the most recent Ogg page.  Decoder implementations
+	 * should call this when they see the first page/packet
+	 * containing audio data.
+	 */
+	void AutoSetFirstOffset() noexcept {
+		if (!HasFirstOffset())
+			SetFirstOffset(GetStartOffset());
+	}
+
 	ogg_int64_t UpdateEndGranulePos() {
 		return end_granulepos = LoadEndGranulePos();
 	}

src/decoder/plugins/OpusDecoderPlugin.cxx

@@ -113,6 +113,14 @@ class MPDOpusDecoder final : public OggDecoder {
 	 */
 	bool submitted_replay_gain = false;
 
+	/**
+	 * This is true if a SEEK command was received from
+	 * DecoderClient::Ready().  We continue reading until we see
+	 * the first packet in order to apply ReplayGain and find the
+	 * file offset of the first audio packet.
+	 */
+	bool initial_seek = false;
+
 public:
 	explicit MPDOpusDecoder(DecoderReader &reader)
 		:OggDecoder(reader) {}
@@ -233,8 +241,17 @@ MPDOpusDecoder::OnOggBeginning(const ogg_packet &packet)
 					       * audio_format.channels];
 
 	auto cmd = client.GetCommand();
-	if (cmd != DecoderCommand::NONE)
+	if (cmd != DecoderCommand::NONE) {
+		if (cmd == DecoderCommand::SEEK) {
+			/* postpone the seek until we have found the
+			   first packet with audio data, i.e. after
+			   the AutoSetFirstOffset() call */
+			initial_seek = true;
+			return;
+		}
+
 		throw cmd;
+	}
 }
 
 void
@@ -277,7 +294,8 @@ MPDOpusDecoder::HandleTags(const ogg_packet &packet)
 	if (!tag_builder.empty()) {
 		Tag tag = tag_builder.Commit();
 		auto cmd = client.SubmitTag(input_stream, std::move(tag));
-		if (cmd != DecoderCommand::NONE)
+		if (cmd != DecoderCommand::NONE &&
+		    (cmd != DecoderCommand::SEEK || !initial_seek))
 			throw cmd;
 	}
 }
@@ -299,6 +317,16 @@ MPDOpusDecoder::HandleAudio(const ogg_packet &packet)
 		submitted_replay_gain = true;
 	}
 
+	AutoSetFirstOffset();
+
+	if (initial_seek) {
+		/* now that AutoSetFirstOffset() was called, we can do
+		   the seek (don't bother to waste time on decoding
+		   audio data) */
+		initial_seek = false;
+		throw DecoderCommand::SEEK;
+	}
+
 	int nframes = opus_decode(opus_decoder,
 				  (const unsigned char*)packet.packet,
 				  packet.bytes,

src/decoder/plugins/VorbisDecoderPlugin.cxx

@@ -266,6 +266,8 @@ VorbisDecoder::OnOggPacket(const ogg_packet &_packet)
 			vorbis_block_init(&dsp, &block);
 		}
 
+		AutoSetFirstOffset();
+
 		if (vorbis_synthesis(&block, &packet) != 0) {
 			/* ignore bad packets, but give the MPD core a
 			   chance to stop us */

src/event/Loop.cxx

@@ -411,7 +411,12 @@ EventLoop::UringWait(Event::Duration timeout) noexcept
            io_uring_prep_poll_multishot() is edge-triggered, so we
            have to consume all events to rearm it */
 
-	if (!epoll_ready) {
+	if (epoll_ready)
+		/* don't wait for io_uring completions if epoll is
+		   still ready */
+		timeout = Event::Duration{0};
+
+	{
 		struct __kernel_timespec timeout_buffer;
 		auto *kernel_timeout = ExportTimeoutKernelTimespec(timeout, timeout_buffer);
 		Uring::Queue &uring_queue = *uring;

src/lib/xiph/OggSyncState.cxx

@@ -51,7 +51,7 @@ OggSyncState::ExpectPageIn(ogg_stream_state &os)
 bool
 OggSyncState::ExpectPageSeek(ogg_page &page)
 {
-	size_t remaining_skipped = 65536;
+	size_t remaining_skipped = 1024 * 1024;
 
 	while (true) {
 		int r = ogg_sync_pageseek(&oy, &page);

src/neighbor/Glue.cxx

@@ -57,7 +57,7 @@ NeighborGlue::Open()
 			for (auto k = explorers.begin(); k != i; ++k)
 				k->explorer->Close();
 
-			std::throw_with_nested(FmtRuntimeError("Failed to open neighblor plugin {:?}",
+			std::throw_with_nested(FmtRuntimeError("Failed to open neighbor plugin {:?}",
 							       i->name));
 		}
 	}

subprojects/flac.wrap

@@ -3,11 +3,11 @@ directory = flac-1.5.0
 source_url = https://github.com/xiph/flac/releases/download/1.5.0/flac-1.5.0.tar.xz
 source_filename = flac-1.5.0.tar.xz
 source_hash = f2c1c76592a82ffff8413ba3c4a1299b6c7ab06c734dee03fd88630485c2b920
-patch_filename = flac_1.5.0-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/flac_1.5.0-1/get_patch
-patch_hash = c3d7dcb01d6e0a2bc066b12e789661fd9c4356500787004cfc1950d52babd6ca
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/flac_1.5.0-1/flac-1.5.0.tar.xz
-wrapdb_version = 1.5.0-1
+patch_filename = flac_1.5.0-2_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/flac_1.5.0-2/get_patch
+patch_hash = ee4cd8175784b4032e3b19dda1fe4c1d6d4b285dfa87fe94361f1a6fde732ff0
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/flac_1.5.0-2/flac-1.5.0.tar.xz
+wrapdb_version = 1.5.0-2
 
 [provide]
 flac = flac_dep

subprojects/gtest.wrap

@@ -3,11 +3,11 @@ directory = googletest-1.17.0
 source_url = https://github.com/google/googletest/archive/refs/tags/v1.17.0.tar.gz
 source_filename = googletest-1.17.0.tar.gz
 source_hash = 65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c
-patch_filename = gtest_1.17.0-3_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/gtest_1.17.0-3/get_patch
-patch_hash = 3e2799683f27c6dce138b7bae823416581c467ddde755c9a516c0863225f0ceb
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/gtest_1.17.0-3/googletest-1.17.0.tar.gz
-wrapdb_version = 1.17.0-3
+patch_filename = gtest_1.17.0-4_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/gtest_1.17.0-4/get_patch
+patch_hash = 3abf7662d09db706453a5b064a1e914678c74b9d9b0b19382747ca561d0d8750
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/gtest_1.17.0-4/googletest-1.17.0.tar.gz
+wrapdb_version = 1.17.0-4
 
 [provide]
 gtest = gtest_dep