Skip to content

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

fix: persist VOD audio and subtitle tracks

David Nashash7de3ebd9db96
diff --git a/data/src/main/java/com/streamvault/data/manager/PreferenceBackupRegistry.kt b/data/src/main/java/com/streamvault/data/manager/PreferenceBackupRegistry.kt
index 89e4ba26..52f20b39 100644
--- a/data/src/main/java/com/streamvault/data/manager/PreferenceBackupRegistry.kt
+++ b/data/src/main/java/com/streamvault/data/manager/PreferenceBackupRegistry.kt
@@ -29,7 +29,8 @@ internal object PreferenceBackupRegistry {
"player_playback_buffer_mode", "player_live_stream_format_mode", "player_vod_http_protocol_mode",
"player_audio_output_preference", "player_compatibility_memory_enabled", "player_surface_mode",
"player_playback_speed", "player_external_playback_mode", "player_av_sync_enabled",
- "player_av_offset_ms", "preferred_audio_language", "player_subtitle_text_scale",
+ "player_av_offset_ms", "preferred_audio_language", "player_vod_track_global_preferences",
+ "player_vod_track_preferences", "player_subtitle_text_scale",
"player_subtitle_text_color", "player_subtitle_background_color", "player_live_translation_enabled",
"player_live_translation_endpoint", "player_controls_timeout_seconds",
"player_live_overlay_timeout_seconds", "player_notice_timeout_seconds",
@@ -124,7 +125,8 @@ internal object PreferenceBackupRegistry {
key in setOf(
"last_active_provider_id", "active_live_source_type", "active_live_source_id",
"default_category_id", "guide_default_category_id", "epg_time_shift_by_provider",
- "promoted_live_group_ids", "live_variant_selections", "vod_variant_selections"
+ "promoted_live_group_ids", "live_variant_selections", "vod_variant_selections",
+ "player_vod_track_preferences"
)
) PreferenceBackupClassification.PORTABLE_PROVIDER_CONTENT
else PreferenceBackupClassification.PORTABLE_GLOBAL
diff --git a/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt b/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt
index de2be71f..a8d505ef 100644
--- a/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt
+++ b/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt
@@ -44,6 +44,8 @@ import com.streamvault.domain.model.VodHttpProtocolMode
import com.streamvault.domain.model.VodVariantObservation
import com.streamvault.domain.model.VodVariantPreferenceMode
import com.streamvault.domain.model.PlayerSurfaceMode
+import com.streamvault.domain.settings.VodTrackPreferenceScope
+import com.streamvault.domain.settings.VodTrackPreferences
import com.streamvault.domain.model.RemoteColorButton
import com.streamvault.domain.model.RemoteShortcutPreferences
import com.streamvault.domain.model.RemoteShortcutProfile
@@ -70,6 +72,11 @@ import java.util.concurrent.atomic.AtomicLong
private const val PREFERENCES_DATASTORE_NAME = "user_preferences"
+private fun VodTrackPreferenceScope.storageKey(): String = when (this) {
+ is VodTrackPreferenceScope.Movie -> "$providerId|movie|$contentId"
+ is VodTrackPreferenceScope.Series -> "$providerId|series|$contentId"
+}
+
@Singleton
class PreferencesCorruptionRecovery @Inject constructor(
@ApplicationContext private val context: Context
@@ -254,6 +261,8 @@ class PreferencesRepository @Inject constructor(
val PLAYER_AUDIO_VIDEO_SYNC_ENABLED = booleanPreferencesKey("player_av_sync_enabled")
val PLAYER_AUDIO_VIDEO_OFFSET_MS = intPreferencesKey("player_av_offset_ms")
val PREFERRED_AUDIO_LANGUAGE = stringPreferencesKey("preferred_audio_language")
+ val PLAYER_VOD_TRACK_GLOBAL_PREFERENCES = stringPreferencesKey("player_vod_track_global_preferences")
+ val PLAYER_VOD_TRACK_PREFERENCES = stringPreferencesKey("player_vod_track_preferences")
val PLAYER_SUBTITLE_TEXT_SCALE = stringPreferencesKey("player_subtitle_text_scale")
val PLAYER_SUBTITLE_TEXT_COLOR = intPreferencesKey("player_subtitle_text_color")
val PLAYER_SUBTITLE_BACKGROUND_COLOR = intPreferencesKey("player_subtitle_background_color")
@@ -543,6 +552,17 @@ class PreferencesRepository @Inject constructor(
?: "auto"
}
+ override val globalVodTrackPreferences: Flow<VodTrackPreferences?> = context.dataStore.data.map { preferences ->
+ decodeVodTrackPreferences(preferences[PreferencesKeys.PLAYER_VOD_TRACK_GLOBAL_PREFERENCES])
+ }
+
+ override fun getVodTrackPreferences(scope: VodTrackPreferenceScope): Flow<VodTrackPreferences?> =
+ context.dataStore.data.map { preferences ->
+ decodeVodTrackPreferenceEntries(preferences[PreferencesKeys.PLAYER_VOD_TRACK_PREFERENCES])[
+ scope.storageKey()
+ ]
+ }
+
override val playerSubtitleTextScale: Flow<Float> = context.dataStore.data.map { preferences ->
preferences[PreferencesKeys.PLAYER_SUBTITLE_TEXT_SCALE]
?.toFloatOrNull()
@@ -1191,6 +1211,31 @@ class PreferencesRepository @Inject constructor(
}
}
+ override suspend fun setGlobalVodTrackPreferences(preferences: VodTrackPreferences) {
+ context.dataStore.edit { values ->
+ val encoded = encodeVodTrackPreferences(preferences)
+ if (encoded.isBlank()) {
+ values.remove(PreferencesKeys.PLAYER_VOD_TRACK_GLOBAL_PREFERENCES)
+ } else {
+ values[PreferencesKeys.PLAYER_VOD_TRACK_GLOBAL_PREFERENCES] = encoded
+ }
+ }
+ }
+
+ override suspend fun setVodTrackPreferences(
+ scope: VodTrackPreferenceScope,
+ preferences: VodTrackPreferences
+ ) {
+ if (scope.providerId <= 0L || scope.contentId <= 0L) return
+ context.dataStore.edit { values ->
+ val updated = decodeVodTrackPreferenceEntries(
+ values[PreferencesKeys.PLAYER_VOD_TRACK_PREFERENCES]
+ ).toMutableMap()
+ updated[scope.storageKey()] = preferences
+ values[PreferencesKeys.PLAYER_VOD_TRACK_PREFERENCES] = encodeVodTrackPreferenceEntries(updated)
+ }
+ }
+
override suspend fun setPlayerSubtitleTextScale(scale: Float) {
context.dataStore.edit { preferences ->
preferences[PreferencesKeys.PLAYER_SUBTITLE_TEXT_SCALE] = scale.coerceIn(0.75f, 1.75f).toString()
diff --git a/data/src/main/java/com/streamvault/data/preferences/VodTrackPreferenceCodec.kt b/data/src/main/java/com/streamvault/data/preferences/VodTrackPreferenceCodec.kt
new file mode 100644
index 00000000..8d828a6f
--- /dev/null
+++ b/data/src/main/java/com/streamvault/data/preferences/VodTrackPreferenceCodec.kt
@@ -0,0 +1,74 @@
+package com.streamvault.data.preferences
+
+import com.streamvault.domain.settings.VodTrackPreference
+import com.streamvault.domain.settings.VodTrackPreferences
+import java.util.Base64
+
+internal fun encodeVodTrackPreferences(preferences: VodTrackPreferences?): String = preferences
+ ?.let { value ->
+ listOf(value.audio, value.subtitle)
+ .joinToString(";", transform = ::encodeVodTrackPreference)
+ }
+ .orEmpty()
+
+internal fun decodeVodTrackPreferences(encoded: String?): VodTrackPreferences? {
+ val parts = encoded.orEmpty().split(';')
+ if (parts.size != 2 || parts.all(String::isBlank)) return null
+ return VodTrackPreferences(
+ audio = decodeVodTrackPreference(parts[0]),
+ subtitle = decodeVodTrackPreference(parts[1])
+ ).takeUnless { it.audio == null && it.subtitle == null }
+}
+
+internal fun encodeVodTrackPreferenceEntries(
+ values: Map<String, VodTrackPreferences>
+): String = values.entries
+ .sortedBy { it.key }
+ .joinToString("\n") { (key, preferences) ->
+ "${encodeComponent(key)}=${encodeVodTrackPreferences(preferences)}"
+ }
+
+internal fun decodeVodTrackPreferenceEntries(
+ encoded: String?
+): Map<String, VodTrackPreferences> = encoded
+ .orEmpty()
+ .lineSequence()
+ .mapNotNull { line ->
+ val separator = line.indexOf('=')
+ if (separator <= 0) return@mapNotNull null
+ val key = decodeComponent(line.substring(0, separator)) ?: return@mapNotNull null
+ val preferences = decodeVodTrackPreferences(line.substring(separator + 1)) ?: return@mapNotNull null
+ key to preferences
+ }
+ .toMap()
+
+private fun encodeVodTrackPreference(preference: VodTrackPreference?): String {
+ if (preference == null) return "-"
+ return listOf(
+ if (preference.disabled) "1" else "0",
+ encodeComponent(preference.trackId),
+ encodeComponent(preference.language),
+ encodeComponent(preference.label)
+ ).joinToString("~")
+}
+
+private fun decodeVodTrackPreference(encoded: String): VodTrackPreference? {
+ if (encoded == "-") return null
+ val parts = encoded.split('~')
+ if (parts.size != 4) return null
+ return VodTrackPreference(
+ trackId = decodeComponent(parts[1]),
+ language = decodeComponent(parts[2]),
+ label = decodeComponent(parts[3]),
+ disabled = parts[0] == "1"
+ )
+}
+
+private fun encodeComponent(value: String?): String = value
+ ?.takeIf(String::isNotEmpty)
+ ?.let { Base64.getUrlEncoder().withoutPadding().encodeToString(it.toByteArray(Charsets.UTF_8)) }
+ .orEmpty()
+
+private fun decodeComponent(value: String): String? = value
+ .takeIf(String::isNotEmpty)
+ ?.let { runCatching { String(Base64.getUrlDecoder().decode(it), Charsets.UTF_8) }.getOrNull() }
diff --git a/data/src/test/java/com/streamvault/data/preferences/PreferencesRepositoryVodTrackPreferenceTest.kt b/data/src/test/java/com/streamvault/data/preferences/PreferencesRepositoryVodTrackPreferenceTest.kt
new file mode 100644
index 00000000..e38f6016
--- /dev/null
+++ b/data/src/test/java/com/streamvault/data/preferences/PreferencesRepositoryVodTrackPreferenceTest.kt
@@ -0,0 +1,56 @@
+package com.streamvault.data.preferences
+
+import android.content.Context
+import androidx.datastore.preferences.preferencesDataStoreFile
+import com.google.common.truth.Truth.assertThat
+import com.streamvault.data.local.dao.ChannelPreferenceDao
+import com.streamvault.data.local.dao.SearchHistoryDao
+import com.streamvault.domain.settings.VodTrackPreference
+import com.streamvault.domain.settings.VodTrackPreferenceScope
+import com.streamvault.domain.settings.VodTrackPreferences
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.mock
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+
+@RunWith(RobolectricTestRunner::class)
+class PreferencesRepositoryVodTrackPreferenceTest {
+ private lateinit var context: Context
+
+ @Before
+ fun setUp() {
+ context = RuntimeEnvironment.getApplication()
+ context.preferencesDataStoreFile("user_preferences").delete()
+ }
+
+ @After
+ fun tearDown() {
+ context.preferencesDataStoreFile("user_preferences").delete()
+ }
+
+ @Test
+ fun `VOD track preferences persist globally and by series`() = runBlocking {
+ val repository = PreferencesRepository(
+ context = context,
+ channelPreferenceDao = mock<ChannelPreferenceDao>(),
+ searchHistoryDao = mock<SearchHistoryDao>(),
+ corruptionRecovery = mock<PreferencesCorruptionRecovery>()
+ )
+ val preferences = VodTrackPreferences(
+ audio = VodTrackPreference(language = "es", label = "Spanish"),
+ subtitle = VodTrackPreference(language = "fr", label = "French")
+ )
+ val scope = VodTrackPreferenceScope.Series(providerId = 7L, contentId = 9L)
+
+ repository.setGlobalVodTrackPreferences(preferences)
+ repository.setVodTrackPreferences(scope, preferences)
+
+ assertThat(repository.globalVodTrackPreferences.first()).isEqualTo(preferences)
+ assertThat(repository.getVodTrackPreferences(scope).first()).isEqualTo(preferences)
+ }
+}
diff --git a/data/src/test/java/com/streamvault/data/preferences/VodTrackPreferenceCodecTest.kt b/data/src/test/java/com/streamvault/data/preferences/VodTrackPreferenceCodecTest.kt
new file mode 100644
index 00000000..19d28b61
--- /dev/null
+++ b/data/src/test/java/com/streamvault/data/preferences/VodTrackPreferenceCodecTest.kt
@@ -0,0 +1,39 @@
+package com.streamvault.data.preferences
+
+import com.google.common.truth.Truth.assertThat
+import com.streamvault.domain.settings.VodTrackPreference
+import com.streamvault.domain.settings.VodTrackPreferences
+import org.junit.Test
+
+class VodTrackPreferenceCodecTest {
+
+ @Test
+ fun `round trip preserves selected audio and subtitle metadata`() {
+ val preferences = VodTrackPreferences(
+ audio = VodTrackPreference(
+ trackId = "audio|es=1",
+ language = "es",
+ label = "Español, stereo"
+ ),
+ subtitle = VodTrackPreference(
+ trackId = "subtitle\n1",
+ language = "fr",
+ label = "Français",
+ disabled = false
+ )
+ )
+
+ assertThat(decodeVodTrackPreferences(encodeVodTrackPreferences(preferences)))
+ .isEqualTo(preferences)
+ }
+
+ @Test
+ fun `round trip preserves explicit subtitles disabled preference`() {
+ val preferences = VodTrackPreferences(
+ subtitle = VodTrackPreference(disabled = true)
+ )
+
+ assertThat(decodeVodTrackPreferences(encodeVodTrackPreferences(preferences)))
+ .isEqualTo(preferences)
+ }
+}
diff --git a/domain/src/main/java/com/streamvault/domain/settings/PlayerPreferences.kt b/domain/src/main/java/com/streamvault/domain/settings/PlayerPreferences.kt
index 9511c4de..4c350419 100644
--- a/domain/src/main/java/com/streamvault/domain/settings/PlayerPreferences.kt
+++ b/domain/src/main/java/com/streamvault/domain/settings/PlayerPreferences.kt
@@ -12,6 +12,8 @@ interface PlayerPreferences : SettingsPreferences {
val vodVariantObservations: Flow<Map<Long, VodVariantObservation>>
+ val globalVodTrackPreferences: Flow<VodTrackPreferences?>
+
val lastActiveProviderId: Flow<Long?>
val multiViewPerformanceMode: Flow<String?>
@@ -36,6 +38,15 @@ interface PlayerPreferences : SettingsPreferences {
observation: VodVariantObservation
)
+ fun getVodTrackPreferences(scope: VodTrackPreferenceScope): Flow<VodTrackPreferences?>
+
+ suspend fun setGlobalVodTrackPreferences(preferences: VodTrackPreferences)
+
+ suspend fun setVodTrackPreferences(
+ scope: VodTrackPreferenceScope,
+ preferences: VodTrackPreferences
+ )
+
suspend fun setPlayerMuted(muted: Boolean)
suspend fun setAspectRatioForChannel(channelId: Long, ratio: String)
diff --git a/domain/src/main/java/com/streamvault/domain/settings/VodTrackPreferences.kt b/domain/src/main/java/com/streamvault/domain/settings/VodTrackPreferences.kt
new file mode 100644
index 00000000..0219f15c
--- /dev/null
+++ b/domain/src/main/java/com/streamvault/domain/settings/VodTrackPreferences.kt
@@ -0,0 +1,33 @@
+package com.streamvault.domain.settings
+
+/**
+ * Stable hints for restoring a user's selected VOD track across playback
+ * sessions. Media track ids are provider-specific, so language and label are
+ * retained as fallbacks for series episodes whose ids change between streams.
+ */
+data class VodTrackPreference(
+ val trackId: String? = null,
+ val language: String? = null,
+ val label: String? = null,
+ val disabled: Boolean = false
+)
+
+data class VodTrackPreferences(
+ val audio: VodTrackPreference? = null,
+ val subtitle: VodTrackPreference? = null
+)
+
+sealed interface VodTrackPreferenceScope {
+ val providerId: Long
+ val contentId: Long
+
+ data class Movie(
+ override val providerId: Long,
+ override val contentId: Long
+ ) : VodTrackPreferenceScope
+
+ data class Series(
+ override val providerId: Long,
+ override val contentId: Long
+ ) : VodTrackPreferenceScope
+}
diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPlaybackPreferenceActions.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPlaybackPreferenceActions.kt
index e4634a11..0f5cf16e 100644
--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPlaybackPreferenceActions.kt
+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPlaybackPreferenceActions.kt
@@ -5,6 +5,8 @@ import com.streamvault.domain.model.ContentType
import com.streamvault.domain.model.LiveChannelObservedQuality
import com.streamvault.domain.model.VodVariantObservation
import com.streamvault.domain.model.VideoFormat
+import com.streamvault.domain.settings.VodTrackPreference
+import com.streamvault.domain.settings.VodTrackPreferences
import com.streamvault.player.AUDIO_VIDEO_OFFSET_MAX_MS
import com.streamvault.player.AUDIO_VIDEO_OFFSET_MIN_MS
import com.streamvault.player.PlaybackState
@@ -15,6 +17,7 @@ import kotlinx.coroutines.ensureActive
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.withLock
import kotlin.collections.LinkedHashSet
private const val THUMBNAIL_PRELOAD_BUCKET_MS = 10_000L
@@ -65,11 +68,55 @@ internal fun shouldStartThumbnailPreload(
preloadKey != inFlightPreloadKey
fun PlayerViewModel.selectAudioTrack(trackId: String) {
+ val selectedTrack = playerEngine.availableAudioTracks.value.firstOrNull { it.id == trackId }
playerEngine.selectAudioTrack(trackId)
+ selectedTrack?.let { track ->
+ persistVodTrackPreferences(
+ updated = (activeVodTrackPreferences ?: VodTrackPreferences()).copy(
+ audio = track.toVodTrackPreference()
+ )
+ )
+ }
}
fun PlayerViewModel.selectSubtitleTrack(trackId: String?) {
playerEngine.selectSubtitleTrack(trackId)
+ val selectedTrack = trackId?.let { id ->
+ playerEngine.availableSubtitleTracks.value.firstOrNull { it.id == id }
+ }
+ if (trackId != null && selectedTrack == null) return
+
+ val current = activeVodTrackPreferences ?: VodTrackPreferences()
+ persistVodTrackPreferences(
+ updated = current.copy(
+ subtitle = selectedTrack?.toVodTrackPreference()
+ ?: VodTrackPreference(disabled = true)
+ )
+ )
+}
+
+private fun com.streamvault.player.PlayerTrack.toVodTrackPreference() = VodTrackPreference(
+ trackId = id,
+ language = language,
+ label = name
+)
+
+private fun PlayerViewModel.persistVodTrackPreferences(
+ updated: VodTrackPreferences
+) {
+ val scope = buildVodTrackPreferenceScope(
+ contentType = currentContentType,
+ providerId = currentProviderId,
+ contentId = currentContentId,
+ seriesId = currentSeriesId
+ ) ?: return
+ activeVodTrackPreferences = updated
+ viewModelScope.launch {
+ vodTrackPreferenceSaveMutex.withLock {
+ playerPreferencesCoordinator.setVodTrackPreferences(scope, updated)
+ playerPreferencesCoordinator.setGlobalVodTrackPreferences(updated)
+ }
+ }
}
fun PlayerViewModel.selectVideoQuality(trackId: String) {
diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPreferencesCoordinator.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPreferencesCoordinator.kt
index d4f4a11b..2844298d 100644
--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPreferencesCoordinator.kt
+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPreferencesCoordinator.kt
@@ -4,6 +4,8 @@ import com.streamvault.domain.model.ContentType
import com.streamvault.domain.model.LiveChannelObservedQuality
import com.streamvault.domain.model.VodVariantObservation
import com.streamvault.domain.settings.PlayerPreferences
+import com.streamvault.domain.settings.VodTrackPreferenceScope
+import com.streamvault.domain.settings.VodTrackPreferences
import javax.inject.Inject
/**
@@ -53,6 +55,7 @@ class PlayerPreferencesCoordinator @Inject constructor(
internal val playerWifiMaxVideoHeight get() = preferencesRepository.playerWifiMaxVideoHeight
internal val preventStandbyDuringPlayback get() = preferencesRepository.preventStandbyDuringPlayback
internal val preferredAudioLanguage get() = preferencesRepository.preferredAudioLanguage
+ internal val globalVodTrackPreferences get() = preferencesRepository.globalVodTrackPreferences
internal val remoteShortcutPreferences get() = preferencesRepository.remoteShortcutPreferences
internal val vodVariantObservations get() = preferencesRepository.vodVariantObservations
internal val zapAutoRevert get() = preferencesRepository.zapAutoRevert
@@ -66,6 +69,9 @@ class PlayerPreferencesCoordinator @Inject constructor(
internal fun getLastLiveCategoryId(providerId: Long) =
preferencesRepository.getLastLiveCategoryId(providerId)
+ internal fun getVodTrackPreferences(scope: VodTrackPreferenceScope) =
+ preferencesRepository.getVodTrackPreferences(scope)
+
internal fun observeAudioVideoOffsetForChannel(channelId: Long) =
preferencesRepository.observeAudioVideoOffsetForChannel(channelId)
@@ -107,6 +113,17 @@ class PlayerPreferencesCoordinator @Inject constructor(
preferencesRepository.setPlayerPlaybackSpeed(speed)
}
+ internal suspend fun setGlobalVodTrackPreferences(preferences: VodTrackPreferences) {
+ preferencesRepository.setGlobalVodTrackPreferences(preferences)
+ }
+
+ internal suspend fun setVodTrackPreferences(
+ scope: VodTrackPreferenceScope,
+ preferences: VodTrackPreferences,
+ ) {
+ preferencesRepository.setVodTrackPreferences(scope, preferences)
+ }
+
internal suspend fun setPreferredLiveVariant(
providerId: Long,
logicalGroupId: String,
diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPreparationCoordinator.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPreparationCoordinator.kt
index db86cd5f..ee44045a 100644
--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPreparationCoordinator.kt
+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPreparationCoordinator.kt
@@ -5,6 +5,7 @@ import com.streamvault.domain.model.ContentType
import com.streamvault.domain.model.ProviderType
import com.streamvault.domain.model.Result as DomainResult
import com.streamvault.domain.model.StreamInfo
+import com.streamvault.domain.settings.VodTrackPreferences
import com.streamvault.player.PlayerEngine
import com.streamvault.player.playback.applyPlaybackTransportPolicy
import com.streamvault.player.playback.applyUnsafeTlsBypass
@@ -33,7 +34,8 @@ class PlayerPreparationCoordinator @Inject constructor(
val currentStreamUrl: String?,
val probePassedPlaybackKeys: Set<String>,
val probeBeforePlayback: Boolean,
- val audioVideoOffsetMs: Int
+ val audioVideoOffsetMs: Int,
+ val vodTrackPreferences: VodTrackPreferences? = null
)
internal sealed interface Result {
@@ -90,7 +92,8 @@ class PlayerPreparationCoordinator @Inject constructor(
applyPlaybackPreferences(
engine = playerEngineCoordinator.currentEngine,
contentType = request.contentType,
- audioVideoOffsetMs = request.audioVideoOffsetMs
+ audioVideoOffsetMs = request.audioVideoOffsetMs,
+ vodTrackPreferences = request.vodTrackPreferences
)
if (!isCurrent()) return null
@@ -105,7 +108,8 @@ class PlayerPreparationCoordinator @Inject constructor(
internal suspend fun applyPlaybackPreferences(
engine: PlayerEngine,
contentType: ContentType,
- audioVideoOffsetMs: Int
+ audioVideoOffsetMs: Int,
+ vodTrackPreferences: VodTrackPreferences? = null
) {
engine.setMuted(playerPreferencesCoordinator.playerMuted.first())
engine.setPlaybackSpeed(
@@ -121,6 +125,7 @@ class PlayerPreparationCoordinator @Inject constructor(
appLanguage = playerPreferencesCoordinator.appLanguage.first()
)
)
+ engine.setVodTrackPreferences(vodTrackPreferences)
engine.setNetworkQualityPreferences(
wifiMaxHeight = playerPreferencesCoordinator.playerWifiMaxVideoHeight.first(),
ethernetMaxHeight = playerPreferencesCoordinator.playerEthernetMaxVideoHeight.first()
@@ -132,6 +137,22 @@ class PlayerPreparationCoordinator @Inject constructor(
engine.setAudioVideoOffsetMs(audioVideoOffsetMs)
}
+ internal suspend fun resolveVodTrackPreferences(
+ contentType: ContentType,
+ providerId: Long,
+ contentId: Long,
+ seriesId: Long?
+ ): VodTrackPreferences? {
+ val scope = buildVodTrackPreferenceScope(
+ contentType = contentType,
+ providerId = providerId,
+ contentId = contentId,
+ seriesId = seriesId
+ ) ?: return null
+ return playerPreferencesCoordinator.getVodTrackPreferences(scope).first()
+ ?: playerPreferencesCoordinator.globalVodTrackPreferences.first()
+ }
+
private suspend fun shouldProbePlaybackUrl(request: Request, url: String): Boolean {
if (!url.startsWith("http://") && !url.startsWith("https://")) return false
val providerId = request.providerId.takeIf { it > 0L } ?: return false
diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPreparationSetupActions.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPreparationSetupActions.kt
index 87690d7a..06edb9d0 100644
--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPreparationSetupActions.kt
+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPreparationSetupActions.kt
@@ -94,6 +94,7 @@ internal fun PlayerViewModel.applyPrepareSessionState(
currentSeasonNumber = seasonNumber
currentEpisodeNumber = episodeNumber
currentStableEpisodeId = episodeId?.takeIf { it > 0L }
+ activeVodTrackPreferences = null
val streamClassLabel = if (hasArchiveRequest) "Catch-up" else "Primary"
applyDefaultPlaybackTimersIfNeeded()
diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerViewModel.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerViewModel.kt
index 06e38054..0ae3de17 100644
--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerViewModel.kt
+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerViewModel.kt
@@ -25,6 +25,7 @@ import com.streamvault.domain.model.Series
import com.streamvault.domain.model.StreamInfo
import com.streamvault.domain.model.VirtualCategoryIds
import com.streamvault.domain.model.VideoFormat
+import com.streamvault.domain.settings.VodTrackPreferences
import com.streamvault.player.AUDIO_VIDEO_OFFSET_MAX_MS
import com.streamvault.player.AUDIO_VIDEO_OFFSET_MIN_MS
import com.streamvault.player.PlaybackState
@@ -44,6 +45,7 @@ import kotlinx.coroutines.delay
import kotlinx.coroutines.ensureActive
import kotlinx.coroutines.flow.*
import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
import android.content.Context
import javax.inject.Inject
@@ -357,6 +359,8 @@ class PlayerViewModel @Inject constructor(
internal var currentSeasonNumber: Int? = null
internal var currentEpisodeNumber: Int? = null
internal var currentStableEpisodeId: Long? = null
+ internal var activeVodTrackPreferences: VodTrackPreferences? = null
+ internal val vodTrackPreferenceSaveMutex = Mutex()
internal var isVirtualCategory: Boolean = false
internal var currentCombinedProfileMembers: List<CombinedM3uProfileMember> = emptyList()
internal var combinedCategoriesById: Map<Long, CombinedCategory> = emptyMap()
@@ -1029,6 +1033,13 @@ class PlayerViewModel @Inject constructor(
): Boolean {
if (!isActivePlaybackSession(requestVersion)) return false
+ activeVodTrackPreferences = playerPreparationCoordinator.resolveVodTrackPreferences(
+ contentType = currentContentType,
+ providerId = currentProviderId,
+ contentId = currentContentId,
+ seriesId = currentSeriesId
+ )
+
val preparationResult = playerPreparationCoordinator.prepare(
request = PlayerPreparationCoordinator.Request(
streamInfo = streamInfo,
@@ -1037,7 +1048,8 @@ class PlayerViewModel @Inject constructor(
currentStreamUrl = currentStreamUrl,
probePassedPlaybackKeys = probePassedPlaybackKeys.toSet(),
probeBeforePlayback = probeBeforePlayback,
- audioVideoOffsetMs = _audioVideoOffsetUiState.value.effectiveOffsetMs
+ audioVideoOffsetMs = _audioVideoOffsetUiState.value.effectiveOffsetMs,
+ vodTrackPreferences = activeVodTrackPreferences
),
isCurrent = { isActivePlaybackSession(requestVersion) }
) ?: return false
diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerVodTrackPreferenceSupport.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerVodTrackPreferenceSupport.kt
new file mode 100644
index 00000000..a730773a
--- /dev/null
+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerVodTrackPreferenceSupport.kt
@@ -0,0 +1,28 @@
+package com.streamvault.feature.playback.player
+
+import com.streamvault.domain.model.ContentType
+import com.streamvault.domain.settings.VodTrackPreferenceScope
+
+internal fun buildVodTrackPreferenceScope(
+ contentType: ContentType,
+ providerId: Long,
+ contentId: Long,
+ seriesId: Long?
+): VodTrackPreferenceScope? {
+ if (providerId <= 0L || contentId <= 0L) return null
+
+ return when (contentType) {
+ ContentType.MOVIE,
+ ContentType.VOD -> VodTrackPreferenceScope.Movie(
+ providerId = providerId,
+ contentId = contentId
+ )
+
+ ContentType.SERIES_EPISODE -> seriesId
+ ?.takeIf { it > 0L }
+ ?.let { VodTrackPreferenceScope.Series(providerId = providerId, contentId = it) }
+
+ ContentType.LIVE,
+ ContentType.SERIES -> null
+ }
+}
diff --git a/feature/playback/src/test/java/com/streamvault/feature/playback/player/PlayerVodTrackPreferenceScopeTest.kt b/feature/playback/src/test/java/com/streamvault/feature/playback/player/PlayerVodTrackPreferenceScopeTest.kt
new file mode 100644
index 00000000..54afb3a0
--- /dev/null
+++ b/feature/playback/src/test/java/com/streamvault/feature/playback/player/PlayerVodTrackPreferenceScopeTest.kt
@@ -0,0 +1,45 @@
+package com.streamvault.feature.playback.player
+
+import com.google.common.truth.Truth.assertThat
+import com.streamvault.domain.model.ContentType
+import com.streamvault.domain.settings.VodTrackPreferenceScope
+import org.junit.Test
+
+class PlayerVodTrackPreferenceScopeTest {
+
+ @Test
+ fun `movie preferences use the movie identity`() {
+ assertThat(
+ buildVodTrackPreferenceScope(
+ contentType = ContentType.MOVIE,
+ providerId = 7L,
+ contentId = 42L,
+ seriesId = null
+ )
+ ).isEqualTo(VodTrackPreferenceScope.Movie(providerId = 7L, contentId = 42L))
+ }
+
+ @Test
+ fun `series episode preferences use the series identity`() {
+ assertThat(
+ buildVodTrackPreferenceScope(
+ contentType = ContentType.SERIES_EPISODE,
+ providerId = 7L,
+ contentId = 101L,
+ seriesId = 9L
+ )
+ ).isEqualTo(VodTrackPreferenceScope.Series(providerId = 7L, contentId = 9L))
+ }
+
+ @Test
+ fun `live playback has no VOD preference scope`() {
+ assertThat(
+ buildVodTrackPreferenceScope(
+ contentType = ContentType.LIVE,
+ providerId = 7L,
+ contentId = 101L,
+ seriesId = null
+ )
+ ).isNull()
+ }
+}
diff --git a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
index fe36bf0b..f631f60e 100644
--- a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
+++ b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
@@ -37,6 +37,7 @@ import com.streamvault.domain.model.PlaybackCompatibilityKey
import com.streamvault.domain.model.PlaybackCompatibilityRecord
import com.streamvault.domain.model.PlayerSurfaceMode
import com.streamvault.domain.model.StreamInfo
+import com.streamvault.domain.settings.VodTrackPreferences
import com.streamvault.domain.model.VideoFormat
import com.streamvault.domain.repository.PlaybackCompatibilityRepository
import com.streamvault.player.audio.PlayerAudioFocusController
@@ -198,6 +199,7 @@ class Media3PlayerEngine @Inject constructor(
private var compatibilityDecisionSource: String = "DEFAULT"
@Volatile
private var pendingLearnedAudioFallback: PendingLearnedAudioFallback? = null
+ private var vodTrackPreferencesConfiguredForNextPrepare = false
private var videoStallCount = 0
private var videoStallRecoveryAttempt = 0
private var videoStallSafeRecoveryPerformed = false
@@ -424,6 +426,10 @@ class Media3PlayerEngine @Inject constructor(
override fun prepare(streamInfo: StreamInfo) {
if (ensureNotDisposed("prepare")) return
+ if (!vodTrackPreferencesConfiguredForNextPrepare) {
+ trackController.setVodTrackPreferences(exoPlayer, null)
+ }
+ vodTrackPreferencesConfiguredForNextPrepare = false
prepareInternal(streamInfo = streamInfo, preserveRetryState = false, seekPositionMs = null, autoPlay = true)
}
@@ -736,6 +742,11 @@ class Media3PlayerEngine @Inject constructor(
trackController.setPreferredAudioLanguage(exoPlayer, languageTag)
}
+ override fun setVodTrackPreferences(preferences: VodTrackPreferences?) {
+ vodTrackPreferencesConfiguredForNextPrepare = true
+ trackController.setVodTrackPreferences(exoPlayer, preferences)
+ }
+
override fun setSubtitleStyle(style: PlayerSubtitleStyle) {
subtitleStyleController.updateStyle(style)
viewBinder.reapplyStyle()
@@ -1555,6 +1566,7 @@ class Media3PlayerEngine @Inject constructor(
override fun onTracksChanged(tracks: androidx.media3.common.Tracks) {
trackController.onTracksChanged(tracks)
+ exoPlayer?.let(trackController::applyVodTrackPreferences)
// Detect the silent failure: the stream contains audio groups but no track
// is decodable on this device (e.g. EAC3/AC3 without passthrough or a
// software decoder). ExoPlayer simply skips the audio renderer without
diff --git a/player/src/main/java/com/streamvault/player/PlayerEngine.kt b/player/src/main/java/com/streamvault/player/PlayerEngine.kt
index 70469de5..410f8556 100644
--- a/player/src/main/java/com/streamvault/player/PlayerEngine.kt
+++ b/player/src/main/java/com/streamvault/player/PlayerEngine.kt
@@ -10,6 +10,7 @@ import com.streamvault.domain.model.PlayerSurfaceMode
import com.streamvault.domain.model.DrmScheme
import com.streamvault.domain.model.StreamInfo
import com.streamvault.domain.model.VideoFormat
+import com.streamvault.domain.settings.VodTrackPreferences
import androidx.media3.common.PlaybackException
import androidx.media3.datasource.HttpDataSource
import com.streamvault.player.playback.PlaybackErrorCategory
@@ -93,6 +94,7 @@ interface PlayerEngine {
fun pauseTimeshift()
fun resumeTimeshift()
fun setPreferredAudioLanguage(languageTag: String?)
+ fun setVodTrackPreferences(preferences: VodTrackPreferences?)
fun setSubtitleStyle(style: PlayerSubtitleStyle)
fun setNetworkQualityPreferences(wifiMaxHeight: Int?, ethernetMaxHeight: Int?)
fun selectAudioTrack(trackId: String)
diff --git a/player/src/main/java/com/streamvault/player/tracks/PlayerTrackController.kt b/player/src/main/java/com/streamvault/player/tracks/PlayerTrackController.kt
index 028a902e..c5a0d324 100644
--- a/player/src/main/java/com/streamvault/player/tracks/PlayerTrackController.kt
+++ b/player/src/main/java/com/streamvault/player/tracks/PlayerTrackController.kt
@@ -8,6 +8,7 @@ import androidx.media3.common.Format
import androidx.media3.common.TrackSelectionOverride
import androidx.media3.common.Tracks
import androidx.media3.exoplayer.ExoPlayer
+import com.streamvault.domain.settings.VodTrackPreferences
import com.streamvault.player.PLAYER_TRACK_AUTO_ID
import com.streamvault.player.PlayerTrack
import com.streamvault.player.TrackType
@@ -33,6 +34,7 @@ class PlayerTrackController(
private var preferredAudioLanguageTag: String? = null
private var preferredWifiMaxVideoHeight: Int? = null
private var preferredEthernetMaxVideoHeight: Int? = null
+ private var vodTrackPreferences: VodTrackPreferences? = null
fun resetSelections() {
_availableAudioTracks.value = emptyList()
@@ -60,6 +62,54 @@ class PlayerTrackController(
.build()
}
+ fun setVodTrackPreferences(player: ExoPlayer?, preferences: VodTrackPreferences?) {
+ vodTrackPreferences = preferences
+ player?.let(::applyVodTrackPreferences)
+ }
+
+ fun applyVodTrackPreferences(player: ExoPlayer) {
+ val preferences = vodTrackPreferences ?: return
+ val builder = player.trackSelectionParameters.buildUpon()
+
+ preferences.audio?.let { preference ->
+ val selected = resolvePreferredPlayerTrack(preference, _availableAudioTracks.value)
+ if (selected != null) {
+ findOverride(player.currentTracks, C.TRACK_TYPE_AUDIO, selected.id)?.let { override ->
+ builder
+ .setTrackTypeDisabled(C.TRACK_TYPE_AUDIO, false)
+ .clearOverridesOfType(C.TRACK_TYPE_AUDIO)
+ .setOverrideForType(override)
+ _availableAudioTracks.update { tracks ->
+ tracks.map { track -> track.copy(isSelected = track.id == selected.id) }
+ }
+ }
+ }
+ }
+
+ preferences.subtitle?.let { preference ->
+ val selected = resolvePreferredPlayerTrack(preference, _availableSubtitleTracks.value)
+ builder.clearOverridesOfType(C.TRACK_TYPE_TEXT)
+ if (preference.disabled || selected == null) {
+ builder.setTrackTypeDisabled(C.TRACK_TYPE_TEXT, true)
+ _availableSubtitleTracks.update { tracks -> tracks.map { it.copy(isSelected = false) } }
+ } else {
+ findOverride(player.currentTracks, C.TRACK_TYPE_TEXT, selected.id)?.let { override ->
+ builder
+ .setTrackTypeDisabled(C.TRACK_TYPE_TEXT, false)
+ .setOverrideForType(override)
+ _availableSubtitleTracks.update { tracks ->
+ tracks.map { track -> track.copy(isSelected = track.id == selected.id) }
+ }
+ }
+ }
+ }
+
+ val updatedParameters = builder.build()
+ if (updatedParameters != player.trackSelectionParameters) {
+ player.trackSelectionParameters = updatedParameters
+ }
+ }
+
fun setPreferredAudioLanguage(player: ExoPlayer?, languageTag: String?) {
preferredAudioLanguageTag = languageTag?.trim()?.takeIf { it.isNotBlank() }
player?.trackSelectionParameters = player?.trackSelectionParameters
diff --git a/player/src/main/java/com/streamvault/player/tracks/VodTrackPreferenceResolver.kt b/player/src/main/java/com/streamvault/player/tracks/VodTrackPreferenceResolver.kt
new file mode 100644
index 00000000..6c65ea97
--- /dev/null
+++ b/player/src/main/java/com/streamvault/player/tracks/VodTrackPreferenceResolver.kt
@@ -0,0 +1,55 @@
+package com.streamvault.player.tracks
+
+import com.streamvault.domain.settings.VodTrackPreference
+import com.streamvault.player.PlayerTrack
+
+internal fun resolvePreferredPlayerTrack(
+ preference: VodTrackPreference,
+ availableTracks: List<PlayerTrack>
+): PlayerTrack? {
+ if (preference.disabled) return null
+
+ preference.trackId
+ ?.takeIf(String::isNotBlank)
+ ?.let { trackId ->
+ availableTracks.firstOrNull { it.id == trackId }
+ }
+ ?.let { return it }
+
+ val preferredLanguage = normalizeTrackLanguage(preference.language)
+ val preferredLabel = normalizeTrackValue(preference.label)
+
+ if (!preferredLanguage.isNullOrBlank()) {
+ availableTracks.firstOrNull { track ->
+ trackLanguageMatches(preferredLanguage, track.language) &&
+ !preferredLabel.isNullOrBlank() &&
+ normalizeTrackValue(track.name) == preferredLabel
+ }?.let { return it }
+
+ availableTracks.firstOrNull { track ->
+ trackLanguageMatches(preferredLanguage, track.language)
+ }?.let { return it }
+ }
+
+ return availableTracks.firstOrNull { track ->
+ !preferredLabel.isNullOrBlank() && normalizeTrackValue(track.name) == preferredLabel
+ }
+}
+
+private fun normalizeTrackValue(value: String?): String? = value
+ ?.trim()
+ ?.takeIf(String::isNotBlank)
+ ?.lowercase()
+
+private fun normalizeTrackLanguage(value: String?): String? = value
+ ?.trim()
+ ?.replace('_', '-')
+ ?.takeIf(String::isNotBlank)
+ ?.lowercase()
+
+private fun trackLanguageMatches(preferredLanguage: String?, availableLanguage: String?): Boolean {
+ val normalizedAvailable = normalizeTrackLanguage(availableLanguage) ?: return false
+ if (preferredLanguage.isNullOrBlank()) return false
+ return preferredLanguage == normalizedAvailable ||
+ preferredLanguage.substringBefore('-') == normalizedAvailable.substringBefore('-')
+}
diff --git a/player/src/test/java/com/streamvault/player/tracks/VodTrackPreferenceResolverTest.kt b/player/src/test/java/com/streamvault/player/tracks/VodTrackPreferenceResolverTest.kt
new file mode 100644
index 00000000..bf33ac84
--- /dev/null
+++ b/player/src/test/java/com/streamvault/player/tracks/VodTrackPreferenceResolverTest.kt
@@ -0,0 +1,98 @@
+package com.streamvault.player.tracks
+
+import com.google.common.truth.Truth.assertThat
+import com.streamvault.domain.settings.VodTrackPreference
+import com.streamvault.player.PlayerTrack
+import com.streamvault.player.TrackType
+import org.junit.Test
+
+class VodTrackPreferenceResolverTest {
+
+ @Test
+ fun `matches a series track by language and label when episode track id changes`() {
+ val preference = VodTrackPreference(
+ trackId = "episode-one-audio",
+ language = "es",
+ label = "Spanish"
+ )
+ val available = listOf(
+ PlayerTrack(
+ id = "episode-two-audio",
+ name = "Spanish",
+ language = "es",
+ type = TrackType.AUDIO,
+ isSelected = false
+ )
+ )
+
+ assertThat(resolvePreferredPlayerTrack(preference, available)).isEqualTo(available.single())
+ }
+
+ @Test
+ fun `falls back to the preferred language when the label also changes`() {
+ val preference = VodTrackPreference(
+ trackId = "old-subtitle",
+ language = "fr",
+ label = "French"
+ )
+ val available = listOf(
+ PlayerTrack(
+ id = "new-subtitle",
+ name = "Français",
+ language = "fr",
+ type = TrackType.TEXT,
+ isSelected = false
+ )
+ )
+
+ assertThat(resolvePreferredPlayerTrack(preference, available)).isEqualTo(available.single())
+ }
+
+ @Test
+ fun `does not select a track when the preferred language is unavailable`() {
+ val preference = VodTrackPreference(language = "de", label = "German")
+ val available = listOf(
+ PlayerTrack(
+ id = "english",
+ name = "English",
+ language = "en",
+ type = TrackType.TEXT,
+ isSelected = false
+ )
+ )
+
+ assertThat(resolvePreferredPlayerTrack(preference, available)).isNull()
+ }
+
+ @Test
+ fun `falls back to the preferred label when language metadata is missing`() {
+ val preference = VodTrackPreference(label = "Commentary")
+ val available = listOf(
+ PlayerTrack(
+ id = "commentary",
+ name = "Commentary",
+ language = null,
+ type = TrackType.AUDIO,
+ isSelected = false
+ )
+ )
+
+ assertThat(resolvePreferredPlayerTrack(preference, available)).isEqualTo(available.single())
+ }
+
+ @Test
+ fun `matches language families when locale regions differ between episodes`() {
+ val preference = VodTrackPreference(language = "es-ES")
+ val available = listOf(
+ PlayerTrack(
+ id = "spanish",
+ name = "Spanish",
+ language = "es",
+ type = TrackType.AUDIO,
+ isSelected = false
+ )
+ )
+
+ assertThat(resolvePreferredPlayerTrack(preference, available)).isEqualTo(available.single())
+ }
+}