Skip to content

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

fix(playback): avoid automatic HLS player restart

David Nashash302ac37402d6
diff --git a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
index 0138ee46..a5300c64 100644
--- a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
+++ b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
@@ -36,6 +36,7 @@ import androidx.media3.session.MediaSession
import com.streamvault.domain.model.AudioOutputPreference
import com.streamvault.domain.model.DecoderMode
import com.streamvault.domain.model.PlaybackBufferMode
+import com.streamvault.domain.model.PlaybackContentKind
import com.streamvault.domain.model.VodHttpProtocolMode
import com.streamvault.domain.model.PlaybackCompatibilityKey
import com.streamvault.domain.model.PlaybackCompatibilityRecord
@@ -58,7 +59,6 @@ import com.streamvault.player.playback.PlaybackErrorCategory
import com.streamvault.player.playback.FfmpegAudioFallbackRequest
import com.streamvault.player.playback.FfmpegExtensionSupport
import com.streamvault.player.playback.InitialBitratePolicy
-import com.streamvault.player.playback.LiveHlsBufferPromotionDecider
import com.streamvault.player.playback.PlaybackLogSanitizer
import com.streamvault.player.playback.PlaybackPreparationPlan
import com.streamvault.player.playback.PlaybackExtensionRendererMode
@@ -69,6 +69,7 @@ import com.streamvault.player.playback.PlayerMediaSourceFactory
import com.streamvault.player.playback.Media3PreloadWindowManager
import com.streamvault.player.playback.PlayerRetryPolicy
import com.streamvault.player.playback.PlayerTimeoutProfile
+import com.streamvault.player.playback.isLivePlayback
import com.streamvault.player.playback.PreloadCoordinator
import com.streamvault.player.playback.ResolvedStreamType
import com.streamvault.player.playback.resolveRetryAttemptAfterPlaybackStarted
@@ -232,11 +233,6 @@ class Media3PlayerEngine @Inject constructor(
private var currentBufferIsLive: Boolean? = null
private var currentBufferPolicyLabel: String? = null
private var currentBufferPolicy: PlaybackBufferPolicy? = null
- private val promotedLiveHlsBufferReasonsByMediaId =
- com.streamvault.domain.util.BoundedExpiringCache<String, String>(
- maxEntries = 512,
- ttlMillis = 24L * 60L * 60L * 1_000L
- )
private var audioCodecUnsupportedReported = false
private var lastSupportErrorMessage: String? = null
private val isLowMemoryPlaybackDevice: Boolean = run {
@@ -397,11 +393,17 @@ class Media3PlayerEngine @Inject constructor(
bufferedDurationMs = stats.bufferedDurationMs,
playWhenReady = exoPlayer?.playWhenReady == true,
recoverBufferingStalls = liveBufferingRecoveryEligible,
- recoverReadyStalls = shouldRecoverReadyStalls(currentResolvedStreamType),
+ recoverReadyStalls = liveStream && shouldRecoverReadyStalls(currentResolvedStreamType),
recoverPositionAdvancingReadyStalls =
- shouldRecoverPositionAdvancingReadyStalls(currentResolvedStreamType),
+ liveStream && shouldRecoverPositionAdvancingReadyStalls(
+ currentResolvedStreamType,
+ lastStreamInfo?.playbackContentKind ?: PlaybackContentKind.UNKNOWN
+ ),
recoverFrameSilentReadyStalls =
- shouldRecoverFrameSilentReadyStalls(currentResolvedStreamType)
+ liveStream && shouldRecoverFrameSilentReadyStalls(
+ currentResolvedStreamType,
+ lastStreamInfo?.playbackContentKind ?: PlaybackContentKind.UNKNOWN
+ )
)
_playerStats.value = _playerStats.value.copy(
lastVideoFrameAgoMs = videoStallDetector.lastVideoFrameAgoMs(),
@@ -425,9 +427,6 @@ class Media3PlayerEngine @Inject constructor(
playbackSupportSnapshotStore.write(snapshot)
}
}
- if (promoteLiveHlsBufferIfNeeded()) {
- continue
- }
if (shouldFallbackTextureViewBeforeFirstFrame(stats)) {
fallbackTextureViewSurface("NO_FIRST_FRAME")
continue
@@ -1113,12 +1112,7 @@ class Media3PlayerEngine @Inject constructor(
learnedAudioCompatibility != null -> "LEARNED_AUDIO_FALLBACK"
else -> "DEFAULT"
}
- val isLiveBuffer = currentResolvedStreamType in setOf(
- ResolvedStreamType.HLS,
- ResolvedStreamType.SMOOTH_STREAMING,
- ResolvedStreamType.MPEG_TS_LIVE,
- ResolvedStreamType.RTSP
- )
+ val isLiveBuffer = isLivePlayback(streamInfo.playbackContentKind, currentResolvedStreamType)
val previousAudioDecoderPolicy = activeAudioDecoderPolicy
val previousVideoDecoderPolicy = activeVideoDecoderPolicy
val nextBufferPolicy = PlaybackBufferPolicies.forPlayback(
@@ -1126,9 +1120,7 @@ class Media3PlayerEngine @Inject constructor(
compatibilityMode = nextVideoDecoderPolicy == ActiveDecoderPolicy.COMPATIBILITY,
lowMemoryDevice = isLowMemoryPlaybackDevice,
bufferMode = requestedPlaybackBufferMode,
- streamInfo = streamInfo,
- observedVideoFormat = _videoFormat.value,
- qualityReasonOverride = promotedLiveHlsBufferReasonsByMediaId.get(mediaId)
+ streamInfo = streamInfo
)
val needsRecreate = activeAudioDecoderMode != preferredAudioDecoderMode ||
activeVideoDecoderMode != preferredVideoDecoderMode ||
@@ -1188,12 +1180,7 @@ class Media3PlayerEngine @Inject constructor(
player.prepare()
seekPositionMs?.takeIf { it > 0L }?.let(player::seekTo)
- val isLive = currentResolvedStreamType in setOf(
- ResolvedStreamType.HLS,
- ResolvedStreamType.SMOOTH_STREAMING,
- ResolvedStreamType.MPEG_TS_LIVE,
- ResolvedStreamType.RTSP
- )
+ val isLive = isLivePlayback(streamInfo.playbackContentKind, currentResolvedStreamType)
val osContentType = if (isLive) {
android.media.AudioAttributes.CONTENT_TYPE_MUSIC
} else {
@@ -1255,9 +1242,7 @@ class Media3PlayerEngine @Inject constructor(
compatibilityMode = activeVideoDecoderPolicy == ActiveDecoderPolicy.COMPATIBILITY,
lowMemoryDevice = isLowMemoryPlaybackDevice,
bufferMode = requestedPlaybackBufferMode,
- streamInfo = lastStreamInfo,
- observedVideoFormat = _videoFormat.value,
- qualityReasonOverride = lastMediaId?.let(promotedLiveHlsBufferReasonsByMediaId::get)
+ streamInfo = lastStreamInfo
)
val loadControl = DefaultLoadControl.Builder()
.setBufferDurationsMs(
@@ -1925,41 +1910,6 @@ class Media3PlayerEngine @Inject constructor(
liveBufferingRecoveryArmed = liveBufferingRecoveryArmed || playbackStartedRecoveryArmed
)
- private fun promoteLiveHlsBufferIfNeeded(): Boolean {
- val streamInfo = lastStreamInfo ?: return false
- val mediaId = lastMediaId ?: return false
- val observedFormat = _videoFormat.value.takeUnless(VideoFormat::isEmpty) ?: return false
- val decision = LiveHlsBufferPromotionDecider.decide(
- bufferMode = requestedPlaybackBufferMode,
- resolvedStreamType = currentResolvedStreamType,
- isLive = isCurrentStreamLive(),
- mediaAlreadyPromoted = promotedLiveHlsBufferReasonsByMediaId.get(mediaId) != null,
- currentPolicyLabel = currentBufferPolicyLabel,
- streamInfo = streamInfo,
- observedVideoFormat = observedFormat,
- compatibilityMode = activeVideoDecoderPolicy == ActiveDecoderPolicy.COMPATIBILITY,
- lowMemoryDevice = isLowMemoryPlaybackDevice
- ) ?: return false
-
- promotedLiveHlsBufferReasonsByMediaId.put(mediaId, decision.qualityReason)
- val wasPlaying = exoPlayer?.playWhenReady ?: true
- Log.i(
- TAG,
- "buffer-policy promote mediaId=$mediaId from=${currentBufferPolicyLabel.orEmpty()} " +
- "to=${decision.policy.label} reason=${decision.qualityReason} " +
- "format=${observedFormat.width}x${observedFormat.height} " +
- "bitrate=${observedFormat.bitrate} hdr=${observedFormat.isHdr} " +
- "target=${PlaybackLogSanitizer.sanitizeUrl(streamInfo.url)}"
- )
- prepareInternal(
- streamInfo = streamInfo,
- preserveRetryState = true,
- seekPositionMs = null,
- autoPlay = wasPlaying
- )
- return true
- }
-
private fun handleVideoStall() {
val streamInfo = lastStreamInfo ?: return
videoStallCount++
@@ -1971,7 +1921,8 @@ class Media3PlayerEngine @Inject constructor(
val liveReconnectionStall = shouldReconnectLiveStall(
playbackState = _playbackState.value,
resolvedStreamType = currentResolvedStreamType,
- recoveryAttempt = nextRecoveryAttempt
+ recoveryAttempt = nextRecoveryAttempt,
+ playbackContentKind = streamInfo.playbackContentKind
)
Log.w(
TAG,
@@ -1996,6 +1947,7 @@ class Media3PlayerEngine @Inject constructor(
}
if (
+ isCurrentStreamLive() &&
shouldFallbackStalledHlsToLiveTs(
resolvedStreamType = currentResolvedStreamType,
recoveryAttempt = videoStallRecoveryAttempt
@@ -2208,11 +2160,9 @@ class Media3PlayerEngine @Inject constructor(
)
}
- private fun isCurrentStreamLive(): Boolean = currentResolvedStreamType in setOf(
- ResolvedStreamType.HLS,
- ResolvedStreamType.SMOOTH_STREAMING,
- ResolvedStreamType.MPEG_TS_LIVE,
- ResolvedStreamType.RTSP
+ private fun isCurrentStreamLive(): Boolean = isLivePlayback(
+ lastStreamInfo?.playbackContentKind ?: PlaybackContentKind.UNKNOWN,
+ currentResolvedStreamType
)
private fun handleAudioRendererIssue(error: Exception, source: String) {
diff --git a/player/src/main/java/com/streamvault/player/playback/LiveHlsBufferPromotionDecider.kt b/player/src/main/java/com/streamvault/player/playback/LiveHlsBufferPromotionDecider.kt
deleted file mode 100644
index afd7761e..00000000
--- a/player/src/main/java/com/streamvault/player/playback/LiveHlsBufferPromotionDecider.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.streamvault.player.playback
-
-import com.streamvault.domain.model.PlaybackBufferMode
-import com.streamvault.domain.model.StreamInfo
-import com.streamvault.domain.model.VideoFormat
-
-internal data class LiveHlsBufferPromotionDecision(
- val policy: PlaybackBufferPolicy,
- val qualityReason: String
-)
-
-internal object LiveHlsBufferPromotionDecider {
-
- fun decide(
- bufferMode: PlaybackBufferMode,
- resolvedStreamType: ResolvedStreamType,
- isLive: Boolean,
- mediaAlreadyPromoted: Boolean,
- currentPolicyLabel: String?,
- streamInfo: StreamInfo?,
- observedVideoFormat: VideoFormat,
- compatibilityMode: Boolean,
- lowMemoryDevice: Boolean
- ): LiveHlsBufferPromotionDecision? {
- if (bufferMode != PlaybackBufferMode.AUTO) return null
- if (resolvedStreamType != ResolvedStreamType.HLS || !isLive) return null
- if (mediaAlreadyPromoted) return null
- streamInfo ?: return null
- if (observedVideoFormat.isEmpty) return null
-
- val qualityReason = PlaybackBufferPolicies.highQualityLiveHlsReason(
- streamInfo = null,
- observedVideoFormat = observedVideoFormat
- ) ?: return null
- val promotedPolicy = PlaybackBufferPolicies.forPlayback(
- resolvedStreamType = resolvedStreamType,
- compatibilityMode = compatibilityMode,
- lowMemoryDevice = lowMemoryDevice,
- bufferMode = bufferMode,
- streamInfo = streamInfo,
- observedVideoFormat = observedVideoFormat,
- qualityReasonOverride = qualityReason
- )
- if (promotedPolicy.label == currentPolicyLabel) return null
-
- return LiveHlsBufferPromotionDecision(
- policy = promotedPolicy,
- qualityReason = qualityReason
- )
- }
-}
diff --git a/player/src/main/java/com/streamvault/player/playback/PlaybackBufferPolicies.kt b/player/src/main/java/com/streamvault/player/playback/PlaybackBufferPolicies.kt
index 0cfd3ef1..a2a6870d 100644
--- a/player/src/main/java/com/streamvault/player/playback/PlaybackBufferPolicies.kt
+++ b/player/src/main/java/com/streamvault/player/playback/PlaybackBufferPolicies.kt
@@ -3,7 +3,6 @@ package com.streamvault.player.playback
import com.streamvault.domain.model.PlaybackBufferMode
import com.streamvault.domain.model.PlaybackContentKind
import com.streamvault.domain.model.StreamInfo
-import com.streamvault.domain.model.VideoFormat
import java.util.Locale
internal data class PlaybackBufferPolicy(
@@ -53,9 +52,6 @@ internal object PlaybackBufferPolicies {
private const val LARGE_LIVE_MAX_BUFFER_MS = 90_000
private const val LARGE_LIVE_PLAYBACK_BUFFER_MS = 5_000
private const val LARGE_LIVE_REBUFFER_MS = 15_000
- private const val UHD_MIN_WIDTH = 3_840
- private const val UHD_MIN_HEIGHT = 2_160
- private const val HIGH_BITRATE_THRESHOLD_BPS = 20_000_000
fun forPlayback(
isLive: Boolean,
@@ -94,8 +90,7 @@ internal object PlaybackBufferPolicies {
compatibilityMode = compatibilityMode,
lowMemoryDevice = lowMemoryDevice,
bufferMode = PlaybackBufferMode.AUTO,
- streamInfo = null,
- observedVideoFormat = null
+ streamInfo = null
)
fun forPlayback(
@@ -103,9 +98,7 @@ internal object PlaybackBufferPolicies {
compatibilityMode: Boolean,
lowMemoryDevice: Boolean,
bufferMode: PlaybackBufferMode,
- streamInfo: StreamInfo? = null,
- observedVideoFormat: VideoFormat? = null,
- qualityReasonOverride: String? = null
+ streamInfo: StreamInfo? = null
): PlaybackBufferPolicy {
val kind = streamInfo?.playbackContentKind ?: PlaybackContentKind.UNKNOWN
val isLive = isLivePlayback(kind, resolvedStreamType)
@@ -124,7 +117,7 @@ internal object PlaybackBufferPolicies {
).copy(label = "vod-hls-initial", qualityReason = "finite-content")
}
if (bufferMode == PlaybackBufferMode.AUTO && resolvedStreamType == ResolvedStreamType.HLS) {
- val qualityReason = qualityReasonOverride ?: highQualityLiveHlsReason(streamInfo, observedVideoFormat)
+ val qualityReason = highQualityLiveHlsReason(streamInfo)
return when {
qualityReason == null -> baselineLivePolicy(
resolvedStreamType = resolvedStreamType,
@@ -263,15 +256,7 @@ internal object PlaybackBufferPolicies {
qualityReason = qualityReason
)
- fun highQualityLiveHlsReason(streamInfo: StreamInfo?, observedVideoFormat: VideoFormat?): String? {
- observedVideoFormat?.let { format ->
- when {
- format.width >= UHD_MIN_WIDTH -> return "observed-width-${format.width}"
- format.height >= UHD_MIN_HEIGHT -> return "observed-height-${format.height}"
- format.bitrate >= HIGH_BITRATE_THRESHOLD_BPS -> return "observed-bitrate-${format.bitrate}"
- format.isHdr -> return "observed-hdr"
- }
- }
+ fun highQualityLiveHlsReason(streamInfo: StreamInfo?): String? {
val searchable = listOfNotNull(
streamInfo?.title,
streamInfo?.url,
diff --git a/player/src/main/java/com/streamvault/player/playback/PlaybackStallRecoveryPolicy.kt b/player/src/main/java/com/streamvault/player/playback/PlaybackStallRecoveryPolicy.kt
index 4b0c78b7..1d631831 100644
--- a/player/src/main/java/com/streamvault/player/playback/PlaybackStallRecoveryPolicy.kt
+++ b/player/src/main/java/com/streamvault/player/playback/PlaybackStallRecoveryPolicy.kt
@@ -1,29 +1,27 @@
package com.streamvault.player.playback
+import com.streamvault.domain.model.PlaybackContentKind
import com.streamvault.player.PlaybackState
internal fun shouldRecoverReadyStalls(resolvedStreamType: ResolvedStreamType): Boolean =
true
-internal fun shouldRecoverPositionAdvancingReadyStalls(resolvedStreamType: ResolvedStreamType): Boolean =
- !resolvedStreamType.isLiveForStallRecovery
+internal fun shouldRecoverPositionAdvancingReadyStalls(
+ resolvedStreamType: ResolvedStreamType,
+ playbackContentKind: PlaybackContentKind = PlaybackContentKind.UNKNOWN
+): Boolean = !isLivePlayback(playbackContentKind, resolvedStreamType)
-internal fun shouldRecoverFrameSilentReadyStalls(resolvedStreamType: ResolvedStreamType): Boolean =
- resolvedStreamType.isLiveForStallRecovery
+internal fun shouldRecoverFrameSilentReadyStalls(
+ resolvedStreamType: ResolvedStreamType,
+ playbackContentKind: PlaybackContentKind = PlaybackContentKind.UNKNOWN
+): Boolean = isLivePlayback(playbackContentKind, resolvedStreamType)
internal fun shouldReconnectLiveStall(
playbackState: PlaybackState,
resolvedStreamType: ResolvedStreamType,
- recoveryAttempt: Int
+ recoveryAttempt: Int,
+ playbackContentKind: PlaybackContentKind = PlaybackContentKind.UNKNOWN
): Boolean =
recoveryAttempt == 1 &&
- (
- playbackState == PlaybackState.BUFFERING && resolvedStreamType.isLiveForStallRecovery ||
- playbackState == PlaybackState.READY && resolvedStreamType.isLiveForStallRecovery
- )
-
-private val ResolvedStreamType.isLiveForStallRecovery: Boolean
- get() = this == ResolvedStreamType.HLS ||
- this == ResolvedStreamType.SMOOTH_STREAMING ||
- this == ResolvedStreamType.MPEG_TS_LIVE ||
- this == ResolvedStreamType.RTSP
+ isLivePlayback(playbackContentKind, resolvedStreamType) &&
+ (playbackState == PlaybackState.BUFFERING || playbackState == PlaybackState.READY)
diff --git a/player/src/test/java/com/streamvault/player/playback/LiveHlsBufferPromotionDeciderTest.kt b/player/src/test/java/com/streamvault/player/playback/LiveHlsBufferPromotionDeciderTest.kt
deleted file mode 100644
index e51f0cd3..00000000
--- a/player/src/test/java/com/streamvault/player/playback/LiveHlsBufferPromotionDeciderTest.kt
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.streamvault.player.playback
-
-import com.google.common.truth.Truth.assertThat
-import com.streamvault.domain.model.PlaybackBufferMode
-import com.streamvault.domain.model.StreamInfo
-import com.streamvault.domain.model.VideoFormat
-import org.junit.Test
-
-class LiveHlsBufferPromotionDeciderTest {
-
- @Test
- fun `unchanged policy does not request promotion`() {
- val decision = LiveHlsBufferPromotionDecider.decide(
- bufferMode = PlaybackBufferMode.AUTO,
- resolvedStreamType = ResolvedStreamType.HLS,
- isLive = true,
- mediaAlreadyPromoted = false,
- currentPolicyLabel = "stable-live",
- streamInfo = StreamInfo(url = "https://example.com/live/channel.m3u8"),
- observedVideoFormat = VideoFormat(width = 1_920, height = 1_080),
- compatibilityMode = false,
- lowMemoryDevice = false
- )
-
- assertThat(decision).isNull()
- }
-
- @Test
- fun `observed uhd promotion requests stronger policy`() {
- val decision = LiveHlsBufferPromotionDecider.decide(
- bufferMode = PlaybackBufferMode.AUTO,
- resolvedStreamType = ResolvedStreamType.HLS,
- isLive = true,
- mediaAlreadyPromoted = false,
- currentPolicyLabel = "stable-live",
- streamInfo = StreamInfo(url = "https://example.com/live/channel.m3u8"),
- observedVideoFormat = VideoFormat(width = 3_840, height = 2_160),
- compatibilityMode = false,
- lowMemoryDevice = false
- )
-
- assertThat(decision).isNotNull()
- assertThat(decision?.policy?.label).isEqualTo("auto-uhd-live-hls")
- assertThat(decision?.qualityReason).isEqualTo("observed-width-3840")
- }
-
- @Test
- fun `repeated observation after promotion does not request another promotion`() {
- val decision = LiveHlsBufferPromotionDecider.decide(
- bufferMode = PlaybackBufferMode.AUTO,
- resolvedStreamType = ResolvedStreamType.HLS,
- isLive = true,
- mediaAlreadyPromoted = true,
- currentPolicyLabel = "auto-uhd-live-hls",
- streamInfo = StreamInfo(url = "https://example.com/live/channel.m3u8"),
- observedVideoFormat = VideoFormat(width = 3_840, height = 2_160),
- compatibilityMode = false,
- lowMemoryDevice = false
- )
-
- assertThat(decision).isNull()
- }
-
- @Test
- fun `manual large mode does not request observed auto promotion`() {
- val decision = LiveHlsBufferPromotionDecider.decide(
- bufferMode = PlaybackBufferMode.LARGE,
- resolvedStreamType = ResolvedStreamType.HLS,
- isLive = true,
- mediaAlreadyPromoted = false,
- currentPolicyLabel = "large-live",
- streamInfo = StreamInfo(url = "https://example.com/live/channel.m3u8"),
- observedVideoFormat = VideoFormat(width = 3_840, height = 2_160),
- compatibilityMode = false,
- lowMemoryDevice = false
- )
-
- assertThat(decision).isNull()
- }
-}
diff --git a/player/src/test/java/com/streamvault/player/playback/PlaybackBufferPoliciesTest.kt b/player/src/test/java/com/streamvault/player/playback/PlaybackBufferPoliciesTest.kt
index 192e81ed..e95e6aca 100644
--- a/player/src/test/java/com/streamvault/player/playback/PlaybackBufferPoliciesTest.kt
+++ b/player/src/test/java/com/streamvault/player/playback/PlaybackBufferPoliciesTest.kt
@@ -5,7 +5,6 @@ import com.streamvault.domain.model.PlaybackBufferMode
import com.streamvault.domain.model.PlaybackContentKind
import com.streamvault.domain.model.StreamInfo
import com.streamvault.domain.model.StreamType
-import com.streamvault.domain.model.VideoFormat
import org.junit.Test
class PlaybackBufferPoliciesTest {
@@ -76,6 +75,33 @@ class PlaybackBufferPoliciesTest {
assertThat(policy.qualityReason).isEqualTo("user-large")
}
+ @Test
+ fun `explicit live hls still honors user selected medium and large buffers`() {
+ val streamInfo = StreamInfo(
+ url = "https://example.com/live/channel.m3u8",
+ playbackContentKind = PlaybackContentKind.LIVE
+ )
+ val medium = PlaybackBufferPolicies.forPlayback(
+ resolvedStreamType = ResolvedStreamType.HLS,
+ compatibilityMode = false,
+ lowMemoryDevice = false,
+ bufferMode = PlaybackBufferMode.MEDIUM,
+ streamInfo = streamInfo
+ )
+ val large = PlaybackBufferPolicies.forPlayback(
+ resolvedStreamType = ResolvedStreamType.HLS,
+ compatibilityMode = false,
+ lowMemoryDevice = false,
+ bufferMode = PlaybackBufferMode.LARGE,
+ streamInfo = streamInfo
+ )
+
+ assertThat(medium.label).isEqualTo("medium-live")
+ assertThat(medium.targetBufferBytes).isEqualTo(32 * 1024 * 1024)
+ assertThat(large.label).isEqualTo("large-live")
+ assertThat(large.targetBufferBytes).isEqualTo(64 * 1024 * 1024)
+ }
+
@Test
fun `auto live hls promotes to large when metadata hints uhd`() {
val policy = PlaybackBufferPolicies.forPlayback(
@@ -110,8 +136,7 @@ class PlaybackBufferPoliciesTest {
url = "https://example.com/live/movie_2160p/index.m3u8",
title = "Movie UHD HDR",
playbackContentKind = PlaybackContentKind.ON_DEMAND
- ),
- observedVideoFormat = VideoFormat(width = 3_840, height = 2_160, isHdr = true)
+ )
)
assertThat(policy.label).isEqualTo("vod-hls-initial")
@@ -164,51 +189,6 @@ class PlaybackBufferPoliciesTest {
assertThat(policy.targetBufferBytes).isEqualTo(-1)
}
- @Test
- fun `auto live hls promotes to large when observed format is uhd`() {
- val policy = PlaybackBufferPolicies.forPlayback(
- resolvedStreamType = ResolvedStreamType.HLS,
- compatibilityMode = false,
- lowMemoryDevice = false,
- bufferMode = PlaybackBufferMode.AUTO,
- observedVideoFormat = VideoFormat(width = 3_840, height = 2_160)
- )
-
- assertThat(policy.label).isEqualTo("auto-uhd-live-hls")
- assertThat(policy.targetBufferBytes).isEqualTo(64 * 1024 * 1024)
- assertThat(policy.qualityReason).isEqualTo("observed-width-3840")
- }
-
- @Test
- fun `auto live hls promotes to large when observed format is high bitrate`() {
- val policy = PlaybackBufferPolicies.forPlayback(
- resolvedStreamType = ResolvedStreamType.HLS,
- compatibilityMode = false,
- lowMemoryDevice = false,
- bufferMode = PlaybackBufferMode.AUTO,
- observedVideoFormat = VideoFormat(width = 1_920, height = 1_080, bitrate = 20_000_000)
- )
-
- assertThat(policy.label).isEqualTo("auto-uhd-live-hls")
- assertThat(policy.targetBufferBytes).isEqualTo(64 * 1024 * 1024)
- assertThat(policy.qualityReason).isEqualTo("observed-bitrate-20000000")
- }
-
- @Test
- fun `auto live hls promotes to large when observed format is hdr`() {
- val policy = PlaybackBufferPolicies.forPlayback(
- resolvedStreamType = ResolvedStreamType.HLS,
- compatibilityMode = false,
- lowMemoryDevice = false,
- bufferMode = PlaybackBufferMode.AUTO,
- observedVideoFormat = VideoFormat(width = 1_920, height = 1_080, isHdr = true)
- )
-
- assertThat(policy.label).isEqualTo("auto-uhd-live-hls")
- assertThat(policy.targetBufferBytes).isEqualTo(64 * 1024 * 1024)
- assertThat(policy.qualityReason).isEqualTo("observed-hdr")
- }
-
@Test
fun `auto live hls caps uhd promotion to medium on low memory devices`() {
val policy = PlaybackBufferPolicies.forPlayback(
diff --git a/player/src/test/java/com/streamvault/player/playback/PlaybackContentKindResolverTest.kt b/player/src/test/java/com/streamvault/player/playback/PlaybackContentKindResolverTest.kt
index 0a284e29..a5cfcd81 100644
--- a/player/src/test/java/com/streamvault/player/playback/PlaybackContentKindResolverTest.kt
+++ b/player/src/test/java/com/streamvault/player/playback/PlaybackContentKindResolverTest.kt
@@ -25,4 +25,11 @@ class PlaybackContentKindResolverTest {
assertThat(isLivePlayback(PlaybackContentKind.UNKNOWN, ResolvedStreamType.HLS)).isTrue()
assertThat(isLivePlayback(PlaybackContentKind.UNKNOWN, ResolvedStreamType.DASH)).isFalse()
}
+
+ @Test
+ fun `hls live stall eligibility follows content intent`() {
+ assertThat(isLivePlayback(PlaybackContentKind.ON_DEMAND, ResolvedStreamType.HLS)).isFalse()
+ assertThat(isLivePlayback(PlaybackContentKind.LIVE, ResolvedStreamType.HLS)).isTrue()
+ assertThat(isLivePlayback(PlaybackContentKind.UNKNOWN, ResolvedStreamType.HLS)).isTrue()
+ }
}
diff --git a/player/src/test/java/com/streamvault/player/playback/PlaybackStallRecoveryPolicyTest.kt b/player/src/test/java/com/streamvault/player/playback/PlaybackStallRecoveryPolicyTest.kt
index 9013a97c..51890dcb 100644
--- a/player/src/test/java/com/streamvault/player/playback/PlaybackStallRecoveryPolicyTest.kt
+++ b/player/src/test/java/com/streamvault/player/playback/PlaybackStallRecoveryPolicyTest.kt
@@ -1,6 +1,7 @@
package com.streamvault.player.playback
import com.google.common.truth.Truth.assertThat
+import com.streamvault.domain.model.PlaybackContentKind
import com.streamvault.player.PlaybackState
import org.junit.Test
@@ -24,6 +25,19 @@ class PlaybackStallRecoveryPolicyTest {
assertThat(shouldRecoverFrameSilentReadyStalls(ResolvedStreamType.PROGRESSIVE)).isFalse()
}
+ @Test
+ fun `frame silent hls recovery uses content intent and keeps unknown live behavior`() {
+ assertThat(
+ shouldRecoverFrameSilentReadyStalls(ResolvedStreamType.HLS, PlaybackContentKind.ON_DEMAND)
+ ).isFalse()
+ assertThat(
+ shouldRecoverFrameSilentReadyStalls(ResolvedStreamType.HLS, PlaybackContentKind.LIVE)
+ ).isTrue()
+ assertThat(
+ shouldRecoverFrameSilentReadyStalls(ResolvedStreamType.HLS, PlaybackContentKind.UNKNOWN)
+ ).isTrue()
+ }
+
@Test
fun `live ready stalls reconnect the current stream`() {
assertThat(
@@ -56,4 +70,16 @@ class PlaybackStallRecoveryPolicyTest {
)
).isFalse()
}
+
+ @Test
+ fun `vod hls stalls do not reconnect through the live recovery path`() {
+ assertThat(
+ shouldReconnectLiveStall(
+ playbackState = PlaybackState.READY,
+ resolvedStreamType = ResolvedStreamType.HLS,
+ recoveryAttempt = 1,
+ playbackContentKind = PlaybackContentKind.ON_DEMAND
+ )
+ ).isFalse()
+ }
}