StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
Preserve progressive playback retry state
Basri Kahvecia596fcc64e58
diff --git a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.ktindex 4f4e1728..68116954 100644--- a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt+++ b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt@@ -66,6 +66,7 @@ import com.streamvault.player.playback.StreamTypeResolverimport com.streamvault.player.playback.VideoStallDetectorimport com.streamvault.player.playback.buildLiveTsFallbackStreamInfoimport com.streamvault.player.playback.hasEffectivePlaybackStarted+import com.streamvault.player.playback.shouldArmPlaybackStartedRecoveryimport com.streamvault.player.playback.shouldFallbackMalformedHlsToLiveTsimport com.streamvault.player.playback.shouldFallbackStalledHlsToLiveTsimport com.streamvault.player.playback.shouldPreservePlaybackStateForRetry@@ -187,6 +188,7 @@ class Media3PlayerEngine @Inject constructor(private var currentRetryContext: PlaybackRetryContext? = nullprivate var playbackStarted = falseprivate var liveBufferingRecoveryArmed = false+ private var playbackStartedRecoveryArmed = falseprivate var hasRenderedFirstVideoFrame = falseprivate var prepareStartMs = 0Lprivate var retryAttempt = 0@@ -315,12 +317,12 @@ class Media3PlayerEngine @Inject constructor(delay(1_000L)val stats = _playerStats.valueval liveStream = isCurrentStreamLive()- val liveBufferingRecoveryEligible = liveStream &&- (playbackStarted || liveBufferingRecoveryArmed)+ val effectivePlaybackStarted = isEffectivelyPlaybackStarted()+ val liveBufferingRecoveryEligible = liveStream && effectivePlaybackStartedval stalled = videoStallDetector.shouldReportStall(playbackState = _playbackState.value,isPlaying = _isPlaying.value,- playbackStarted = playbackStarted || liveBufferingRecoveryArmed,+ playbackStarted = effectivePlaybackStarted,currentPositionMs = _currentPosition.value,bufferedDurationMs = stats.bufferedDurationMs,playWhenReady = exoPlayer?.playWhenReady == true,@@ -366,7 +368,7 @@ class Media3PlayerEngine @Inject constructor(val playbackPlan = buildPlaybackPreparationPlan(streamInfo = streamInfo,preload = false,- playbackStarted = { playbackStarted }+ playbackStarted = { isEffectivelyPlaybackStarted() })lastStreamInfo = streamInfo@@ -380,6 +382,7 @@ class Media3PlayerEngine @Inject constructor(_retryStatus.value = nullplaybackStarted = falseliveBufferingRecoveryArmed = false+ playbackStartedRecoveryArmed = falseval mediaSource = mediaSourceFactory.create(streamInfo = streamInfo,@@ -781,6 +784,7 @@ class Media3PlayerEngine @Inject constructor(currentRetryContext = nullplaybackStarted = falseliveBufferingRecoveryArmed = false+ playbackStartedRecoveryArmed = falsehasRenderedFirstVideoFrame = falseretryAttempt = 0lastRetryCategory = null@@ -832,10 +836,13 @@ class Media3PlayerEngine @Inject constructor(lastStreamInfo = streamInfoval mediaId = mediaSourceFactory.mediaIdFor(streamInfo)val mediaChanged = lastMediaId != mediaId- val shouldArmLiveBufferingRecovery = preserveRetryState &&- !mediaChanged &&- (playbackStarted || liveBufferingRecoveryArmed) &&- isCurrentStreamLive()+ val armPlaybackStartedRecovery = shouldArmPlaybackStartedRecovery(+ preserveRetryState = preserveRetryState,+ mediaChanged = mediaChanged,+ playbackStarted = playbackStarted,+ playbackStartedRecoveryArmed = liveBufferingRecoveryArmed || playbackStartedRecoveryArmed+ )+ val shouldArmLiveBufferingRecovery = armPlaybackStartedRecovery && isCurrentStreamLive()if (!preserveRetryState || mediaChanged) {retryAttempt = 0lastRetryCategory = null@@ -851,6 +858,7 @@ class Media3PlayerEngine @Inject constructor(lastMediaId = mediaIdplaybackStarted = falseliveBufferingRecoveryArmed = shouldArmLiveBufferingRecovery+ playbackStartedRecoveryArmed = armPlaybackStartedRecovery && !shouldArmLiveBufferingRecoveryhasRenderedFirstVideoFrame = falseprepareStartMs = System.currentTimeMillis()audioCodecUnsupportedReported = false@@ -863,6 +871,7 @@ class Media3PlayerEngine @Inject constructor(videoStallDetector.reset()if (!preserveRetryState) {liveBufferingRecoveryArmed = false+ playbackStartedRecoveryArmed = falsevideoStallRecoveryAttempt = 0videoStallSafeRecoveryPerformed = false}@@ -874,7 +883,7 @@ class Media3PlayerEngine @Inject constructor(val playbackPlan = buildPlaybackPreparationPlan(streamInfo = streamInfo,preload = false,- playbackStarted = { playbackStarted }+ playbackStarted = { isEffectivelyPlaybackStarted() })currentResolvedStreamType = playbackPlan.resolvedStreamTypecurrentTimeoutProfile = playbackPlan.timeoutProfile@@ -1439,6 +1448,7 @@ class Media3PlayerEngine @Inject constructor(if (playbackStarted) returnplaybackStarted = trueliveBufferingRecoveryArmed = false+ playbackStartedRecoveryArmed = falseretryAttempt = resolveRetryAttemptAfterPlaybackStarted(retryAttempt)if (retryAttempt == 0) {lastRetryCategory = null@@ -1530,13 +1540,19 @@ class Media3PlayerEngine @Inject constructor(}private fun shouldUseCompatibilityHistory(): Boolean {- return playbackStarted ||+ return isEffectivelyPlaybackStarted() ||retryAttempt > 0 ||videoStallRecoveryAttempt > 0 ||recoveryDecoderPolicyOverride != null ||textureViewSessionFallbackAttempted}+ private fun isEffectivelyPlaybackStarted(): Boolean =+ hasEffectivePlaybackStarted(+ playbackStarted = playbackStarted,+ liveBufferingRecoveryArmed = liveBufferingRecoveryArmed || playbackStartedRecoveryArmed+ )+private fun handleVideoStall() {val streamInfo = lastStreamInfo ?: returnvideoStallCount++@@ -1555,7 +1571,7 @@ class Media3PlayerEngine @Inject constructor("video-stall count=$videoStallCount recovered=$videoStallSafeRecoveryPerformed decoder=$selectedVideoDecoderName policy=$activeDecoderPolicy surface=${_renderSurfaceType.value} target=${PlaybackLogSanitizer.sanitizeUrl(streamInfo.url)}")- if (!playbackStarted && !liveBufferingRecoveryArmed) {+ if (!isEffectivelyPlaybackStarted()) {Log.w(TAG, "video-stall ignored because playback has not started yet")return}@@ -2044,10 +2060,7 @@ class Media3PlayerEngine @Inject constructor(val retryPolicy = currentRetryPolicyval retryContext = currentRetryContextval category = PlayerErrorClassifier.classify(error)- val effectivePlaybackStarted = hasEffectivePlaybackStarted(- playbackStarted = playbackStarted,- liveBufferingRecoveryArmed = liveBufferingRecoveryArmed- )+ val effectivePlaybackStarted = isEffectivelyPlaybackStarted()if (streamInfo == null || mediaId == null || retryPolicy == null || retryContext == null) {_retryStatus.value = null@@ -2146,8 +2159,8 @@ class Media3PlayerEngine @Inject constructor(streamInfo,preserveRetryState = shouldPreservePlaybackStateForRetry(category = category,- playbackStarted = playbackStarted,- liveBufferingRecoveryArmed = liveBufferingRecoveryArmed+ playbackStarted = effectivePlaybackStarted,+ liveBufferingRecoveryArmed = false),seekPositionMs = retrySeekPositionMs,autoPlay = truediff --git a/player/src/main/java/com/streamvault/player/playback/LiveRetryStatePolicy.kt b/player/src/main/java/com/streamvault/player/playback/LiveRetryStatePolicy.ktindex a6270dca..7209d509 100644--- a/player/src/main/java/com/streamvault/player/playback/LiveRetryStatePolicy.kt+++ b/player/src/main/java/com/streamvault/player/playback/LiveRetryStatePolicy.kt@@ -15,3 +15,16 @@ internal fun hasEffectivePlaybackStarted(playbackStarted: Boolean,liveBufferingRecoveryArmed: Boolean): Boolean = playbackStarted || liveBufferingRecoveryArmed++internal fun shouldArmPlaybackStartedRecovery(+ preserveRetryState: Boolean,+ mediaChanged: Boolean,+ playbackStarted: Boolean,+ playbackStartedRecoveryArmed: Boolean+): Boolean =+ preserveRetryState &&+ !mediaChanged &&+ hasEffectivePlaybackStarted(+ playbackStarted = playbackStarted,+ liveBufferingRecoveryArmed = playbackStartedRecoveryArmed+ )diff --git a/player/src/main/java/com/streamvault/player/playback/PlayerRetryPolicy.kt b/player/src/main/java/com/streamvault/player/playback/PlayerRetryPolicy.ktindex 032d34a9..d492303b 100644--- a/player/src/main/java/com/streamvault/player/playback/PlayerRetryPolicy.kt+++ b/player/src/main/java/com/streamvault/player/playback/PlayerRetryPolicy.kt@@ -160,7 +160,12 @@ class PlayerRetryPolicy(PlaybackErrorCategory.NETWORK -> when {error.hasCause<UnknownHostException>() -> 1error.hasCause<SocketTimeoutException>() || error.hasCause<ConnectException>() ->- if (streamContext.isLive) LIVE_TRANSIENT_RETRY_ATTEMPTS else 2+ when {+ streamContext.isLive -> LIVE_TRANSIENT_RETRY_ATTEMPTS+ streamContext.resolvedStreamType == ResolvedStreamType.PROGRESSIVE && playbackStarted ->+ LIVE_TRANSIENT_RETRY_ATTEMPTS+ else -> 2+ }!playbackStarted -> if (streamContext.isLive) LIVE_TRANSIENT_RETRY_ATTEMPTS else 2else -> 1}diff --git a/player/src/test/java/com/streamvault/player/playback/LiveRetryStatePolicyTest.kt b/player/src/test/java/com/streamvault/player/playback/LiveRetryStatePolicyTest.ktindex 93bbc31a..af10bf30 100644--- a/player/src/test/java/com/streamvault/player/playback/LiveRetryStatePolicyTest.kt+++ b/player/src/test/java/com/streamvault/player/playback/LiveRetryStatePolicyTest.kt@@ -47,4 +47,52 @@ class LiveRetryStatePolicyTest {)).isTrue()}++ @Test+ fun `retry reprepare after first frame carries effective playback started state`() {+ assertThat(+ shouldArmPlaybackStartedRecovery(+ preserveRetryState = true,+ mediaChanged = false,+ playbackStarted = true,+ playbackStartedRecoveryArmed = false+ )+ ).isTrue()+ }++ @Test+ fun `subsequent retry reprepare keeps carried playback started state`() {+ assertThat(+ shouldArmPlaybackStartedRecovery(+ preserveRetryState = true,+ mediaChanged = false,+ playbackStarted = false,+ playbackStartedRecoveryArmed = true+ )+ ).isTrue()+ }++ @Test+ fun `retry reprepare before first frame does not carry playback started state`() {+ assertThat(+ shouldArmPlaybackStartedRecovery(+ preserveRetryState = true,+ mediaChanged = false,+ playbackStarted = false,+ playbackStartedRecoveryArmed = false+ )+ ).isFalse()+ }++ @Test+ fun `retry reprepare for a new media item clears playback started state`() {+ assertThat(+ shouldArmPlaybackStartedRecovery(+ preserveRetryState = true,+ mediaChanged = true,+ playbackStarted = true,+ playbackStartedRecoveryArmed = false+ )+ ).isFalse()+ }}diff --git a/player/src/test/java/com/streamvault/player/playback/PlayerRetryPolicyTest.kt b/player/src/test/java/com/streamvault/player/playback/PlayerRetryPolicyTest.ktindex 83c01c8a..12db1321 100644--- a/player/src/test/java/com/streamvault/player/playback/PlayerRetryPolicyTest.kt+++ b/player/src/test/java/com/streamvault/player/playback/PlayerRetryPolicyTest.kt@@ -167,6 +167,17 @@ class PlayerRetryPolicyTest {assertThat(policy.maxAttempts(error, playbackStarted = true)).isEqualTo(10)}+ @Test+ fun `progressive network timeouts after playback start retry 10 times`() {+ val error = SocketTimeoutException("timed out")++ assertThat(progressivePolicy.shouldRetry(error, progressiveContext, playbackStarted = true, attempt = 10))+ .isTrue()+ assertThat(progressivePolicy.shouldRetry(error, progressiveContext, playbackStarted = true, attempt = 11))+ .isFalse()+ assertThat(progressivePolicy.maxAttempts(error, playbackStarted = true)).isEqualTo(10)+ }+@Testfun `malformed hls refresh after playback start retries before app recovery`() {val error = ParserException.createForMalformedContainer("bad live segment", null)