Skip to content

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

Improve progressive VOD retry recovery

Ensar Basri Kahvecid330cffa3d37
diff --git a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
index 740b1f52..aade2e68 100644
--- a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
+++ b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
@@ -1968,7 +1968,8 @@ class Media3PlayerEngine @Inject constructor(
resolvedStreamType = currentResolvedStreamType,
currentPositionMs = player?.currentPosition,
durationMs = player?.duration,
- isCurrentMediaItemLive = player?.isCurrentMediaItemLive == true
+ isCurrentMediaItemLive = player?.isCurrentMediaItemLive == true,
+ playbackStarted = playbackStarted
)
// retryGeneration captured and checked on Main — safe with
// Dispatchers.Main.immediate. If the scope dispatcher is ever changed
diff --git a/player/src/main/java/com/streamvault/player/playback/PlayerRetryPolicy.kt b/player/src/main/java/com/streamvault/player/playback/PlayerRetryPolicy.kt
index 7d207c8c..6d920487 100644
--- a/player/src/main/java/com/streamvault/player/playback/PlayerRetryPolicy.kt
+++ b/player/src/main/java/com/streamvault/player/playback/PlayerRetryPolicy.kt
@@ -105,7 +105,10 @@ class PlayerRetryPolicy(
PlaybackErrorCategory.FORMAT_UNSUPPORTED -> if (playbackStarted) 1 else 0
PlaybackErrorCategory.LIVE_WINDOW -> 1
- PlaybackErrorCategory.HTTP_SERVER -> if (streamContext.isLive) 3 else 2
+ PlaybackErrorCategory.HTTP_SERVER -> {
+ val isProgressive = streamContext.resolvedStreamType == ResolvedStreamType.PROGRESSIVE
+ if (streamContext.isLive || isProgressive) 3 else 2
+ }
PlaybackErrorCategory.NETWORK -> when {
error.hasCause<UnknownHostException>() -> 1
error.hasCause<SocketTimeoutException>() || error.hasCause<ConnectException>() ->
diff --git a/player/src/main/java/com/streamvault/player/playback/PlayerRetrySeekPositionPolicy.kt b/player/src/main/java/com/streamvault/player/playback/PlayerRetrySeekPositionPolicy.kt
index 04948369..e2ea5e89 100644
--- a/player/src/main/java/com/streamvault/player/playback/PlayerRetrySeekPositionPolicy.kt
+++ b/player/src/main/java/com/streamvault/player/playback/PlayerRetrySeekPositionPolicy.kt
@@ -7,14 +7,15 @@ internal fun resolveRetrySeekPositionMs(
resolvedStreamType: ResolvedStreamType,
currentPositionMs: Long?,
durationMs: Long?,
- isCurrentMediaItemLive: Boolean
+ isCurrentMediaItemLive: Boolean,
+ playbackStarted: 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.PROGRESSIVE -> positionMs.takeIf { playbackStarted }
ResolvedStreamType.HLS,
ResolvedStreamType.DASH,
ResolvedStreamType.SMOOTH_STREAMING,
diff --git a/player/src/test/java/com/streamvault/player/playback/PlayerRetryPolicyTest.kt b/player/src/test/java/com/streamvault/player/playback/PlayerRetryPolicyTest.kt
index ab4b9076..e16be75e 100644
--- a/player/src/test/java/com/streamvault/player/playback/PlayerRetryPolicyTest.kt
+++ b/player/src/test/java/com/streamvault/player/playback/PlayerRetryPolicyTest.kt
@@ -12,8 +12,13 @@ class PlayerRetryPolicyTest {
resolvedStreamType = ResolvedStreamType.HLS,
timeoutProfile = PlayerTimeoutProfile.LIVE
)
+ private val progressiveContext = PlaybackRetryContext(
+ resolvedStreamType = ResolvedStreamType.PROGRESSIVE,
+ timeoutProfile = PlayerTimeoutProfile.PROGRESSIVE
+ )
private val policy = PlayerRetryPolicy(liveContext) { false }
+ private val progressivePolicy = PlayerRetryPolicy(progressiveContext) { true }
@Test
fun `500 before first frame retries 3 times with expected backoff`() {
@@ -66,4 +71,14 @@ class PlayerRetryPolicyTest {
val error = IllegalStateException("decoder init failed")
assertThat(policy.shouldRetry(error, liveContext, playbackStarted = true, attempt = 1)).isFalse()
}
+
+ @Test
+ fun `progressive movie server errors get tolerant recovery after playback start`() {
+ val error = IOException("HTTP 502")
+ assertThat(progressivePolicy.shouldRetry(error, progressiveContext, playbackStarted = true, attempt = 1)).isTrue()
+ assertThat(progressivePolicy.shouldRetry(error, progressiveContext, playbackStarted = true, attempt = 2)).isTrue()
+ assertThat(progressivePolicy.shouldRetry(error, progressiveContext, playbackStarted = true, attempt = 3)).isTrue()
+ assertThat(progressivePolicy.shouldRetry(error, progressiveContext, playbackStarted = true, attempt = 4)).isFalse()
+ assertThat(progressivePolicy.maxAttempts(error, playbackStarted = true)).isEqualTo(3)
+ }
}
diff --git a/player/src/test/java/com/streamvault/player/playback/PlayerRetrySeekPositionPolicyTest.kt b/player/src/test/java/com/streamvault/player/playback/PlayerRetrySeekPositionPolicyTest.kt
index bcbe9f48..c944448b 100644
--- a/player/src/test/java/com/streamvault/player/playback/PlayerRetrySeekPositionPolicyTest.kt
+++ b/player/src/test/java/com/streamvault/player/playback/PlayerRetrySeekPositionPolicyTest.kt
@@ -13,12 +13,27 @@ class PlayerRetrySeekPositionPolicyTest {
resolvedStreamType = ResolvedStreamType.PROGRESSIVE,
currentPositionMs = 1_695_105L,
durationMs = C.TIME_UNSET,
- isCurrentMediaItemLive = false
+ isCurrentMediaItemLive = false,
+ playbackStarted = true
)
assertThat(seekPosition).isEqualTo(1_695_105L)
}
+ @Test
+ fun `startup retry for progressive movie does not preserve stuck resume position before first frame`() {
+ val seekPosition = resolveRetrySeekPositionMs(
+ category = PlaybackErrorCategory.NETWORK,
+ resolvedStreamType = ResolvedStreamType.PROGRESSIVE,
+ currentPositionMs = 1_001_654L,
+ durationMs = C.TIME_UNSET,
+ isCurrentMediaItemLive = false,
+ playbackStarted = false
+ )
+
+ assertThat(seekPosition).isNull()
+ }
+
@Test
fun `network retry for finite hls movie preserves current position`() {
val seekPosition = resolveRetrySeekPositionMs(
@@ -26,7 +41,8 @@ class PlayerRetrySeekPositionPolicyTest {
resolvedStreamType = ResolvedStreamType.HLS,
currentPositionMs = 1_695_105L,
durationMs = 7_200_000L,
- isCurrentMediaItemLive = false
+ isCurrentMediaItemLive = false,
+ playbackStarted = true
)
assertThat(seekPosition).isEqualTo(1_695_105L)
@@ -39,7 +55,8 @@ class PlayerRetrySeekPositionPolicyTest {
resolvedStreamType = ResolvedStreamType.HLS,
currentPositionMs = 1_695_105L,
durationMs = 7_200_000L,
- isCurrentMediaItemLive = true
+ isCurrentMediaItemLive = true,
+ playbackStarted = true
)
assertThat(seekPosition).isNull()
@@ -52,7 +69,8 @@ class PlayerRetrySeekPositionPolicyTest {
resolvedStreamType = ResolvedStreamType.PROGRESSIVE,
currentPositionMs = 1_695_105L,
durationMs = 7_200_000L,
- isCurrentMediaItemLive = false
+ isCurrentMediaItemLive = false,
+ playbackStarted = true
)
assertThat(seekPosition).isNull()