Skip to content

StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.

Fix movie retry position preservation

Ensar Basri Kahveci7fe6d643ca68
diff --git a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
index 1c9c2f2c..1ab01697 100644
--- a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
+++ b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
@@ -57,6 +57,7 @@ import com.streamvault.player.playback.PlayerRetryPolicy
import com.streamvault.player.playback.PlayerTimeoutProfile
import com.streamvault.player.playback.PreloadCoordinator
import com.streamvault.player.playback.ResolvedStreamType
+import com.streamvault.player.playback.resolveRetrySeekPositionMs
import com.streamvault.player.playback.StreamTypeResolver
import com.streamvault.player.playback.VideoStallDetector
import com.streamvault.player.stats.PlayerStatsCollector
@@ -1932,11 +1933,14 @@ class Media3PlayerEngine @Inject constructor(
val nextAttempt = retryAttempt + 1
if (retryPolicy.shouldRetry(error, retryContext, playbackStarted, nextAttempt)) {
val delayMs = retryPolicy.retryDelayMs(error, nextAttempt)
- val retrySeekPositionMs = exoPlayer?.currentPosition?.takeIf {
- category == PlaybackErrorCategory.FORMAT_UNSUPPORTED &&
- currentResolvedStreamType == ResolvedStreamType.PROGRESSIVE &&
- it > 0L
- }
+ val player = exoPlayer
+ val retrySeekPositionMs = resolveRetrySeekPositionMs(
+ category = category,
+ resolvedStreamType = currentResolvedStreamType,
+ currentPositionMs = player?.currentPosition,
+ durationMs = player?.duration,
+ isCurrentMediaItemLive = player?.isCurrentMediaItemLive == true
+ )
// retryGeneration captured and checked on Main — safe with
// Dispatchers.Main.immediate. If the scope dispatcher is ever changed
// (e.g. in tests), convert retryGeneration to AtomicLong.
diff --git a/player/src/main/java/com/streamvault/player/playback/PlayerRetrySeekPositionPolicy.kt b/player/src/main/java/com/streamvault/player/playback/PlayerRetrySeekPositionPolicy.kt
new file mode 100644
index 00000000..ee4efacd
--- /dev/null
+++ b/player/src/main/java/com/streamvault/player/playback/PlayerRetrySeekPositionPolicy.kt
@@ -0,0 +1,28 @@
+package com.streamvault.player.playback
+
+import androidx.media3.common.C
+
+internal fun resolveRetrySeekPositionMs(
+ category: PlaybackErrorCategory,
+ resolvedStreamType: ResolvedStreamType,
+ currentPositionMs: Long?,
+ durationMs: Long?,
+ isCurrentMediaItemLive: Boolean
+): Long? {
+ val positionMs = currentPositionMs?.takeIf { it > 0L } ?: return null
+ if (category == PlaybackErrorCategory.LIVE_WINDOW) return null
+ if (isCurrentMediaItemLive) return null
+
+ return when (resolvedStreamType) {
+ ResolvedStreamType.PROGRESSIVE -> positionMs
+ ResolvedStreamType.HLS,
+ ResolvedStreamType.DASH,
+ ResolvedStreamType.UNKNOWN -> positionMs.takeIf { durationMs.isFiniteMediaDuration() }
+ ResolvedStreamType.MPEG_TS_LIVE,
+ ResolvedStreamType.RTSP -> null
+ }
+}
+
+private fun Long?.isFiniteMediaDuration(): Boolean {
+ return this != null && this != C.TIME_UNSET && this > 0L
+}
diff --git a/player/src/test/java/com/streamvault/player/playback/PlayerRetrySeekPositionPolicyTest.kt b/player/src/test/java/com/streamvault/player/playback/PlayerRetrySeekPositionPolicyTest.kt
new file mode 100644
index 00000000..7daeea6e
--- /dev/null
+++ b/player/src/test/java/com/streamvault/player/playback/PlayerRetrySeekPositionPolicyTest.kt
@@ -0,0 +1,60 @@
+package com.streamvault.player.playback
+
+import androidx.media3.common.C
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class PlayerRetrySeekPositionPolicyTest {
+
+ @Test
+ fun `network retry for progressive movie preserves current position`() {
+ val seekPosition = resolveRetrySeekPositionMs(
+ category = PlaybackErrorCategory.NETWORK,
+ resolvedStreamType = ResolvedStreamType.PROGRESSIVE,
+ currentPositionMs = 1_695_105L,
+ durationMs = C.TIME_UNSET,
+ isCurrentMediaItemLive = false
+ )
+
+ assertThat(seekPosition).isEqualTo(1_695_105L)
+ }
+
+ @Test
+ fun `network retry for finite hls movie preserves current position`() {
+ val seekPosition = resolveRetrySeekPositionMs(
+ category = PlaybackErrorCategory.NETWORK,
+ resolvedStreamType = ResolvedStreamType.HLS,
+ currentPositionMs = 1_695_105L,
+ durationMs = 7_200_000L,
+ isCurrentMediaItemLive = false
+ )
+
+ assertThat(seekPosition).isEqualTo(1_695_105L)
+ }
+
+ @Test
+ fun `network retry for live hls does not seek into the live window`() {
+ val seekPosition = resolveRetrySeekPositionMs(
+ category = PlaybackErrorCategory.NETWORK,
+ resolvedStreamType = ResolvedStreamType.HLS,
+ currentPositionMs = 1_695_105L,
+ durationMs = 7_200_000L,
+ isCurrentMediaItemLive = true
+ )
+
+ assertThat(seekPosition).isNull()
+ }
+
+ @Test
+ fun `live window retry does not preserve stale position`() {
+ val seekPosition = resolveRetrySeekPositionMs(
+ category = PlaybackErrorCategory.LIVE_WINDOW,
+ resolvedStreamType = ResolvedStreamType.PROGRESSIVE,
+ currentPositionMs = 1_695_105L,
+ durationMs = 7_200_000L,
+ isCurrentMediaItemLive = false
+ )
+
+ assertThat(seekPosition).isNull()
+ }
+}