diff --git a/app/src/main/kotlin/com/subtracks/data/source/StreamLength.kt b/app/src/main/kotlin/com/subtracks/data/source/StreamLength.kt index 5f7e6452..38490225 100644 --- a/app/src/main/kotlin/com/subtracks/data/source/StreamLength.kt +++ b/app/src/main/kotlin/com/subtracks/data/source/StreamLength.kt @@ -10,12 +10,18 @@ private const val LOSSLESS_CEILING_BPS = 9_216_000L private const val OVERHEAD_BYTES = 256L * 1024L private val LOSSLESS_FORMATS = setOf("flac", "wav", "alac") +// Ogg-based streams seek by binary-searching for the last page from the end of the file, so a +// length estimate that overshoots makes the player read past the real data and the server answers +// 416 (POSITION_OUT_OF_RANGE). These get no estimate and seek only within what is buffered. +private val END_SEEKING_FORMATS = setOf("opus", "ogg", "vorbis") + fun declaredStreamLength( durationMs: Long?, quality: StreamQuality, ): Long? { if (durationMs == null || durationMs <= 0) return null if (!quality.transcodes) return null + if (quality.format?.lowercase() in END_SEEKING_FORMATS) return null val bps = when { quality.format?.lowercase() in LOSSLESS_FORMATS -> LOSSLESS_CEILING_BPS diff --git a/app/src/test/kotlin/com/subtracks/data/source/StreamLengthTest.kt b/app/src/test/kotlin/com/subtracks/data/source/StreamLengthTest.kt index ea4991d1..07f3c03b 100644 --- a/app/src/test/kotlin/com/subtracks/data/source/StreamLengthTest.kt +++ b/app/src/test/kotlin/com/subtracks/data/source/StreamLengthTest.kt @@ -39,6 +39,13 @@ class StreamLengthTest { assertTrue(cdQuality >= 320 * 1_411_200 / 8) } + @Test + fun oggBasedFormatsGetNoEstimateBecauseSeekingReadsFromTheEnd() { + assertNull(declaredStreamLength(180_000, StreamQuality(128, "opus"))) + assertNull(declaredStreamLength(180_000, StreamQuality(128, "ogg"))) + assertNull(declaredStreamLength(180_000, StreamQuality(128, "vorbis"))) + } + @Test fun theLengthSuffixRoundTripsThroughTheFragment() { val uri = "http://host/rest/stream.view?id=s1" + streamLengthSuffix(1_234_567)