Skip to content

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

Fix live HLS source error recovery

Ensar Basri Kahvecicb052f75a0bc
diff --git a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
index aade2e68..4a37209e 100644
--- a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
+++ b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
@@ -58,6 +58,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.resolveRetryAttemptAfterPlaybackStarted
import com.streamvault.player.playback.resolveRetryAttemptAfterReady
import com.streamvault.player.playback.resolveRetrySeekPositionMs
import com.streamvault.player.playback.StreamTypeResolver
@@ -1229,8 +1230,7 @@ class Media3PlayerEngine @Inject constructor(
_retryStatus.value = null
retryAttempt = resolveRetryAttemptAfterReady(
currentAttempt = retryAttempt,
- playbackStarted = playbackStarted,
- isCurrentMediaItemLive = exoPlayer?.isCurrentMediaItemLive == true
+ playbackStarted = playbackStarted
)
if (isPlayingTimeshiftSnapshot && pendingTimeshiftSeekToEnd) {
pendingTimeshiftSeekToEnd = false
@@ -1379,6 +1379,7 @@ class Media3PlayerEngine @Inject constructor(
private fun markPlaybackStarted(reason: String) {
if (playbackStarted) return
playbackStarted = true
+ retryAttempt = resolveRetryAttemptAfterPlaybackStarted(retryAttempt)
Log.i(
TAG,
"$reason streamType=$currentResolvedStreamType timeoutProfile=$currentTimeoutProfile audioPath=$audioOutputPath compatibilitySource=$compatibilityDecisionSource target=${PlaybackLogSanitizer.sanitizeUrl(lastStreamInfo?.url)}"
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 6d920487..c8197dcd 100644
--- a/player/src/main/java/com/streamvault/player/playback/PlayerRetryPolicy.kt
+++ b/player/src/main/java/com/streamvault/player/playback/PlayerRetryPolicy.kt
@@ -117,7 +117,11 @@ class PlayerRetryPolicy(
else -> 1
}
- PlaybackErrorCategory.SOURCE_MALFORMED -> if (playbackStarted) 0 else 1
+ PlaybackErrorCategory.SOURCE_MALFORMED -> when {
+ streamContext.isLive && playbackStarted -> 3
+ playbackStarted -> 0
+ else -> 1
+ }
PlaybackErrorCategory.UNKNOWN -> if (playbackStarted) 0 else 1
}
}
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 e2ea5e89..b78717ca 100644
--- a/player/src/main/java/com/streamvault/player/playback/PlayerRetrySeekPositionPolicy.kt
+++ b/player/src/main/java/com/streamvault/player/playback/PlayerRetrySeekPositionPolicy.kt
@@ -27,12 +27,15 @@ internal fun resolveRetrySeekPositionMs(
internal fun resolveRetryAttemptAfterReady(
currentAttempt: Int,
- playbackStarted: Boolean,
- isCurrentMediaItemLive: Boolean
+ playbackStarted: Boolean
): Int {
if (currentAttempt <= 0) return currentAttempt
if (!playbackStarted) return currentAttempt
- if (isCurrentMediaItemLive) return currentAttempt
+ return 0
+}
+
+internal fun resolveRetryAttemptAfterPlaybackStarted(currentAttempt: Int): Int {
+ if (currentAttempt <= 0) return currentAttempt
return 0
}
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 e16be75e..62b37ea4 100644
--- a/player/src/test/java/com/streamvault/player/playback/PlayerRetryPolicyTest.kt
+++ b/player/src/test/java/com/streamvault/player/playback/PlayerRetryPolicyTest.kt
@@ -1,7 +1,8 @@
package com.streamvault.player.playback
-import com.google.common.truth.Truth.assertThat
+import androidx.media3.common.ParserException
import androidx.media3.exoplayer.source.BehindLiveWindowException
+import com.google.common.truth.Truth.assertThat
import java.io.IOException
import javax.net.ssl.SSLHandshakeException
import org.junit.Test
@@ -81,4 +82,20 @@ class PlayerRetryPolicyTest {
assertThat(progressivePolicy.shouldRetry(error, progressiveContext, playbackStarted = true, attempt = 4)).isFalse()
assertThat(progressivePolicy.maxAttempts(error, playbackStarted = true)).isEqualTo(3)
}
+
+ @Test
+ fun `malformed live segment after playback start retries as transient source failure`() {
+ val error = ParserException.createForMalformedContainer("bad live segment", null)
+ assertThat(policy.shouldRetry(error, liveContext, playbackStarted = true, attempt = 1)).isTrue()
+ assertThat(policy.shouldRetry(error, liveContext, playbackStarted = true, attempt = 2)).isTrue()
+ assertThat(policy.shouldRetry(error, liveContext, playbackStarted = true, attempt = 3)).isTrue()
+ assertThat(policy.shouldRetry(error, liveContext, playbackStarted = true, attempt = 4)).isFalse()
+ assertThat(policy.maxAttempts(error, playbackStarted = true)).isEqualTo(3)
+ }
+
+ @Test
+ fun `malformed progressive movie after playback start stays fatal`() {
+ val error = ParserException.createForMalformedContainer("bad movie segment", null)
+ assertThat(progressivePolicy.shouldRetry(error, progressiveContext, playbackStarted = true, attempt = 1)).isFalse()
+ }
}
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 c944448b..5d1101f9 100644
--- a/player/src/test/java/com/streamvault/player/playback/PlayerRetrySeekPositionPolicyTest.kt
+++ b/player/src/test/java/com/streamvault/player/playback/PlayerRetrySeekPositionPolicyTest.kt
@@ -80,21 +80,26 @@ class PlayerRetrySeekPositionPolicyTest {
fun `ready movie playback after retry restores transient retry budget`() {
val nextAttempt = resolveRetryAttemptAfterReady(
currentAttempt = 1,
- playbackStarted = true,
- isCurrentMediaItemLive = false
+ playbackStarted = true
)
assertThat(nextAttempt).isEqualTo(0)
}
@Test
- fun `ready live playback keeps retry budget scoped to live recovery`() {
+ fun `ready live playback after retry restores transient retry budget`() {
val nextAttempt = resolveRetryAttemptAfterReady(
currentAttempt = 1,
- playbackStarted = true,
- isCurrentMediaItemLive = true
+ playbackStarted = true
)
- assertThat(nextAttempt).isEqualTo(1)
+ assertThat(nextAttempt).isEqualTo(0)
+ }
+
+ @Test
+ fun `first frame after retry restores transient retry budget`() {
+ val nextAttempt = resolveRetryAttemptAfterPlaybackStarted(currentAttempt = 1)
+
+ assertThat(nextAttempt).isEqualTo(0)
}
}