StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
feat: Implement automatic refresh rate matching for video playback
David Nashasha4852ff5f707
diff --git a/app/build.gradle.kts b/app/build.gradle.ktsindex 83e91ccd..669db2fc 100644--- a/app/build.gradle.kts+++ b/app/build.gradle.kts@@ -81,8 +81,8 @@ android {applicationId = "com.streamvault.app"minSdk = 25targetSdk = 36- versionCode = 23- versionName = "1.2.1"+ versionCode = 24+ versionName = "1.2.2"testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"buildConfigField("String", "TRAKT_CLIENT_ID", buildStringLiteral(traktClientId))buildConfigField("String", "TRAKT_REDIRECT_URI", buildStringLiteral(traktRedirectUri))diff --git a/app/src/androidTest/java/com/streamvault/app/ui/RefreshRateMatchingRuntimeTest.kt b/app/src/androidTest/java/com/streamvault/app/ui/RefreshRateMatchingRuntimeTest.ktnew file mode 100644index 00000000..6f6955a5--- /dev/null+++ b/app/src/androidTest/java/com/streamvault/app/ui/RefreshRateMatchingRuntimeTest.kt@@ -0,0 +1,122 @@+package com.streamvault.app.ui++import android.app.Application+import android.os.SystemClock+import android.view.View+import androidx.test.core.app.ActivityScenario+import androidx.test.core.app.ApplicationProvider+import androidx.test.ext.junit.runners.AndroidJUnit4+import androidx.test.platform.app.InstrumentationRegistry+import com.streamvault.app.MainActivity+import com.streamvault.domain.model.PlaybackContentKind+import com.streamvault.domain.model.StreamInfo+import com.streamvault.domain.model.StreamType+import com.streamvault.domain.model.PlaybackCompatibilityKey+import com.streamvault.domain.repository.PlaybackCompatibilityRepository+import com.streamvault.player.AudioCompatibilityMemoryStore+import com.streamvault.player.Media3PlayerEngine+import com.streamvault.player.PlaybackSupportSnapshotStore+import com.streamvault.player.PlaybackState+import com.streamvault.player.PlayerEngine+import com.streamvault.player.PlayerSurfaceResizeMode+import okhttp3.OkHttpClient+import kotlinx.coroutines.*+import kotlinx.coroutines.flow.collect+import org.json.JSONArray+import org.json.JSONObject+import org.junit.Assert.*+import org.junit.Assume.assumeTrue+import org.junit.Test+import org.junit.runner.RunWith++/** Opt-in, local HLS fixture probe. HDMI mode acceptance still needs a physical television. */+@RunWith(AndroidJUnit4::class)+class RefreshRateMatchingRuntimeTest {+ @Test fun livePlaybackWithRefreshRequests() = runBlocking {+ val instrumentation = InstrumentationRegistry.getInstrumentation()+ val arguments = InstrumentationRegistry.getArguments()+ assumeTrue(arguments.getString("refreshMatchingFixture") == "true")+ val fixtureUrl = requireNotNull(arguments.getString("fixtureUrl"))+ val runId = requireNotNull(arguments.getString("runId"))+ require(runId.matches(Regex("[A-Za-z0-9_-]{1,40}")))+ val expectedRate = requireNotNull(arguments.getString("expectedRate")).toFloat()+ val durationMs = (arguments.getString("durationSeconds")?.toLong() ?: 136L) * 1_000L+ val app = ApplicationProvider.getApplicationContext<Application>()+ val engine: PlayerEngine = Media3PlayerEngine(+ context = app,+ okHttpClient = OkHttpClient(),+ playbackCompatibilityRepository = NoOpCompatibilityRepository,+ audioCompatibilityMemoryStore = AudioCompatibilityMemoryStore(app),+ playbackSupportSnapshotStore = PlaybackSupportSnapshotStore(app)+ )+ val scenario = ActivityScenario.launch(MainActivity::class.java)+ var renderView: View? = null+ fun main(action: () -> Unit) = instrumentation.runOnMainSync(action)+ val errors = mutableListOf<String>()+ val errorJob = launch { engine.error.collect { if (it != null) errors.add(it.javaClass.simpleName) } }+ val samples = JSONArray()+ try {+ scenario.onActivity { activity ->+ renderView = engine.createRenderView(activity, PlayerSurfaceResizeMode.FIT)+ activity.setContentView(renderView)+ engine.bindRenderView(renderView!!, PlayerSurfaceResizeMode.FIT)+ }+ main {+ engine.setMediaSessionEnabled(true)+ engine.prepare(StreamInfo(url = fixtureUrl, title = "AFR fixture $runId", streamType = StreamType.HLS,+ containerExtension = "m3u8", playbackContentKind = PlaybackContentKind.LIVE))+ engine.play()+ }+ withTimeout(45_000) {+ while (!engine.isPlaying.value || engine.videoFormat.value.frameRate <= 0f) delay(100)+ }+ assertEquals(expectedRate, engine.videoFormat.value.frameRate, 0.1f)+ main { engine.setDisplayFrameRate(engine.videoFormat.value.frameRate) }+ println("AFR_READY runId=$runId fps=${engine.videoFormat.value.frameRate}")+ val started = SystemClock.elapsedRealtime()+ var toggled = false+ while (SystemClock.elapsedRealtime() - started < durationMs) {+ val stats = engine.playerStats.value+ val sample = JSONObject().put("elapsedMs", SystemClock.elapsedRealtime() - started)+ .put("state", engine.playbackState.value.name).put("playing", engine.isPlaying.value)+ .put("fps", engine.videoFormat.value.frameRate).put("width", stats.width).put("height", stats.height)+ .put("dropped", stats.droppedFrames).put("rebuffers", stats.rebufferCount)+ main {+ sample.put("displayHz", renderView?.display?.mode?.refreshRate)+ sample.put("outputWidth", renderView?.display?.mode?.physicalWidth)+ sample.put("outputHeight", renderView?.display?.mode?.physicalHeight)+ }+ samples.put(sample)+ if (!toggled && SystemClock.elapsedRealtime() - started > 50_000) {+ main { engine.setDisplayFrameRate(null) }+ delay(1_000)+ main { engine.setDisplayFrameRate(engine.videoFormat.value.frameRate) }+ toggled = true+ }+ delay(1_000)+ }+ assertEquals(PlaybackState.READY, engine.playbackState.value)+ assertTrue(engine.isPlaying.value)+ assertTrue("Playback errors: $errors", errors.isEmpty())+ app.filesDir.resolve("refresh-match-$runId.json").writeText(JSONObject().put("runId", runId)+ .put("expectedRate", expectedRate).put("errors", JSONArray(errors)).put("samples", samples).toString(2))+ } finally {+ errorJob.cancel()+ main {+ engine.setDisplayFrameRate(null)+ engine.stop()+ renderView?.let(engine::releaseRenderView)+ engine.release()+ }+ scenario.close()+ }+ }++ private object NoOpCompatibilityRepository : PlaybackCompatibilityRepository {+ override suspend fun getKnownBadRecords(deviceFingerprint: String, streamType: String, videoMimeType: String,+ resolutionBucket: String) = emptyList<com.streamvault.domain.model.PlaybackCompatibilityRecord>()+ override suspend fun recordFailure(key: PlaybackCompatibilityKey, failureType: String, at: Long) = Unit+ override suspend fun recordSuccess(key: PlaybackCompatibilityKey, at: Long) = Unit+ override suspend fun prune(maxRecords: Int, olderThanMs: Long) = Unit+ }+}diff --git a/data/src/main/java/com/streamvault/data/manager/BackupManagerImpl.kt b/data/src/main/java/com/streamvault/data/manager/BackupManagerImpl.ktindex 772d8671..bb498a2e 100644--- a/data/src/main/java/com/streamvault/data/manager/BackupManagerImpl.kt+++ b/data/src/main/java/com/streamvault/data/manager/BackupManagerImpl.kt@@ -353,6 +353,7 @@ class BackupManagerImpl @Inject constructor(put("playerTimeshiftBackend", preferencesRepository.playerTimeshiftBackend.first().name)put("defaultStopPlaybackTimerMinutes", preferencesRepository.defaultStopPlaybackTimerMinutes.first().toString())put("defaultIdleStandbyTimerMinutes", preferencesRepository.defaultIdleStandbyTimerMinutes.first().toString())+ put("playerRefreshRateMatchingEnabled", preferencesRepository.playerRefreshRateMatchingEnabled.first().toString())put("preventStandbyDuringPlayback", preferencesRepository.preventStandbyDuringPlayback.first().toString())put("zapAutoRevert", preferencesRepository.zapAutoRevert.first().toString())put("autoPlayNextEpisode", preferencesRepository.autoPlayNextEpisode.first().toString())@@ -3605,6 +3606,7 @@ class BackupManagerImpl @Inject constructor(put("playerTimeshiftBackend", preferencesRepository.playerTimeshiftBackend.first().name)put("defaultStopPlaybackTimerMinutes", preferencesRepository.defaultStopPlaybackTimerMinutes.first().toString())put("defaultIdleStandbyTimerMinutes", preferencesRepository.defaultIdleStandbyTimerMinutes.first().toString())+ put("playerRefreshRateMatchingEnabled", preferencesRepository.playerRefreshRateMatchingEnabled.first().toString())put("preventStandbyDuringPlayback", preferencesRepository.preventStandbyDuringPlayback.first().toString())put("zapAutoRevert", preferencesRepository.zapAutoRevert.first().toString())put("autoPlayNextEpisode", preferencesRepository.autoPlayNextEpisode.first().toString())@@ -4404,6 +4406,8 @@ class BackupManagerImpl @Inject constructor(?.let { preferencesRepository.setDefaultStopPlaybackTimerMinutes(it) }prefs["defaultIdleStandbyTimerMinutes"]?.toIntOrNull()?.let { preferencesRepository.setDefaultIdleStandbyTimerMinutes(it) }+ prefs["playerRefreshRateMatchingEnabled"]?.toBooleanStrictOrNull()+ ?.let { preferencesRepository.setPlayerRefreshRateMatchingEnabled(it) }prefs["preventStandbyDuringPlayback"]?.toBooleanStrictOrNull()?.let { preferencesRepository.setPreventStandbyDuringPlayback(it) }prefs["zapAutoRevert"]?.toBooleanStrictOrNull()diff --git a/data/src/main/java/com/streamvault/data/manager/PreferenceBackupRegistry.kt b/data/src/main/java/com/streamvault/data/manager/PreferenceBackupRegistry.ktindex a151ae0c..404cadf9 100644--- a/data/src/main/java/com/streamvault/data/manager/PreferenceBackupRegistry.kt+++ b/data/src/main/java/com/streamvault/data/manager/PreferenceBackupRegistry.kt@@ -34,6 +34,7 @@ internal object PreferenceBackupRegistry {"multiview_center_two_slot_layout", "multiview_respect_provider_connection_limit","is_incognito_mode", "hide_stremio_addons", "player_muted", "player_media_session_enabled", "player_back_button_visibility","player_confirm_close_playback",+ "player_refresh_rate_matching_enabled","player_fast_retry_on_transient_failures", "player_audio_decoder_mode", "player_video_decoder_mode","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",@@ -135,6 +136,7 @@ internal object PreferenceBackupRegistry {"playbackQualityPreferences","playerTimeshiftEnabled", "playerTimeshiftDepthMinutes", "playerTimeshiftBackend","defaultStopPlaybackTimerMinutes", "defaultIdleStandbyTimerMinutes", "preventStandbyDuringPlayback",+ "playerRefreshRateMatchingEnabled","zapAutoRevert", "autoPlayNextEpisode", "autoCheckAppUpdates", "autoDownloadAppUpdates","recordingWifiOnly", "recordingPaddingBeforeMinutes", "recordingPaddingAfterMinutes","maxConcurrentStreams", "isIncognitoMode", "hideStremioAddons", "useXtreamTextClassification",diff --git a/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt b/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.ktindex 318a7fe4..8946cb88 100644--- a/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt+++ b/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt@@ -558,6 +558,7 @@ class PreferencesRepository @Inject constructor(val XTREAM_BASE64_TEXT_COMPATIBILITY = booleanPreferencesKey("xtream_base64_text_compatibility")val XTREAM_TEXT_IMPORT_GENERATION = longPreferencesKey("xtream_text_import_generation")val ZAP_AUTO_REVERT = booleanPreferencesKey("zap_auto_revert")+ val PLAYER_REFRESH_RATE_MATCHING_ENABLED = booleanPreferencesKey("player_refresh_rate_matching_enabled")val PREVENT_STANDBY_DURING_PLAYBACK = booleanPreferencesKey("prevent_standby_during_playback")val AUTO_PLAY_NEXT_EPISODE = booleanPreferencesKey("auto_play_next_episode")val AUTO_CHECK_APP_UPDATES = booleanPreferencesKey("auto_check_app_updates")@@ -1123,6 +1124,10 @@ class PreferencesRepository @Inject constructor(}}+ override val playerRefreshRateMatchingEnabled: Flow<Boolean> = context.dataStore.data.map { preferences ->+ preferences[PreferencesKeys.PLAYER_REFRESH_RATE_MATCHING_ENABLED] ?: true+ }+override val preventStandbyDuringPlayback: Flow<Boolean> = context.dataStore.data.map { preferences ->preferences[PreferencesKeys.PREVENT_STANDBY_DURING_PLAYBACK] ?: true}@@ -1285,6 +1290,12 @@ class PreferencesRepository @Inject constructor(}}+ override suspend fun setPlayerRefreshRateMatchingEnabled(enabled: Boolean) {+ context.dataStore.edit { preferences ->+ preferences[PreferencesKeys.PLAYER_REFRESH_RATE_MATCHING_ENABLED] = enabled+ }+ }+override suspend fun setPreventStandbyDuringPlayback(prevent: Boolean) {context.dataStore.edit { preferences ->preferences[PreferencesKeys.PREVENT_STANDBY_DURING_PLAYBACK] = preventdiff --git a/data/src/test/java/com/streamvault/data/preferences/PreferencesRepositoryRefreshRateMatchingTest.kt b/data/src/test/java/com/streamvault/data/preferences/PreferencesRepositoryRefreshRateMatchingTest.ktnew file mode 100644index 00000000..5f27a52f--- /dev/null+++ b/data/src/test/java/com/streamvault/data/preferences/PreferencesRepositoryRefreshRateMatchingTest.kt@@ -0,0 +1,34 @@+package com.streamvault.data.preferences++import android.content.Context+import androidx.datastore.preferences.preferencesDataStoreFile+import com.google.common.truth.Truth.assertThat+import kotlinx.coroutines.flow.first+import kotlinx.coroutines.runBlocking+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+import org.robolectric.annotation.Config++@RunWith(RobolectricTestRunner::class)+@Config(sdk = [35])+class PreferencesRepositoryRefreshRateMatchingTest {+ private lateinit var context: Context++ @Before fun setUp() {+ context = RuntimeEnvironment.getApplication()+ context.preferencesDataStoreFile("user_preferences").delete()+ }++ @Test fun `refresh matching defaults on and saves explicit off and on choices`() = runBlocking {+ val original = PreferencesRepository(context, mock(), mock(), mock(), mock())+ assertThat(original.playerRefreshRateMatchingEnabled.first()).isTrue()+ original.setPlayerRefreshRateMatchingEnabled(false)+ assertThat(original.playerRefreshRateMatchingEnabled.first()).isFalse()+ original.setPlayerRefreshRateMatchingEnabled(true)+ assertThat(original.playerRefreshRateMatchingEnabled.first()).isTrue()+ }+}diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.mdindex a3d6612a..bedc0aa0 100644--- a/docs/CHANGELOG.md+++ b/docs/CHANGELOG.md@@ -4,6 +4,7 @@ All notable product changes are recorded in this document.## [1.2.2]### Added+- Added default-on content frame-rate matching for video playback, with a Playback setting to turn it off and device-supported display refresh-rate switching for smoother motion.- Added provider connection checks to Settings → Providers, separate from sync state and **In use**, with Online, Unavailable, Authentication required, and Unknown statuses, a last-checked time, and a manual recheck action. Checks run when the section opens and refresh when results are more than five minutes old.- Added time-based recording scheduling so live channels without EPG data can be recorded for a chosen start time and duration, with daily and weekly repeat options, from the player's recording menu.@@ -14,6 +15,8 @@ All notable product changes are recorded in this document.- Reduced peak memory during large M3U syncs by using staged database keys for duplicate detection and paged series reconciliation; Xtream and Stalker sync paths are unchanged.### Fixed+- Fixed Stalker setup interruptions from redundant transport warning popups; transport retries now continue automatically, with any unresolved challenge shown inline.+- Fixed the backup restore sync dialog using mismatched colors; its surface, text, and checkbox now follow the active app theme, and **Sync selected** stays disabled until a provider is selected.- Fixed Live TV remaining stuck loading after deleting a provider and adding another by clearing and validating the saved active source.- Fixed missing episodes from providers that return nested episode arrays or season-keyed episode maps, which were previously skipped and left series with no episodes.- Fixed episodes disappearing when an episode's optional metadata block arrived in an unexpected shape: the episode is now kept and only the metadata is skipped.diff --git a/docs/REFRESH_RATE_MATCHING.md b/docs/REFRESH_RATE_MATCHING.mdnew file mode 100644index 00000000..78fba1cd--- /dev/null+++ b/docs/REFRESH_RATE_MATCHING.md@@ -0,0 +1,42 @@+# Automatic refresh matching (issue #257)++## Plan and behavior++1. Persist a global playback toggle, enabled by default, with settings search and backup/restore.+2. Let only the visible fullscreen player request the content presentation rate. Use declared FPS,+ falling back to the existing timestamp detector when metadata omits it. Account for user playback+ speed, but not temporary live-latency speed adjustments.+3. Use `Surface.setFrameRate` with fixed-source compatibility on Android 12+ SurfaceView outputs,+ permitting a nonseamless switch when Android's system setting allows it. Android 11 phones use+ the seamless API. Disable the independent renderer vote so Off, preview, and multiview behave+ consistently and two owners cannot compete.+4. On older TVs (and TV TextureView outputs), select only supported modes at the current output+ resolution. Require an integer refresh/content ratio within 0.05%; keep fractional and integer+ broadcast rates distinct. Keep an already compatible mode, otherwise prefer 50 Hz for 25 fps,+ 59.94 Hz for 29.97 fps, 60 Hz for 30 fps, and the content rate for other cadences.+5. Debounce rate changes for one second. Retain the previous vote briefly during zapping, clear it+ after five seconds without a valid rate, and release it on Off, end, error, background, PiP,+ casting, surface detach, engine replacement, and screen disposal. Pausing and buffering keep the+ vote to avoid unnecessary HDMI resyncs. Surface recreation reapplies the request.+6. Reevaluate on display changes, never force unsupported modes, and restore only a window request+ still owned by this controller. Invalid saved mode ids after HDMI hotplug restore to the system+ default. TextureView fallback on Android 12+ respects Never/Seamless/Always system preferences.++## Why an enabled-by-default toggle++An integer multiple is an exact match for motion cadence: 25 fps at 50 Hz shows each frame twice.+HDMI mode switches can briefly blank the screen, and vendor implementations differ, so users need+an opt-out. The feature makes requests; the OS/display may decline them. It does not transcode the+video, change stream quality, switch output resolution, pause playback, or retry rejected modes.++## Validation scope++Unit coverage targets fractional rates, cadence multiples, resolution preservation, unsupported+modes, stable selection, and request lifecycle. Emulator checks can confirm requests and playback+stability; an HDMI-capable physical TV is required to confirm actual nonseamless display switching.++References:+- https://github.com/Davidona/StreamVault-IPTV/issues/257+- https://developer.android.com/media/optimize/performance/frame-rate+- https://developer.android.com/reference/android/hardware/display/DisplayManager#getMatchContentFrameRateUserPreference()+- https://developer.android.com/reference/androidx/media3/exoplayer/ExoPlayer#setVideoChangeFrameRateStrategy(int)diff --git a/domain/src/main/java/com/streamvault/domain/settings/SettingsPreferences.kt b/domain/src/main/java/com/streamvault/domain/settings/SettingsPreferences.ktindex ee6d05fc..f37447de 100644--- a/domain/src/main/java/com/streamvault/domain/settings/SettingsPreferences.kt+++ b/domain/src/main/java/com/streamvault/domain/settings/SettingsPreferences.kt@@ -175,6 +175,8 @@ interface SettingsPreferences {suspend fun markXtreamTextImportApplied(providerId: Long, generation: Long)+ val playerRefreshRateMatchingEnabled: Flow<Boolean> get() = kotlinx.coroutines.flow.flowOf(true)+val preventStandbyDuringPlayback: Flow<Boolean>val autoPlayNextEpisode: Flow<Boolean>@@ -219,6 +221,8 @@ interface SettingsPreferences {suspend fun setRecordingPaddingAfterMinutes(minutes: Int)+ suspend fun setPlayerRefreshRateMatchingEnabled(enabled: Boolean) {}+suspend fun setPreventStandbyDuringPlayback(prevent: Boolean)suspend fun setAutoPlayNextEpisode(enabled: Boolean)diff --git a/domain/src/main/java/com/streamvault/domain/usecase/ValidateAndAddProvider.kt b/domain/src/main/java/com/streamvault/domain/usecase/ValidateAndAddProvider.ktindex 003396ca..3add8d08 100644--- a/domain/src/main/java/com/streamvault/domain/usecase/ValidateAndAddProvider.kt+++ b/domain/src/main/java/com/streamvault/domain/usecase/ValidateAndAddProvider.kt@@ -15,6 +15,7 @@ import com.streamvault.domain.model.StalkerCompatibilityProfileIdsimport com.streamvault.domain.model.StalkerProtocolPreferenceimport com.streamvault.domain.model.StalkerReadinessInconclusiveExceptionimport com.streamvault.domain.model.StalkerTransportChallenge+import com.streamvault.domain.model.StalkerTransportChallengeReasonimport com.streamvault.domain.model.StalkerTransportGrantimport com.streamvault.domain.model.StalkerTransportConsentRequiredExceptionimport com.streamvault.domain.repository.ProviderRepository@@ -119,6 +120,7 @@ class ValidateAndAddProvider @Inject constructor(companion object {private const val MAX_XTREAM_PLAYLIST_USERNAME_LENGTH = 128private const val MAX_XTREAM_PLAYLIST_PASSWORD_LENGTH = 256+ private const val MAX_STALKER_TRANSPORT_AUTO_GRANTS = 6private val STALKER_MAC_ADDRESS = Regex("^[0-9a-f]{2}(?::[0-9a-f]{2}){5}$", RegexOption.IGNORE_CASE)private val STALKER_MAC_IN_PLAYBACK_ROUTE =Regex("live\\.php\\?mac=([0-9a-f]{2}(?::[0-9a-f]{2}){5})", RegexOption.IGNORE_CASE)@@ -329,6 +331,16 @@ class ValidateAndAddProvider @Inject constructor(suspend fun loginStalker(command: StalkerProviderSetupCommand,onProgress: ((String) -> Unit)? = null+ ): ValidateAndAddProviderResult = loginStalker(+ command = command,+ onProgress = onProgress,+ transportGrantAttempts = 0+ )++ private suspend fun loginStalker(+ command: StalkerProviderSetupCommand,+ onProgress: ((String) -> Unit)?,+ transportGrantAttempts: Int): ValidateAndAddProviderResult {return when (val validated = providerSetupInputValidator.validateStalker(@@ -351,41 +363,67 @@ class ValidateAndAddProvider @Inject constructor(stalkerAdvancedOptionsJson = command.stalkerAdvancedOptionsJson)) {- is Result.Success -> providerRepository.setupProvider(- ProviderSetupRequest.Configured(- name = validated.data.name,- configuration = StalkerConfig(- portalUrl = validated.data.portalUrl,- device = StalkerDeviceIdentity(- macAddress = validated.data.macAddress,- deviceProfile = validated.data.deviceProfile,- timezone = validated.data.timezone,- locale = validated.data.locale,- serialNumber = validated.data.serialNumber,- deviceId = validated.data.deviceId,- deviceId2 = validated.data.deviceId2,- signature = validated.data.signature+ is Result.Success -> {+ val setupResult = providerRepository.setupProvider(+ ProviderSetupRequest.Configured(+ name = validated.data.name,+ configuration = StalkerConfig(+ portalUrl = validated.data.portalUrl,+ device = StalkerDeviceIdentity(+ macAddress = validated.data.macAddress,+ deviceProfile = validated.data.deviceProfile,+ timezone = validated.data.timezone,+ locale = validated.data.locale,+ serialNumber = validated.data.serialNumber,+ deviceId = validated.data.deviceId,+ deviceId2 = validated.data.deviceId2,+ signature = validated.data.signature+ ),+ authMode = validated.data.authMode,+ username = validated.data.username,+ password = validated.data.password,+ httpUserAgent = validated.data.httpUserAgent,+ httpHeaders = validated.data.httpHeaders,+ advancedOptionsJson = validated.data.stalkerAdvancedOptionsJson,+ protocolPreference = command.protocolPreference,+ transportGrant = command.transportGrant,+ requestedProfileId = command.requestedProfileId,+ epgSyncMode = command.epgSyncMode,+ catalogMode = command.catalogMode,+ guideSourcePolicy = command.guideSourcePolicy,+ channelLogoSourcePolicy = command.channelLogoSourcePolicy),- authMode = validated.data.authMode,- username = validated.data.username,- password = validated.data.password,- httpUserAgent = validated.data.httpUserAgent,- httpHeaders = validated.data.httpHeaders,- advancedOptionsJson = validated.data.stalkerAdvancedOptionsJson,- protocolPreference = command.protocolPreference,- transportGrant = command.transportGrant,- requestedProfileId = command.requestedProfileId,- epgSyncMode = command.epgSyncMode,- catalogMode = command.catalogMode,- guideSourcePolicy = command.guideSourcePolicy,- channelLogoSourcePolicy = command.channelLogoSourcePolicy+ existingProviderId = command.existingProviderId,+ saveWithoutVerification = command.saveWithoutVerification,+ repairConnection = command.repairConnection),- existingProviderId = command.existingProviderId,- saveWithoutVerification = command.saveWithoutVerification,- repairConnection = command.repairConnection- ),- onProgress = onProgress- ).toUseCaseResult()+ onProgress = onProgress+ ).toUseCaseResult()++ val challenge = (setupResult as? ValidateAndAddProviderResult.TransportConsentRequired)+ ?.challenge+ ?: return setupResult+ val nextGrant = challenge.acceptedGrant()+ val existingGrant = command.transportGrant+ val grantAlreadyMatches = existingGrant != null &&+ existingGrant.mode == nextGrant.mode &&+ existingGrant.origin.authority == nextGrant.origin.authority &&+ existingGrant.spkiSha256 == nextGrant.spkiSha256+ if (+ transportGrantAttempts >= MAX_STALKER_TRANSPORT_AUTO_GRANTS ||+ (challenge.reason == StalkerTransportChallengeReason.INVALID_TLS &&+ nextGrant.spkiSha256.isNullOrBlank()) ||+ grantAlreadyMatches+ ) {+ setupResult+ } else {+ loginStalker(+ command = command.copy(transportGrant = nextGrant),+ onProgress = onProgress,+ transportGrantAttempts = transportGrantAttempts + 1+ )+ }+ }is Result.Error -> ValidateAndAddProviderResult.ValidationError(validated.message)is Result.Loading -> ValidateAndAddProviderResult.Error("Unexpected loading state")diff --git a/feature/playback/build.gradle.kts b/feature/playback/build.gradle.ktsindex c2c58489..9d17858b 100644--- a/feature/playback/build.gradle.kts+++ b/feature/playback/build.gradle.kts@@ -235,6 +235,7 @@ dependencies {androidTestImplementation(libs.androidx.test.ext.junit)androidTestImplementation(libs.androidx.test.runner)androidTestImplementation(libs.truth)+ debugImplementation("androidx.compose.ui:ui-test-manifest")}val featurePlaybackProjectDependencies = configurationsdiff --git a/feature/playback/src/androidTest/java/com/streamvault/feature/playback/player/PlayerRefreshRateHostTest.kt b/feature/playback/src/androidTest/java/com/streamvault/feature/playback/player/PlayerRefreshRateHostTest.ktnew file mode 100644index 00000000..5a5a5f71--- /dev/null+++ b/feature/playback/src/androidTest/java/com/streamvault/feature/playback/player/PlayerRefreshRateHostTest.kt@@ -0,0 +1,111 @@+package com.streamvault.feature.playback.player++import androidx.compose.runtime.CompositionLocalProvider+import androidx.compose.runtime.mutableStateOf+import androidx.compose.ui.test.junit4.createComposeRule+import androidx.lifecycle.Lifecycle+import androidx.lifecycle.LifecycleOwner+import androidx.lifecycle.LifecycleRegistry+import androidx.lifecycle.compose.LocalLifecycleOwner+import androidx.test.ext.junit.runners.AndroidJUnit4+import com.streamvault.player.PlaybackState+import com.streamvault.player.PlayerEngine+import java.lang.reflect.Proxy+import org.junit.Assert.*+import org.junit.Rule+import org.junit.Test+import org.junit.runner.RunWith++@RunWith(AndroidJUnit4::class)+class PlayerRefreshRateHostTest {+ @get:Rule val rule = createComposeRule()+ private val votes = mutableListOf<Float?>()+ private val engine = Proxy.newProxyInstance(PlayerEngine::class.java.classLoader, arrayOf(PlayerEngine::class.java)) { proxy, method, args ->+ when (method.name) {+ "setDisplayFrameRate" -> { votes.add(args?.first() as Float?); null }+ "equals" -> proxy === args?.first()+ "hashCode" -> System.identityHashCode(proxy)+ "toString" -> "RefreshRateTestEngine"+ else -> error("Unexpected call: ${method.name}")+ }+ } as PlayerEngine+ private val rate = mutableStateOf(25f)+ private val enabled = mutableStateOf(true)+ private val pip = mutableStateOf(false)+ private val casting = mutableStateOf(false)+ private val visible = mutableStateOf(true)+ private val playback = mutableStateOf(PlaybackState.READY)+ private class Owner : LifecycleOwner {+ val registry = LifecycleRegistry(this)+ override val lifecycle: Lifecycle get() = registry+ }++ private fun start(): Owner {+ lateinit var owner: Owner+ rule.runOnUiThread { owner = Owner().apply { registry.currentState = Lifecycle.State.RESUMED } }+ rule.mainClock.autoAdvance = false+ rule.setContent {+ CompositionLocalProvider(LocalLifecycleOwner provides owner) {+ if (visible.value) PlayerRefreshRateHost(engine, enabled.value, rate.value, 1f, playback.value, pip.value, casting.value)+ }+ }+ rule.mainClock.advanceTimeByFrame()+ return owner+ }++ @Test fun rapidZappingOnlyRequestsLatestRate_andOffReleasesImmediately() {+ start()+ rule.mainClock.advanceTimeBy(400)+ rule.runOnIdle { rate.value = 50f }+ rule.mainClock.advanceTimeBy(1_200)+ rule.runOnIdle {+ assertFalse(votes.contains(25f))+ assertEquals(50f, votes.last())+ enabled.value = false+ }+ rule.mainClock.advanceTimeByFrame()+ rule.runOnIdle { assertNull(votes.last()) }+ }++ @Test fun pauseAndBufferingKeepVote_butPipCastingErrorAndEndReleaseIt() {+ start()+ rule.mainClock.advanceTimeBy(1_200)+ rule.runOnIdle { assertEquals(25f, votes.last()); playback.value = PlaybackState.BUFFERING }+ rule.mainClock.advanceTimeByFrame()+ rule.runOnIdle { assertEquals(25f, votes.last()); pip.value = true }+ rule.mainClock.advanceTimeByFrame()+ rule.runOnIdle { assertNull(votes.last()); pip.value = false; casting.value = true }+ rule.mainClock.advanceTimeByFrame()+ rule.runOnIdle { assertNull(votes.last()); casting.value = false }+ rule.mainClock.advanceTimeBy(1_200)+ rule.runOnIdle { assertEquals(25f, votes.last()); playback.value = PlaybackState.ERROR }+ rule.mainClock.advanceTimeByFrame()+ rule.runOnIdle { assertNull(votes.last()); playback.value = PlaybackState.READY }+ rule.mainClock.advanceTimeBy(1_200)+ rule.runOnIdle { assertEquals(25f, votes.last()); playback.value = PlaybackState.ENDED }+ rule.mainClock.advanceTimeByFrame()+ rule.runOnIdle { assertNull(votes.last()) }+ }++ @Test fun backgroundAndDisposalReleaseVote_andUnknownRateHasABoundedGracePeriod() {+ val owner = start()+ rule.mainClock.advanceTimeBy(1_200)+ rule.runOnIdle {+ assertEquals(25f, votes.last())+ owner.registry.currentState = Lifecycle.State.CREATED+ assertNull(votes.last()) // Does not require a Compose frame after ON_STOP.+ }+ rule.mainClock.advanceTimeByFrame()+ rule.runOnIdle { owner.registry.currentState = Lifecycle.State.RESUMED }+ rule.mainClock.advanceTimeBy(1_200)+ rule.runOnIdle { assertEquals(25f, votes.last()); rate.value = 0f }+ rule.mainClock.advanceTimeBy(3_000)+ rule.runOnIdle { assertEquals(25f, votes.last()); playback.value = PlaybackState.BUFFERING }+ rule.mainClock.advanceTimeBy(2_500)+ rule.runOnIdle { assertNull(votes.last()); rate.value = 29.97f }+ rule.mainClock.advanceTimeBy(1_200)+ rule.runOnIdle { assertEquals(29.97f, votes.last()); visible.value = false }+ rule.mainClock.advanceTimeByFrame()+ rule.runOnIdle { assertNull(votes.last()) }+ }+}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.ktindex 6dd295b2..ef972300 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@@ -67,6 +67,7 @@ class PlayerPreferencesCoordinator @Inject constructor(internal val playerVideoDecoderMode get() = preferencesRepository.playerVideoDecoderModeinternal val playerVodHttpProtocolMode get() = preferencesRepository.playerVodHttpProtocolModeinternal val playerWifiMaxVideoHeight get() = preferencesRepository.playerWifiMaxVideoHeight+ internal val playerRefreshRateMatchingEnabled get() = preferencesRepository.playerRefreshRateMatchingEnabledinternal val preventStandbyDuringPlayback get() = preferencesRepository.preventStandbyDuringPlaybackinternal val preferredAudioLanguage get() = preferencesRepository.preferredAudioLanguageinternal val pinnedSubtitleLanguages get() = preferencesRepository.pinnedSubtitleLanguagesdiff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerRefreshRateHost.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerRefreshRateHost.ktnew file mode 100644index 00000000..0cbfbd7b--- /dev/null+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerRefreshRateHost.kt@@ -0,0 +1,63 @@+package com.streamvault.feature.playback.player++import androidx.compose.runtime.Composable+import androidx.compose.runtime.DisposableEffect+import androidx.compose.runtime.LaunchedEffect+import androidx.compose.runtime.getValue+import androidx.compose.runtime.rememberUpdatedState+import androidx.lifecycle.Lifecycle+import androidx.lifecycle.LifecycleEventObserver+import androidx.lifecycle.compose.LocalLifecycleOwner+import androidx.lifecycle.compose.currentStateAsState+import com.streamvault.player.PlaybackState+import com.streamvault.player.PlayerEngine+import kotlinx.coroutines.delay++/** A single fullscreen vote; background, PiP, previews, and multiview cannot compete for HDMI. */+@Composable+internal fun PlayerRefreshRateHost(+ engine: PlayerEngine,+ enabled: Boolean,+ frameRate: Float,+ playbackSpeed: Float,+ playbackState: PlaybackState,+ pictureInPicture: Boolean,+ casting: Boolean+) {+ val lifecycle = LocalLifecycleOwner.current.lifecycle+ val lifecycleState by lifecycle.currentStateAsState()+ val currentEngine by rememberUpdatedState(engine)+ DisposableEffect(engine, lifecycle) {+ // Clear immediately at ON_STOP, including when Compose's frame clock is suspended.+ val observer = LifecycleEventObserver { _, event ->+ if (event == Lifecycle.Event.ON_STOP) currentEngine.setDisplayFrameRate(null)+ }+ lifecycle.addObserver(observer)+ onDispose {+ lifecycle.removeObserver(observer)+ engine.setDisplayFrameRate(null)+ }+ }+ val active = enabled && lifecycleState.isAtLeast(Lifecycle.State.STARTED) &&+ !pictureInPicture && !casting && playbackState != PlaybackState.ERROR && playbackState != PlaybackState.ENDED+ // User playback speed affects presentation cadence. Live latency correction is intentionally+ // absent: its small, temporary speed corrections must not trigger repeated HDMI mode switches.+ val presentationRate = frameRate * playbackSpeed+ val validPresentationRate = presentationRate.isFinite() && presentationRate in 5f..240f+ // Reapply a known rate after a stop/restart even when the next title has identical FPS.+ // Buffering transitions must not extend the grace period for an unknown cadence.+ LaunchedEffect(engine, active, presentationRate, if (validPresentationRate) playbackState else null) {+ if (!active) {+ engine.setDisplayFrameRate(null)+ } else if (validPresentationRate) {+ // Debounce rapid zapping and adaptive rendition changes before an HDMI resync.+ delay(1_000)+ engine.setDisplayFrameRate(presentationRate)+ } else {+ // Keep the previous mode during short channel transitions, but release it for radio,+ // stopped playback, or a source whose cadence cannot be established.+ delay(5_000)+ engine.setDisplayFrameRate(null)+ }+ }+}diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerScreen.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerScreen.ktindex 1e6550c5..c05060ac 100644--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerScreen.kt+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerScreen.kt@@ -271,6 +271,19 @@ fun PlayerScreen(}}+ val refreshRateMatchingEnabled by viewModel.refreshRateMatchingEnabled.collectAsStateWithLifecycle()+ val refreshRatePlaybackSpeed by playerEngine.playbackSpeed.collectAsStateWithLifecycle()+ val refreshRateCastState by viewModel.castConnectionState.collectAsStateWithLifecycle()+ PlayerRefreshRateHost(+ engine = playerEngine,+ enabled = refreshRateMatchingEnabled,+ frameRate = videoFormat.frameRate,+ playbackSpeed = refreshRatePlaybackSpeed,+ playbackState = playbackState,+ pictureInPicture = isInPictureInPictureMode,+ casting = refreshRateCastState == CastConnectionState.CONNECTED || refreshRateCastState == CastConnectionState.CONNECTING+ )+PlayerLifecycleHost(playbackPlatformHost = playbackPlatformHost,playbackState = playbackState,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.ktindex d6e57e11..048c2010 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@@ -1118,6 +1118,11 @@ class PlayerViewModel @Inject constructor(internal val subtitleBackgroundColor = playerPreferencesCoordinator.playerSubtitleBackgroundColor.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), 0x80000000.toInt())+ val refreshRateMatchingEnabled: StateFlow<Boolean> by lazy(LazyThreadSafetyMode.NONE) {+ playerPreferencesCoordinator.playerRefreshRateMatchingEnabled+ .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), false)+ }+val preventStandbyDuringPlayback: StateFlow<Boolean> by lazy(LazyThreadSafetyMode.NONE) {playerPreferencesCoordinator.preventStandbyDuringPlayback.stateIn(viewModelScope, kotlinx.coroutines.flow.SharingStarted.WhileSubscribed(5000), true)diff --git a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupFormPrimitives.kt b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupFormPrimitives.ktindex dc9b9159..14ec6d1d 100644--- a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupFormPrimitives.kt+++ b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupFormPrimitives.kt@@ -1,6 +1,7 @@package com.streamvault.feature.provider.setupimport androidx.compose.runtime.Composable+import androidx.compose.ui.res.stringResourceimport androidx.compose.ui.text.AnnotatedStringimport androidx.compose.ui.text.input.OffsetMappingimport androidx.compose.ui.text.input.TransformedText@@ -8,15 +9,33 @@ import androidx.compose.ui.text.input.VisualTransformationimport androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Textimport com.streamvault.core.ui.design.browse.ErrorColor+import com.streamvault.domain.model.StalkerTransportChallenge+import com.streamvault.domain.model.StalkerTransportChallengeReason+import com.streamvault.feature.provider.R@Composable-internal fun FormErrors(validationError: String?, error: String?) {+internal fun FormErrors(+ validationError: String?,+ error: String?,+ transportChallenge: StalkerTransportChallenge? = null+) {validationError?.let {Text(text = it, style = MaterialTheme.typography.bodyMedium, color = ErrorColor)}error?.let {Text(text = it, style = MaterialTheme.typography.bodyMedium, color = ErrorColor)}+ transportChallenge?.let { challenge ->+ val body = when (challenge.reason) {+ StalkerTransportChallengeReason.INVALID_TLS ->+ stringResource(R.string.stalker_transport_invalid_tls_body, challenge.displayHost)+ StalkerTransportChallengeReason.CLEARTEXT_HTTP ->+ stringResource(R.string.stalker_transport_http_body, challenge.displayHost)+ StalkerTransportChallengeReason.ORIGIN_CHANGED ->+ stringResource(R.string.stalker_transport_origin_changed_body, challenge.displayHost)+ }+ Text(text = body, style = MaterialTheme.typography.bodyMedium, color = ErrorColor)+ }}internal class RevealingPasswordVisualTransformation(diff --git a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupScreen.kt b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupScreen.ktindex 913b20ce..7447ddf4 100644--- a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupScreen.kt+++ b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupScreen.kt@@ -88,7 +88,6 @@ import com.streamvault.domain.model.StalkerCatalogModeimport com.streamvault.domain.model.StalkerCompatibilityProfileIdsimport com.streamvault.domain.model.StalkerProfileVerificationimport com.streamvault.domain.model.StalkerProtocolPreference-import com.streamvault.domain.model.StalkerTransportChallengeReasonimport com.streamvault.domain.manager.DriveBackupSnapshotimport com.google.zxing.qrcode.QRCodeWriterimport com.google.zxing.BarcodeFormat@@ -628,48 +627,6 @@ fun ProviderSetupScreen()}-uiState.stalkerTransportChallenge?.let { challenge ->- val (title, body) = when (challenge.reason) {- StalkerTransportChallengeReason.INVALID_TLS ->- stringResource(R.string.stalker_transport_invalid_tls_title) to- stringResource(- R.string.stalker_transport_invalid_tls_body,- challenge.displayHost- )- StalkerTransportChallengeReason.CLEARTEXT_HTTP ->- stringResource(R.string.stalker_transport_http_title) to- stringResource(- R.string.stalker_transport_http_body,- challenge.displayHost- )- StalkerTransportChallengeReason.ORIGIN_CHANGED ->- stringResource(R.string.stalker_transport_origin_changed_title) to- stringResource(- R.string.stalker_transport_origin_changed_body,- challenge.displayHost- )- }- PremiumDialog(- title = title,- subtitle = body,- onDismissRequest = viewModel::dismissStalkerTransportChallenge,- smallScreenWidthFraction = 0.84f,- heightFraction = null,- content = {},- footer = {- PremiumDialogFooterButton(- label = stringResource(R.string.stalker_transport_go_back),- onClick = viewModel::dismissStalkerTransportChallenge- )- PremiumDialogFooterButton(- label = stringResource(R.string.stalker_transport_connect_anyway),- onClick = viewModel::acceptStalkerTransportChallenge,- emphasized = true- )- }- )- }-uiState.stalkerVerificationInconclusive?.let {PremiumDialog(title = stringResource(R.string.stalker_verification_inconclusive_title),diff --git a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSourceForms.kt b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSourceForms.ktindex b76e64e0..ea5f2182 100644--- a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSourceForms.kt+++ b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSourceForms.kt@@ -121,7 +121,11 @@ internal fun StalkerProviderForm(onProfileSelected = onSelectProfile)AdvancedProviderOptionsSection(options)- FormErrors(uiState.validationError, uiState.error)+ FormErrors(+ validationError = uiState.validationError,+ error = uiState.error,+ transportChallenge = uiState.stalkerTransportChallenge+ )ActionButton(text = when {uiState.isLoading -> stringResource(R.string.setup_connecting)diff --git a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSourcePanel.kt b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSourcePanel.ktindex 2f5905fc..d11289da 100644--- a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSourcePanel.kt+++ b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSourcePanel.kt@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.*import androidx.compose.runtime.Composableimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier-import androidx.compose.ui.graphics.Colorimport androidx.compose.ui.res.stringResourceimport androidx.compose.ui.unit.dpimport androidx.tv.material3.Border@@ -16,7 +15,6 @@ import androidx.tv.material3.Surface as TvSurfaceimport androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Textimport com.streamvault.feature.provider.R-import com.streamvault.core.ui.components.shell.StatusPillimport com.streamvault.core.ui.interaction.mouseClickableimport com.streamvault.core.ui.design.browse.*@@ -65,7 +63,6 @@ internal fun SourceTypeSelectorPanel(if (!isEditing || sourceType == SourceType.STALKER) {SourceTypeCard(title = androidx.compose.ui.res.stringResource(R.string.setup_stalker),- badge = androidx.compose.ui.res.stringResource(R.string.badge_beta),subtitle = androidx.compose.ui.res.stringResource(R.string.setup_info_stalker_body),selected = sourceType == SourceType.STALKER,enabled = !isEditing,@@ -125,7 +122,6 @@ internal fun SourceTypeSelectorPanel(@Composableinternal fun SourceTypeCard(title: String,- badge: String? = null,subtitle: String,selected: Boolean,enabled: Boolean,@@ -157,16 +153,6 @@ internal fun SourceTypeCard(style = MaterialTheme.typography.bodyMedium,color = if (selected) Primary else TextPrimary)- badge?.let {- StatusPill(- label = it,- containerColor = AccentAmber,- contentColor = Color.Black,- horizontalPadding = 6.dp,- verticalPadding = 2.dp,- cornerRadius = 6.dp- )- }}Text(text = subtitle, style = MaterialTheme.typography.bodySmall, color = OnSurfaceDim, maxLines = 2)}diff --git a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSourceSelector.kt b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSourceSelector.ktindex 65046185..ce718f69 100644--- a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSourceSelector.kt+++ b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSourceSelector.kt@@ -12,7 +12,6 @@ import androidx.compose.runtime.setValueimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.focus.onFocusEvent-import androidx.compose.ui.graphics.Colorimport androidx.compose.ui.unit.dpimport androidx.tv.material3.Borderimport androidx.tv.material3.ClickableSurfaceDefaults@@ -20,9 +19,7 @@ import androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Surfaceimport androidx.tv.material3.Textimport com.streamvault.feature.provider.R-import com.streamvault.core.ui.components.shell.StatusPillimport com.streamvault.core.ui.interaction.mouseClickable-import com.streamvault.core.ui.design.browse.AccentAmberimport com.streamvault.core.ui.design.browse.FocusBorderimport com.streamvault.core.ui.design.browse.OnSurfaceimport com.streamvault.core.ui.design.browse.Primary@@ -50,7 +47,6 @@ internal fun SourceTypeTabRow(if (!isEditing || sourceType == SourceType.STALKER) {TabButton(text = androidx.compose.ui.res.stringResource(R.string.setup_stalker),- badge = androidx.compose.ui.res.stringResource(R.string.badge_beta),isSelected = sourceType == SourceType.STALKER,onClick = { if (!isEditing) onSelect(SourceType.STALKER) })@@ -80,7 +76,7 @@ internal fun SourceTypeTabRow(}@Composable-private fun TabButton(text: String, isSelected: Boolean, onClick: () -> Unit, badge: String? = null) {+private fun TabButton(text: String, isSelected: Boolean, onClick: () -> Unit) {var isFocused by remember { mutableStateOf(false) }Surface(onClick = onClick,@@ -105,16 +101,6 @@ private fun TabButton(text: String, isSelected: Boolean, onClick: () -> Unit, bastyle = MaterialTheme.typography.bodySmall,color = if (isSelected) Primary else if (isFocused) TextPrimary else OnSurface)- badge?.let {- StatusPill(- label = it,- containerColor = AccentAmber,- contentColor = Color.Black,- horizontalPadding = 6.dp,- verticalPadding = 2.dp,- cornerRadius = 6.dp- )- }}}}diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPlaybackSection.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPlaybackSection.ktindex f3fc2980..810f5d85 100644--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPlaybackSection.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPlaybackSection.kt@@ -444,6 +444,13 @@ public fun LazyListScope.settingsPlaybackSection(modifier = if (targetItemId == "vod.http_protocol") targetFocusModifier else Modifier,)}if (page == null || page == SettingsPage.GENERAL) {+ SwitchSettingsRow(+ label = stringResource(R.string.settings_refresh_rate_matching),+ value = stringResource(R.string.settings_refresh_rate_matching_description),+ checked = uiState.playerRefreshRateMatchingEnabled,+ onCheckedChange = viewModel::setPlayerRefreshRateMatchingEnabled,+ modifier = if (targetItemId == "playback.refresh_rate_matching") targetFocusModifier else Modifier,+ )SwitchSettingsRow(label = stringResource(R.string.settings_media_session),value = stringResource(R.string.settings_media_session_subtitle),diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPreferenceModels.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPreferenceModels.ktindex d32bb3df..0fb6d60a 100644--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPreferenceModels.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPreferenceModels.kt@@ -135,6 +135,7 @@ data class SettingsPreferenceSnapshot(val vodVariantPreferenceMode: VodVariantPreferenceMode,val guideDefaultCategoryId: Long,val guideDefaultCategoryOptions: List<Category>,+ val playerRefreshRateMatchingEnabled: Boolean = true,val preventStandbyDuringPlayback: Boolean,val zapAutoRevert: Boolean,val autoPlayNextEpisode: Boolean,diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPreferenceSnapshotMapper.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPreferenceSnapshotMapper.ktindex 93475729..55988bad 100644--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPreferenceSnapshotMapper.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPreferenceSnapshotMapper.kt@@ -96,6 +96,7 @@ fun SettingsUiState.applyPreferenceSnapshot(vodVariantPreferenceMode = snapshot.vodVariantPreferenceMode,guideDefaultCategoryId = snapshot.guideDefaultCategoryId,guideDefaultCategoryOptions = guideDefaultCategoryOptions,+ playerRefreshRateMatchingEnabled = snapshot.playerRefreshRateMatchingEnabled,preventStandbyDuringPlayback = snapshot.preventStandbyDuringPlayback,zapAutoRevert = snapshot.zapAutoRevert,autoPlayNextEpisode = snapshot.autoPlayNextEpisode,diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsScreenDialogs.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsScreenDialogs.ktindex aa727bba..f1578ebb 100644--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsScreenDialogs.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsScreenDialogs.kt@@ -16,6 +16,7 @@ import androidx.compose.foundation.verticalScrollimport androidx.compose.material3.AlertDialogimport androidx.compose.material3.TextButtonimport androidx.compose.material3.Checkbox+import androidx.compose.material3.CheckboxDefaultsimport androidx.compose.runtime.Composableimport androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.derivedStateOf@@ -36,6 +37,7 @@ import com.streamvault.core.ui.components.dialogs.PremiumDialogimport com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButtonimport com.streamvault.core.ui.interaction.TvClickableSurfaceimport com.streamvault.core.ui.theme.OnBackground+import com.streamvault.core.ui.theme.OnPrimaryimport com.streamvault.core.ui.theme.OnSurfaceimport com.streamvault.core.ui.theme.OnSurfaceDimimport com.streamvault.core.ui.theme.Primary@@ -298,37 +300,68 @@ public fun SettingsScreenDialogs(}if (uiState.pendingRestoreProviders.isNotEmpty()) {+ val hasSelectedRestoreProvider = uiState.selectedRestoreProviderIndices.isNotEmpty()AlertDialog(onDismissRequest = viewModel::restoreSyncLater,- title = { Text(stringResource(R.string.settings_restore_sync_title)) },+ title = {+ Text(+ text = stringResource(R.string.settings_restore_sync_title),+ color = OnSurface+ )+ },text = {Column {- Text(stringResource(R.string.settings_restore_sync_description))+ Text(+ text = stringResource(R.string.settings_restore_sync_description),+ color = TextSecondary+ )uiState.pendingRestoreProviders.forEachIndexed { index, provider ->Row {Checkbox(checked = index in uiState.selectedRestoreProviderIndices,- onCheckedChange = { viewModel.toggleRestoreSyncProvider(index) }+ onCheckedChange = { viewModel.toggleRestoreSyncProvider(index) },+ colors = CheckboxDefaults.colors(+ checkedColor = Primary,+ uncheckedColor = OnSurfaceDim,+ checkmarkColor = OnPrimary+ )+ )+ Text(+ text = provider.serverUrl + provider.username.takeIf { it.isNotBlank() }?.let { " ($it)" }.orEmpty(),+ color = OnSurface)- Text(provider.serverUrl + provider.username.takeIf { it.isNotBlank() }?.let { " ($it)" }.orEmpty())}}TextButton(onClick = viewModel::selectAllRestoreSyncProviders) {- Text(stringResource(R.string.settings_select_all))+ Text(+ text = stringResource(R.string.settings_select_all),+ color = Primary+ )}}},confirmButton = {TextButton(- enabled = uiState.selectedRestoreProviderIndices.isNotEmpty(),+ enabled = hasSelectedRestoreProvider,onClick = viewModel::syncSelectedRestoreProviders- ) { Text(stringResource(R.string.settings_restore_sync_selected)) }+ ) {+ Text(+ text = stringResource(R.string.settings_restore_sync_selected),+ color = if (hasSelectedRestoreProvider) Primary else OnSurfaceDim+ )+ }},dismissButton = {TextButton(onClick = viewModel::restoreSyncLater) {- Text(stringResource(R.string.settings_restore_later))+ Text(+ text = stringResource(R.string.settings_restore_later),+ color = Primary+ )}- }+ },+ containerColor = SurfaceElevated,+ titleContentColor = OnSurface,+ textContentColor = TextSecondary)}diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsSearchSurface.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsSearchSurface.ktindex ac9c150f..56158ea0 100644--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsSearchSurface.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsSearchSurface.kt@@ -215,6 +215,7 @@ private fun resolvedSettingsCatalog(setting("guide.logo_policy", SettingsCategory.GUIDE, null, R.string.settings_epg_logo_supplier_preferred, "channel logo source"),setting("guide.time_shift", SettingsCategory.GUIDE, null, R.string.settings_epg_time_shift_title, "timezone", "early", "late"),setting("guide.default_category", SettingsCategory.LIVE_TV, SettingsPage.LIVE_LAYOUT, R.string.settings_guide_default_category, "guide opening category"),+ setting("playback.refresh_rate_matching", SettingsCategory.PLAYBACK, SettingsPage.GENERAL, R.string.settings_refresh_rate_matching, "AFR", "fps", "Hz", "display refresh rate", "frame rate matching"),setting("playback.media_session", SettingsCategory.PLAYBACK, SettingsPage.GENERAL, R.string.settings_media_session, "system controls", "notification"),setting("playback.external", SettingsCategory.PLAYBACK, SettingsPage.GENERAL, R.string.settings_external_playback, "external player"),setting("playback.speed", SettingsCategory.PLAYBACK, SettingsPage.GENERAL, R.string.settings_default_playback_speed, "speed"),diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsStateBindings.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsStateBindings.ktindex c0aff903..75094f96 100644--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsStateBindings.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsStateBindings.kt@@ -304,6 +304,8 @@ fun observeSettingsPreferenceSnapshot(snapshot.copy(vodVariantPreferenceMode = vodVariantPreferenceMode)}.combine(preferencesRepository.guideDefaultCategoryId) { snapshot, guideDefaultCategoryId ->snapshot.copy(guideDefaultCategoryId = guideDefaultCategoryId ?: VirtualCategoryIds.FAVORITES)+ }.combine(preferencesRepository.playerRefreshRateMatchingEnabled) { snapshot, enabled ->+ snapshot.copy(playerRefreshRateMatchingEnabled = enabled)}.combine(preferencesRepository.preventStandbyDuringPlayback) { snapshot, preventStandby ->snapshot.copy(preventStandbyDuringPlayback = preventStandby)}.combine(preferencesRepository.zapAutoRevert) { snapshot, zapAutoRevert ->diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsUiStateModel.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsUiStateModel.ktindex 7c7b79af..d6ceb424 100644--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsUiStateModel.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsUiStateModel.kt@@ -199,6 +199,7 @@ data class SettingsUiState(val vodVariantPreferenceMode: VodVariantPreferenceMode = VodVariantPreferenceMode.BALANCED,val guideDefaultCategoryId: Long = com.streamvault.domain.model.VirtualCategoryIds.FAVORITES,val guideDefaultCategoryOptions: List<Category> = emptyList(),+ val playerRefreshRateMatchingEnabled: Boolean = true,val preventStandbyDuringPlayback: Boolean = true,val zapAutoRevert: Boolean = true,val autoPlayNextEpisode: Boolean = true,diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsViewModel.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsViewModel.ktindex 4dc6aca5..dd2d0b47 100644--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsViewModel.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsViewModel.kt@@ -824,6 +824,12 @@ class SettingsViewModel @Inject constructor(}}+ fun setPlayerRefreshRateMatchingEnabled(enabled: Boolean) {+ viewModelScope.launch {+ preferencesRepository.setPlayerRefreshRateMatchingEnabled(enabled)+ }+ }+fun setPreventStandbyDuringPlayback(prevent: Boolean) {viewModelScope.launch {preferencesRepository.setPreventStandbyDuringPlayback(prevent)diff --git a/feature/settings/src/main/res/values-ar/strings.xml b/feature/settings/src/main/res/values-ar/strings.xmlindex 7fbd4391..fd75fab3 100644--- a/feature/settings/src/main/res/values-ar/strings.xml+++ b/feature/settings/src/main/res/values-ar/strings.xml@@ -960,4 +960,6 @@<string name="settings_sports_custom_definition_file_error">تعذّر تحميل ملف JSON هذا</string><string name="settings_experimental_badge">تجريبي</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">مطابقة معدل إطارات المحتوى</string>+ <string name="settings_refresh_rate_matching_description">مطابقة معدل تحديث الشاشة مع الفيديو لحركة أكثر سلاسة. يتطلب دعم الشاشة؛ قد تصبح الشاشة سوداء للحظات عند التبديل.</string></resources>diff --git a/feature/settings/src/main/res/values-bg/strings.xml b/feature/settings/src/main/res/values-bg/strings.xmlindex 07eb8705..77036445 100644--- a/feature/settings/src/main/res/values-bg/strings.xml+++ b/feature/settings/src/main/res/values-bg/strings.xml@@ -946,4 +946,6 @@<string name="settings_sports_custom_definition_file_error">Този JSON файл не може да бъде зареден</string><string name="settings_experimental_badge">Експериментално</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Съгласуване с кадровата честота</string>+ <string name="settings_refresh_rate_matching_description">Съгласува честотата на опресняване на дисплея с видеото за по-плавно движение. Изисква поддръжка от дисплея; при превключване екранът може за кратко да изгасне.</string></resources>diff --git a/feature/settings/src/main/res/values-cs/strings.xml b/feature/settings/src/main/res/values-cs/strings.xmlindex 8223675e..00175461 100644--- a/feature/settings/src/main/res/values-cs/strings.xml+++ b/feature/settings/src/main/res/values-cs/strings.xml@@ -954,4 +954,6 @@<string name="settings_sports_custom_definition_file_error">Tento soubor JSON nelze načíst</string><string name="settings_experimental_badge">Experimentální</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Přizpůsobit snímkové frekvenci obsahu</string>+ <string name="settings_refresh_rate_matching_description">Přizpůsobí obnovovací frekvenci displeje videu pro plynulejší pohyb. Vyžaduje podporu displeje; při přepnutí může obrazovka krátce zčernat.</string></resources>diff --git a/feature/settings/src/main/res/values-da/strings.xml b/feature/settings/src/main/res/values-da/strings.xmlindex ee504f5a..62b3c648 100644--- a/feature/settings/src/main/res/values-da/strings.xml+++ b/feature/settings/src/main/res/values-da/strings.xml@@ -948,4 +948,6 @@<string name="settings_sports_custom_definition_file_error">Denne JSON-fil kunne ikke indlæses</string><string name="settings_experimental_badge">Eksperimentel</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Tilpas til indholdets billedfrekvens</string>+ <string name="settings_refresh_rate_matching_description">Tilpasser skærmens opdateringshastighed til videoen for mere flydende bevægelser. Kræver understøttelse fra skærmen; skærmen kan kortvarigt blive sort ved skift.</string></resources>diff --git a/feature/settings/src/main/res/values-de/strings.xml b/feature/settings/src/main/res/values-de/strings.xmlindex 79629ff9..3b455524 100644--- a/feature/settings/src/main/res/values-de/strings.xml+++ b/feature/settings/src/main/res/values-de/strings.xml@@ -944,4 +944,6 @@<string name="settings_sports_custom_definition_file_error">Diese JSON-Datei konnte nicht geladen werden</string><string name="settings_experimental_badge">Experimentell</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Bildrate des Inhalts anpassen</string>+ <string name="settings_refresh_rate_matching_description">Passt die Bildwiederholrate des Displays für flüssigere Bewegungen an das Video an. Erfordert ein unterstütztes Display; beim Wechsel kann der Bildschirm kurz schwarz werden.</string></resources>diff --git a/feature/settings/src/main/res/values-el/strings.xml b/feature/settings/src/main/res/values-el/strings.xmlindex 6b7d2111..75d1a2b4 100644--- a/feature/settings/src/main/res/values-el/strings.xml+++ b/feature/settings/src/main/res/values-el/strings.xml@@ -948,4 +948,6 @@<string name="settings_sports_custom_definition_file_error">Δεν ήταν δυνατή η φόρτωση αυτού του αρχείου JSON</string><string name="settings_experimental_badge">Πειραματικό</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Αντιστοίχιση ρυθμού καρέ περιεχομένου</string>+ <string name="settings_refresh_rate_matching_description">Προσαρμόζει τον ρυθμό ανανέωσης της οθόνης στο βίντεο για πιο ομαλή κίνηση. Απαιτεί υποστήριξη από την οθόνη· κατά την αλλαγή η οθόνη μπορεί να μαυρίσει στιγμιαία.</string></resources>diff --git a/feature/settings/src/main/res/values-es/strings.xml b/feature/settings/src/main/res/values-es/strings.xmlindex 41ea04eb..771ae4ab 100644--- a/feature/settings/src/main/res/values-es/strings.xml+++ b/feature/settings/src/main/res/values-es/strings.xml@@ -944,4 +944,6 @@<string name="settings_sports_custom_definition_file_error">No se pudo cargar este archivo JSON</string><string name="settings_experimental_badge">Experimental</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Ajustar a la frecuencia del contenido</string>+ <string name="settings_refresh_rate_matching_description">Adapta la frecuencia de actualización de la pantalla al vídeo para un movimiento más fluido. Requiere una pantalla compatible; al cambiar, la pantalla puede quedar negra brevemente.</string></resources>diff --git a/feature/settings/src/main/res/values-fa/strings.xml b/feature/settings/src/main/res/values-fa/strings.xmlindex 76f9d732..6aecf8b1 100644--- a/feature/settings/src/main/res/values-fa/strings.xml+++ b/feature/settings/src/main/res/values-fa/strings.xml@@ -946,4 +946,6 @@<string name="settings_sports_custom_definition_file_error">بارگذاری این فایل JSON ممکن نبود</string><string name="settings_experimental_badge">آزمایشی</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">تطبیق با نرخ فریم محتوا</string>+ <string name="settings_refresh_rate_matching_description">نرخ نوسازی نمایشگر را برای حرکت روانتر با ویدیو هماهنگ میکند. به پشتیبانی نمایشگر نیاز دارد؛ هنگام تغییر ممکن است صفحه برای لحظهای سیاه شود.</string></resources>diff --git a/feature/settings/src/main/res/values-fi/strings.xml b/feature/settings/src/main/res/values-fi/strings.xmlindex e080858c..1831bbfa 100644--- a/feature/settings/src/main/res/values-fi/strings.xml+++ b/feature/settings/src/main/res/values-fi/strings.xml@@ -948,4 +948,6 @@<string name="settings_sports_custom_definition_file_error">Tätä JSON-tiedostoa ei voitu ladata</string><string name="settings_experimental_badge">Kokeellinen</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Mukauta sisällön kuvataajuuteen</string>+ <string name="settings_refresh_rate_matching_description">Mukauttaa näytön virkistystaajuuden videoon liikkeen sulavoittamiseksi. Edellyttää näytön tukea; näyttö voi pimentyä hetkeksi vaihdon aikana.</string></resources>diff --git a/feature/settings/src/main/res/values-fil/strings.xml b/feature/settings/src/main/res/values-fil/strings.xmlindex 82e53188..0c60054e 100644--- a/feature/settings/src/main/res/values-fil/strings.xml+++ b/feature/settings/src/main/res/values-fil/strings.xml@@ -946,4 +946,6 @@<string name="settings_sports_custom_definition_file_error">Hindi ma-load ang JSON file na ito</string><string name="settings_experimental_badge">Eksperimental</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Itugma sa frame rate ng nilalaman</string>+ <string name="settings_refresh_rate_matching_description">Itinutugma ang refresh rate ng display sa video para sa mas maayos na galaw. Kailangan ng suporta ng display; maaaring umitim sandali ang screen kapag nagpapalit.</string></resources>diff --git a/feature/settings/src/main/res/values-fr/strings.xml b/feature/settings/src/main/res/values-fr/strings.xmlindex c2c64997..a41f84e9 100644--- a/feature/settings/src/main/res/values-fr/strings.xml+++ b/feature/settings/src/main/res/values-fr/strings.xml@@ -948,4 +948,6 @@<string name="settings_sports_custom_definition_file_error">Impossible de charger ce fichier JSON</string><string name="settings_experimental_badge">Expérimental</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Adapter à la fréquence du contenu</string>+ <string name="settings_refresh_rate_matching_description">Adapte la fréquence de rafraîchissement de l’écran à la vidéo pour des mouvements plus fluides. Nécessite un écran compatible ; le changement peut brièvement noircir l’écran.</string></resources>diff --git a/feature/settings/src/main/res/values-hi/strings.xml b/feature/settings/src/main/res/values-hi/strings.xmlindex b4caeee0..abbc265c 100644--- a/feature/settings/src/main/res/values-hi/strings.xml+++ b/feature/settings/src/main/res/values-hi/strings.xml@@ -946,4 +946,6 @@<string name="settings_sports_custom_definition_file_error">यह JSON फ़ाइल लोड नहीं की जा सकी</string><string name="settings_experimental_badge">प्रायोगिक</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">सामग्री की फ़्रेम दर से मिलाएँ</string>+ <string name="settings_refresh_rate_matching_description">ज़्यादा सहज गति के लिए डिस्प्ले की रीफ़्रेश दर को वीडियो से मिलाएँ। डिस्प्ले का समर्थन ज़रूरी है; बदलते समय स्क्रीन कुछ पल के लिए काली हो सकती है।</string></resources>diff --git a/feature/settings/src/main/res/values-hr/strings.xml b/feature/settings/src/main/res/values-hr/strings.xmlindex 275d704b..9d5b44e5 100644--- a/feature/settings/src/main/res/values-hr/strings.xml+++ b/feature/settings/src/main/res/values-hr/strings.xml@@ -949,4 +949,6 @@<string name="settings_sports_custom_definition_file_error">Nije moguće učitati ovu JSON datoteku</string><string name="settings_experimental_badge">Eksperimentalno</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Uskladi s brzinom kadrova sadržaja</string>+ <string name="settings_refresh_rate_matching_description">Usklađuje frekvenciju osvježavanja zaslona s videozapisom za glađe pokrete. Zahtijeva podršku zaslona; zaslon se pri promjeni može nakratko zacrniti.</string></resources>diff --git a/feature/settings/src/main/res/values-hu/strings.xml b/feature/settings/src/main/res/values-hu/strings.xmlindex 4f2ccef0..3ef14609 100644--- a/feature/settings/src/main/res/values-hu/strings.xml+++ b/feature/settings/src/main/res/values-hu/strings.xml@@ -948,4 +948,6 @@<string name="settings_sports_custom_definition_file_error">Ez a JSON-fájl nem tölthető be</string><string name="settings_experimental_badge">Kísérleti</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Igazítás a tartalom képkockasebességéhez</string>+ <string name="settings_refresh_rate_matching_description">A kijelző frissítési gyakoriságát a videóhoz igazítja az egyenletesebb mozgásért. Kijelzőtámogatást igényel; váltáskor a képernyő rövid időre elsötétülhet.</string></resources>diff --git a/feature/settings/src/main/res/values-in/strings.xml b/feature/settings/src/main/res/values-in/strings.xmlindex fc8c0f94..8204796b 100644--- a/feature/settings/src/main/res/values-in/strings.xml+++ b/feature/settings/src/main/res/values-in/strings.xml@@ -948,4 +948,6 @@<string name="settings_sports_custom_definition_file_error">File JSON ini tidak dapat dimuat</string><string name="settings_experimental_badge">Eksperimental</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Sesuaikan dengan laju bingkai konten</string>+ <string name="settings_refresh_rate_matching_description">Menyesuaikan laju penyegaran layar dengan video agar gerakan lebih mulus. Memerlukan dukungan layar; layar mungkin menjadi hitam sesaat saat berganti.</string></resources>diff --git a/feature/settings/src/main/res/values-it/strings.xml b/feature/settings/src/main/res/values-it/strings.xmlindex 7ef4e0ab..0ab53868 100644--- a/feature/settings/src/main/res/values-it/strings.xml+++ b/feature/settings/src/main/res/values-it/strings.xml@@ -944,4 +944,6 @@<string name="settings_sports_custom_definition_file_error">Impossibile caricare questo file JSON</string><string name="settings_experimental_badge">Sperimentale</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Adatta alla frequenza dei fotogrammi</string>+ <string name="settings_refresh_rate_matching_description">Adatta la frequenza di aggiornamento dello schermo al video per movimenti più fluidi. Richiede uno schermo compatibile; durante il cambio lo schermo può diventare nero per un istante.</string></resources>diff --git a/feature/settings/src/main/res/values-iw/strings.xml b/feature/settings/src/main/res/values-iw/strings.xmlindex a78181ff..e59786f7 100644--- a/feature/settings/src/main/res/values-iw/strings.xml+++ b/feature/settings/src/main/res/values-iw/strings.xml@@ -951,4 +951,6 @@<string name="settings_sports_custom_definition_file_error">לא ניתן לטעון את קובץ ה-JSON הזה</string><string name="settings_experimental_badge">ניסיוני</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">התאמת קצב הרענון לתוכן</string>+ <string name="settings_refresh_rate_matching_description">התאמת קצב הרענון של המסך לסרטון לתנועה חלקה יותר. נדרשת תמיכה במסך; בעת המעבר המסך עשוי להחשיך לזמן קצר.</string></resources>diff --git a/feature/settings/src/main/res/values-ja/strings.xml b/feature/settings/src/main/res/values-ja/strings.xmlindex fe61492b..8043169e 100644--- a/feature/settings/src/main/res/values-ja/strings.xml+++ b/feature/settings/src/main/res/values-ja/strings.xml@@ -946,4 +946,6 @@<string name="settings_sports_custom_definition_file_error">この JSON ファイルを読み込めませんでした</string><string name="settings_experimental_badge">試験運用</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">コンテンツのフレームレートに合わせる</string>+ <string name="settings_refresh_rate_matching_description">映像の動きを滑らかにするため、画面のリフレッシュレートを動画に合わせます。対応するディスプレイが必要です。切り替え時に画面が一瞬暗くなることがあります。</string></resources>diff --git a/feature/settings/src/main/res/values-ko/strings.xml b/feature/settings/src/main/res/values-ko/strings.xmlindex ee51bf0f..ac73d4e4 100644--- a/feature/settings/src/main/res/values-ko/strings.xml+++ b/feature/settings/src/main/res/values-ko/strings.xml@@ -944,4 +944,6 @@<string name="settings_sports_custom_definition_file_error">이 JSON 파일을 불러오지 못했습니다</string><string name="settings_experimental_badge">실험적 기능</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">콘텐츠 프레임 속도에 맞추기</string>+ <string name="settings_refresh_rate_matching_description">더 부드러운 움직임을 위해 디스플레이 주사율을 동영상에 맞춥니다. 디스플레이의 지원이 필요하며 전환 시 화면이 잠시 검게 변할 수 있습니다.</string></resources>diff --git a/feature/settings/src/main/res/values-mk/strings.xml b/feature/settings/src/main/res/values-mk/strings.xmlindex f61255b5..6b46ebf1 100644--- a/feature/settings/src/main/res/values-mk/strings.xml+++ b/feature/settings/src/main/res/values-mk/strings.xml@@ -946,4 +946,6 @@<string name="settings_sports_custom_definition_file_error">Оваа JSON-датотека не може да се вчита</string><string name="settings_experimental_badge">Експериментално</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Усогласи со брзината на кадрите</string>+ <string name="settings_refresh_rate_matching_description">Ја усогласува стапката на освежување на екранот со видеото за помазни движења. Потребна е поддршка од екранот; при префрлање екранот може накратко да се затемни.</string></resources>diff --git a/feature/settings/src/main/res/values-ms/strings.xml b/feature/settings/src/main/res/values-ms/strings.xmlindex 8c348d8b..b73cc6f6 100644--- a/feature/settings/src/main/res/values-ms/strings.xml+++ b/feature/settings/src/main/res/values-ms/strings.xml@@ -943,4 +943,6 @@<string name="settings_sports_custom_definition_file_error">Fail JSON ini tidak dapat dimuatkan</string><string name="settings_experimental_badge">Eksperimen</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Padankan kadar bingkai kandungan</string>+ <string name="settings_refresh_rate_matching_description">Memadankan kadar segar semula paparan dengan video untuk gerakan lebih lancar. Memerlukan sokongan paparan; skrin mungkin menjadi gelap seketika semasa pertukaran.</string></resources>diff --git a/feature/settings/src/main/res/values-nb/strings.xml b/feature/settings/src/main/res/values-nb/strings.xmlindex e5265de9..b3e4871b 100644--- a/feature/settings/src/main/res/values-nb/strings.xml+++ b/feature/settings/src/main/res/values-nb/strings.xml@@ -948,4 +948,6 @@<string name="settings_sports_custom_definition_file_error">Denne JSON-filen kunne ikke lastes inn</string><string name="settings_experimental_badge">Eksperimentell</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Tilpass til innholdets bildefrekvens</string>+ <string name="settings_refresh_rate_matching_description">Tilpasser skjermens oppdateringsfrekvens til videoen for jevnere bevegelser. Krever støtte fra skjermen; skjermen kan bli svart et øyeblikk ved bytte.</string></resources>diff --git a/feature/settings/src/main/res/values-nl/strings.xml b/feature/settings/src/main/res/values-nl/strings.xmlindex 1f956b13..98ba545a 100644--- a/feature/settings/src/main/res/values-nl/strings.xml+++ b/feature/settings/src/main/res/values-nl/strings.xml@@ -948,4 +948,6 @@<string name="settings_sports_custom_definition_file_error">Dit JSON-bestand kon niet worden geladen</string><string name="settings_experimental_badge">Experimenteel</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Afstemmen op de beeldsnelheid van inhoud</string>+ <string name="settings_refresh_rate_matching_description">Stemt de vernieuwingsfrequentie van het scherm af op de video voor vloeiendere bewegingen. Vereist schermondersteuning; bij het omschakelen kan het scherm kort zwart worden.</string></resources>diff --git a/feature/settings/src/main/res/values-pl/strings.xml b/feature/settings/src/main/res/values-pl/strings.xmlindex d0036ea5..a9713383 100644--- a/feature/settings/src/main/res/values-pl/strings.xml+++ b/feature/settings/src/main/res/values-pl/strings.xml@@ -954,4 +954,6 @@<string name="settings_sports_custom_definition_file_error">Nie można wczytać tego pliku JSON</string><string name="settings_experimental_badge">Eksperymentalne</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Dopasuj do liczby klatek treści</string>+ <string name="settings_refresh_rate_matching_description">Dopasowuje częstotliwość odświeżania ekranu do filmu, aby ruch był płynniejszy. Wymaga obsługi przez ekran; podczas zmiany ekran może na chwilę zgasnąć.</string></resources>diff --git a/feature/settings/src/main/res/values-pt/strings.xml b/feature/settings/src/main/res/values-pt/strings.xmlindex 308f730a..d354c4c5 100644--- a/feature/settings/src/main/res/values-pt/strings.xml+++ b/feature/settings/src/main/res/values-pt/strings.xml@@ -944,4 +944,6 @@<string name="settings_sports_custom_definition_file_error">Não foi possível carregar este arquivo JSON</string><string name="settings_experimental_badge">Experimental</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Ajustar à taxa de fotogramas do conteúdo</string>+ <string name="settings_refresh_rate_matching_description">Adapta a taxa de atualização do ecrã ao vídeo para movimentos mais fluidos. Requer um ecrã compatível; ao mudar, o ecrã pode ficar preto por instantes.</string></resources>diff --git a/feature/settings/src/main/res/values-ro/strings.xml b/feature/settings/src/main/res/values-ro/strings.xmlindex 71794edb..c19d6564 100644--- a/feature/settings/src/main/res/values-ro/strings.xml+++ b/feature/settings/src/main/res/values-ro/strings.xml@@ -951,4 +951,6 @@<string name="settings_sports_custom_definition_file_error">Acest fișier JSON nu a putut fi încărcat</string><string name="settings_experimental_badge">Experimental</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Potrivește rata de cadre a conținutului</string>+ <string name="settings_refresh_rate_matching_description">Adaptează rata de reîmprospătare a ecranului la videoclip pentru mișcări mai fluide. Necesită suport din partea ecranului; la schimbare, ecranul se poate înnegri pentru scurt timp.</string></resources>diff --git a/feature/settings/src/main/res/values-ru/strings.xml b/feature/settings/src/main/res/values-ru/strings.xmlindex 373f809f..c3567d29 100644--- a/feature/settings/src/main/res/values-ru/strings.xml+++ b/feature/settings/src/main/res/values-ru/strings.xml@@ -954,4 +954,6 @@<string name="settings_sports_custom_definition_file_error">Не удалось загрузить этот файл JSON</string><string name="settings_experimental_badge">Экспериментально</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Подстраивать частоту под видеоконтент</string>+ <string name="settings_refresh_rate_matching_description">Подстраивает частоту обновления экрана под видео для более плавного движения. Требуется поддержка экрана; при переключении экран может ненадолго погаснуть.</string></resources>diff --git a/feature/settings/src/main/res/values-sk/strings.xml b/feature/settings/src/main/res/values-sk/strings.xmlindex 447c417d..59b55047 100644--- a/feature/settings/src/main/res/values-sk/strings.xml+++ b/feature/settings/src/main/res/values-sk/strings.xml@@ -952,4 +952,6 @@<string name="settings_sports_custom_definition_file_error">Tento súbor JSON sa nepodarilo načítať</string><string name="settings_experimental_badge">Experimentálne</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Prispôsobiť snímkovej frekvencii obsahu</string>+ <string name="settings_refresh_rate_matching_description">Prispôsobí obnovovaciu frekvenciu displeja videu pre plynulejší pohyb. Vyžaduje podporu displeja; pri prepnutí môže obrazovka nakrátko stmavnúť.</string></resources>diff --git a/feature/settings/src/main/res/values-sq/strings.xml b/feature/settings/src/main/res/values-sq/strings.xmlindex ece94909..41108601 100644--- a/feature/settings/src/main/res/values-sq/strings.xml+++ b/feature/settings/src/main/res/values-sq/strings.xml@@ -946,4 +946,6 @@<string name="settings_sports_custom_definition_file_error">Ky skedar JSON nuk mund të ngarkohej</string><string name="settings_experimental_badge">Eksperimentale</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Përshtat shpejtësinë e kuadrove të përmbajtjes</string>+ <string name="settings_refresh_rate_matching_description">Përshtat ritmin e rifreskimit të ekranit me videon për lëvizje më të rrjedhshme. Kërkon mbështetje nga ekrani; gjatë ndërrimit ekrani mund të nxihet për pak çaste.</string></resources>diff --git a/feature/settings/src/main/res/values-sr/strings.xml b/feature/settings/src/main/res/values-sr/strings.xmlindex aedaf634..f6362e02 100644--- a/feature/settings/src/main/res/values-sr/strings.xml+++ b/feature/settings/src/main/res/values-sr/strings.xml@@ -949,4 +949,6 @@<string name="settings_sports_custom_definition_file_error">Није могуће учитати ову JSON датотеку</string><string name="settings_experimental_badge">Експериментално</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Усклади са брзином кадрова садржаја</string>+ <string name="settings_refresh_rate_matching_description">Усклађује учесталост освежавања екрана са видеом ради глаткијег кретања. Потребна је подршка екрана; при промени екран може накратко да се зацрни.</string></resources>diff --git a/feature/settings/src/main/res/values-sv/strings.xml b/feature/settings/src/main/res/values-sv/strings.xmlindex 58c82d76..a4b203c7 100644--- a/feature/settings/src/main/res/values-sv/strings.xml+++ b/feature/settings/src/main/res/values-sv/strings.xml@@ -948,4 +948,6 @@<string name="settings_sports_custom_definition_file_error">Det gick inte att läsa in den här JSON-filen</string><string name="settings_experimental_badge">Experimentell</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Anpassa till innehållets bildfrekvens</string>+ <string name="settings_refresh_rate_matching_description">Anpassar skärmens uppdateringsfrekvens till videon för jämnare rörelser. Kräver stöd från skärmen; skärmen kan bli svart en kort stund vid byte.</string></resources>diff --git a/feature/settings/src/main/res/values-th/strings.xml b/feature/settings/src/main/res/values-th/strings.xmlindex e7f595a4..db815bce 100644--- a/feature/settings/src/main/res/values-th/strings.xml+++ b/feature/settings/src/main/res/values-th/strings.xml@@ -943,4 +943,6 @@<string name="settings_sports_custom_definition_file_error">ไม่สามารถโหลดไฟล์ JSON นี้ได้</string><string name="settings_experimental_badge">ฟีเจอร์ทดลอง</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">ปรับให้ตรงกับอัตราเฟรมของเนื้อหา</string>+ <string name="settings_refresh_rate_matching_description">ปรับอัตรารีเฟรชของจอแสดงผลให้ตรงกับวิดีโอเพื่อให้ภาพเคลื่อนไหวลื่นไหลขึ้น ต้องใช้จอที่รองรับ หน้าจออาจมืดชั่วครู่ขณะเปลี่ยน</string></resources>diff --git a/feature/settings/src/main/res/values-tr/strings.xml b/feature/settings/src/main/res/values-tr/strings.xmlindex 9e7d169d..8f449871 100644--- a/feature/settings/src/main/res/values-tr/strings.xml+++ b/feature/settings/src/main/res/values-tr/strings.xml@@ -948,4 +948,6 @@<string name="settings_sports_custom_definition_file_error">Bu JSON dosyası yüklenemedi</string><string name="settings_experimental_badge">Deneysel</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">İçeriğin kare hızına uyum sağla</string>+ <string name="settings_refresh_rate_matching_description">Daha akıcı hareket için ekran yenileme hızını videoya uyarlar. Ekran desteği gerektirir; geçiş sırasında ekran kısa süreliğine kararabilir.</string></resources>diff --git a/feature/settings/src/main/res/values-uk/strings.xml b/feature/settings/src/main/res/values-uk/strings.xmlindex b2c1669c..66fb6764 100644--- a/feature/settings/src/main/res/values-uk/strings.xml+++ b/feature/settings/src/main/res/values-uk/strings.xml@@ -954,4 +954,6 @@<string name="settings_sports_custom_definition_file_error">Не вдалося завантажити цей файл JSON</string><string name="settings_experimental_badge">Експериментально</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Узгоджувати частоту з відеовмістом</string>+ <string name="settings_refresh_rate_matching_description">Узгоджує частоту оновлення екрана з відео для плавнішого руху. Потрібна підтримка екрана; під час перемикання екран може ненадовго згаснути.</string></resources>diff --git a/feature/settings/src/main/res/values-vi/strings.xml b/feature/settings/src/main/res/values-vi/strings.xmlindex 70c05006..5ae4fc5b 100644--- a/feature/settings/src/main/res/values-vi/strings.xml+++ b/feature/settings/src/main/res/values-vi/strings.xml@@ -945,4 +945,6 @@<string name="settings_sports_custom_definition_file_error">Không thể tải tệp JSON này</string><string name="settings_experimental_badge">Thử nghiệm</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Khớp với tốc độ khung hình nội dung</string>+ <string name="settings_refresh_rate_matching_description">Điều chỉnh tần số quét màn hình theo video để chuyển động mượt hơn. Cần màn hình hỗ trợ; màn hình có thể tối trong chốc lát khi chuyển đổi.</string></resources>diff --git a/feature/settings/src/main/res/values-zh-rTW/strings.xml b/feature/settings/src/main/res/values-zh-rTW/strings.xmlindex 5b272cbd..706d864a 100644--- a/feature/settings/src/main/res/values-zh-rTW/strings.xml+++ b/feature/settings/src/main/res/values-zh-rTW/strings.xml@@ -943,4 +943,6 @@<string name="settings_sports_custom_definition_file_error">無法載入此 JSON 檔案</string><string name="settings_experimental_badge">實驗性</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">配合內容影格率</string>+ <string name="settings_refresh_rate_matching_description">依照影片調整顯示器更新率,讓動態畫面更流暢。需要顯示器支援;切換時螢幕可能會短暫變黑。</string></resources>diff --git a/feature/settings/src/main/res/values-zh/strings.xml b/feature/settings/src/main/res/values-zh/strings.xmlindex 1b21f607..85912979 100644--- a/feature/settings/src/main/res/values-zh/strings.xml+++ b/feature/settings/src/main/res/values-zh/strings.xml@@ -944,4 +944,6 @@<string name="settings_sports_custom_definition_file_error">无法加载此 JSON 文件</string><string name="settings_experimental_badge">实验性</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">匹配内容帧率</string>+ <string name="settings_refresh_rate_matching_description">根据视频调整显示器刷新率,让运动画面更流畅。需要显示器支持;切换时屏幕可能会短暂变黑。</string></resources>diff --git a/feature/settings/src/main/res/values/strings.xml b/feature/settings/src/main/res/values/strings.xmlindex 6ec67860..1097d468 100644--- a/feature/settings/src/main/res/values/strings.xml+++ b/feature/settings/src/main/res/values/strings.xml@@ -1023,4 +1023,6 @@<string name="settings_sports_custom_definition_file_error">Could not load this JSON file</string><string name="settings_experimental_badge">Experimental</string><string name="settings_sync_index_progress">%1$s · %2$s</string>+ <string name="settings_refresh_rate_matching">Match content frame rate</string>+ <string name="settings_refresh_rate_matching_description">Match the display refresh rate to the video for smoother motion. Requires display support; switching may briefly blank the screen.</string></resources>diff --git a/player/build.gradle.kts b/player/build.gradle.ktsindex 9d8fdb07..0ba0aa0f 100644--- a/player/build.gradle.kts+++ b/player/build.gradle.kts@@ -154,6 +154,10 @@ android {buildFeatures {compose = true}++ testOptions {+ unitTests.isIncludeAndroidResources = true+ }}kotlin {diff --git a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.ktindex abc03009..da186402 100644--- a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt+++ b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt@@ -340,6 +340,7 @@ class Media3PlayerEngine @Inject constructor(private val subtitleStyleController = SubtitleStyleController()private val viewBinder = PlayerViewBinder(subtitleStyleController)+ override fun setDisplayFrameRate(frameRate: Float?) = viewBinder.setDisplayFrameRate(frameRate)private val trackController = PlayerTrackController(context)private val ffmpegExtensionSupport = FfmpegExtensionSupport()private var ffmpegAvailability = ffmpegExtensionSupport.availability()@@ -674,6 +675,7 @@ class Media3PlayerEngine @Inject constructor(}override fun stop() {+ viewBinder.setDisplayFrameRate(null)com.streamvault.domain.sync.AutomaticSyncActivity.stopped(this)clearAdaptiveDecodePressure()retryJob?.cancel()@@ -1718,6 +1720,9 @@ class Media3PlayerEngine @Inject constructor().apply {videoScalingMode = C.VIDEO_SCALING_MODE_SCALE_TO_FIT+ // The fullscreen display owner supplies measured or declared FPS. Letting the+ // renderer vote too would override the saved Off setting and compete in multiview.+ setVideoChangeFrameRateStrategy(C.VIDEO_CHANGE_FRAME_RATE_STRATEGY_OFF)playbackParameters = PlaybackParameters(_playbackSpeed.value)setVideoFrameMetadataListener { presentationTimeUs, _, _, _ ->videoStallDetector.onVideoFrameRendered((presentationTimeUs / 1_000L).coerceAtLeast(0L))diff --git a/player/src/main/java/com/streamvault/player/PlayerEngine.kt b/player/src/main/java/com/streamvault/player/PlayerEngine.ktindex 92c7fd0a..a3b7cd4a 100644--- a/player/src/main/java/com/streamvault/player/PlayerEngine.kt+++ b/player/src/main/java/com/streamvault/player/PlayerEngine.kt@@ -106,6 +106,8 @@ interface PlayerEngine {fun setSurfaceMode(mode: PlayerSurfaceMode)fun setVodHttpProtocolMode(mode: VodHttpProtocolMode)fun setMediaSessionEnabled(enabled: Boolean)+ /** Fullscreen display owner only. Null releases refresh matching for this engine. */+ fun setDisplayFrameRate(frameRate: Float?) {}fun setAudioFocusBypassed(bypassed: Boolean) {}fun setResolutionConstrainedForMultiView(constrained: Boolean) {}fun setFastRetryOnTransientFailures(enabled: Boolean)diff --git a/player/src/main/java/com/streamvault/player/playback/DisplayRefreshRatePolicy.kt b/player/src/main/java/com/streamvault/player/playback/DisplayRefreshRatePolicy.ktnew file mode 100644index 00000000..1e0c97b3--- /dev/null+++ b/player/src/main/java/com/streamvault/player/playback/DisplayRefreshRatePolicy.kt@@ -0,0 +1,34 @@+package com.streamvault.player.playback++import kotlin.math.abs+import kotlin.math.roundToInt++/** Display pixels are output pixels, never the decoded video's dimensions. */+internal data class RefreshRateDisplayMode(val id: Int, val width: Int, val height: Int, val hz: Float)++internal object DisplayRefreshRatePolicy {+ fun validRate(rate: Float): Boolean = rate.isFinite() && rate in 5f..240f++ /** Keep fractional broadcast rates distinct from their integer counterparts. */+ fun hasEvenCadence(hz: Float, fps: Float): Boolean {+ if (!validRate(fps) || !hz.isFinite() || hz <= 0f) return false+ val multiple = (hz / fps).roundToInt()+ return multiple >= 1 && abs(hz - multiple * fps) <= hz * 0.0005f+ }++ fun select(+ fps: Float,+ current: RefreshRateDisplayMode,+ supported: List<RefreshRateDisplayMode>+ ): RefreshRateDisplayMode? {+ if (!validRate(fps) || current.width <= 0 || current.height <= 0) return null+ val matching = supported.filter {+ it.id > 0 && it.width == current.width && it.height == current.height && hasEvenCadence(it.hz, fps)+ }+ // Avoid unnecessary HDMI resyncs, including 24 fps already displayed evenly at 120 Hz.+ matching.firstOrNull { it.id == current.id }?.let { return it }+ // Prefer 50/59.94/60 Hz for 25/29.97/30 fps when switching is needed.+ val preferredHz = if (fps in 24.9f..30.1f) fps * 2 else fps+ return matching.minWithOrNull(compareBy<RefreshRateDisplayMode> { abs(it.hz - preferredHz) }.thenBy { it.id })+ }+}diff --git a/player/src/main/java/com/streamvault/player/stats/FrameRateDetector.kt b/player/src/main/java/com/streamvault/player/stats/FrameRateDetector.ktindex dc42cdb4..e00c88c2 100644--- a/player/src/main/java/com/streamvault/player/stats/FrameRateDetector.kt+++ b/player/src/main/java/com/streamvault/player/stats/FrameRateDetector.kt@@ -1,5 +1,7 @@package com.streamvault.player.stats+import java.util.concurrent.atomic.AtomicInteger+/*** Detects the nominal frame rate of a stream from the presentation timestamps of rendered frames* and then **locks**: after [framesToLock] usable frames it computes the rate once, snaps it to the@@ -9,20 +11,20 @@ package com.streamvault.player.stats* dropping frames, because it uses the smallest timestamp gap rather than the render throughput.** Cost while detecting: one subtraction and one comparison per rendered frame. Cost after locking:- * a single volatile read per frame.+ * two volatile reads per frame.** Threading: [onFrame] is called on ExoPlayer's playback thread, [lockedFrameRate] is read from the* Main thread, and [reset] may be called from Main. The working state is only touched on the- * playback thread; the published result is `@Volatile`.+ * playback thread; the published result is `@Volatile` and tagged with its source generation.*/class FrameRateDetector(private val framesToLock: Int = DEFAULT_FRAMES_TO_LOCK) {@Volatile- private var locked = 0f+ private var result: Detection? = null- @Volatile- private var generation = 0+ private val generation = AtomicInteger()+ private data class Detection(val generation: Int, val rate: Float)private var activeGeneration = -1private var lastPresentationTimeUs = Long.MIN_VALUE@@ -30,19 +32,23 @@ class FrameRateDetector(private var usableFrames = 0/** Detected frame rate, or 0 until enough frames have been seen. */- val lockedFrameRate: Float get() = locked+ val lockedFrameRate: Float get() {+ val detected = result+ return if (detected?.generation == generation.get()) detected.rate else 0f+ }/** Forget everything; the next stream is detected from scratch. Safe to call from any thread. */fun reset() {- locked = 0f- generation+++ // Invalidate publication too: an old rendering callback may still finish after reset.+ generation.incrementAndGet()}/** Playback-thread only. */fun onFrame(presentationTimeUs: Long) {- if (locked > 0f) return- if (activeGeneration != generation) {- activeGeneration = generation+ if (lockedFrameRate > 0f) return+ val currentGeneration = generation.get()+ if (activeGeneration != currentGeneration) {+ activeGeneration = currentGenerationlastPresentationTimeUs = Long.MIN_VALUEminDeltaUs = Long.MAX_VALUEusableFrames = 0@@ -57,7 +63,7 @@ class FrameRateDetector(if (delta < minDeltaUs) minDeltaUs = deltausableFrames++if (usableFrames >= framesToLock) {- locked = snapToStandardRate(1_000_000f / minDeltaUs)+ result = Detection(activeGeneration, snapToStandardRate(1_000_000f / minDeltaUs))}}diff --git a/player/src/main/java/com/streamvault/player/stats/PlayerStatsCollector.kt b/player/src/main/java/com/streamvault/player/stats/PlayerStatsCollector.ktindex 92faff22..70314100 100644--- a/player/src/main/java/com/streamvault/player/stats/PlayerStatsCollector.kt+++ b/player/src/main/java/com/streamvault/player/stats/PlayerStatsCollector.kt@@ -78,8 +78,11 @@ class PlayerStatsCollector(/** Called by [androidx.media3.exoplayer.analytics.AnalyticsListener] — always on Main. */fun onVideoFormatChanged(format: Format) {+ if (format != lastVideoFormat) frameRateDetector.reset()lastVideoFormat = format- lastFrameRate = format.frameRate.takeIf { it > 0f } ?: lastFrameRate+ // A new rendition may omit FPS or use a different cadence. Never reuse its predecessor's+ // declared/measured rate when choosing a display refresh rate.+ lastFrameRate = format.frameRate.takeIf { it.isFinite() && it > 0f } ?: 0f}/** Called by [androidx.media3.exoplayer.analytics.AnalyticsListener] — always on Main. */diff --git a/player/src/main/java/com/streamvault/player/ui/DisplayRefreshRateController.kt b/player/src/main/java/com/streamvault/player/ui/DisplayRefreshRateController.ktnew file mode 100644index 00000000..303031fb--- /dev/null+++ b/player/src/main/java/com/streamvault/player/ui/DisplayRefreshRateController.kt@@ -0,0 +1,199 @@+package com.streamvault.player.ui++import android.app.Activity+import android.content.Context+import android.content.ContextWrapper+import android.content.pm.PackageManager+import android.content.res.Configuration+import android.hardware.display.DisplayManager+import android.os.Build+import android.os.Handler+import android.os.Looper+import android.util.Log+import android.view.Display+import android.view.Surface+import android.view.SurfaceHolder+import android.view.SurfaceView+import android.view.View+import androidx.media3.ui.PlayerView+import com.streamvault.player.playback.DisplayRefreshRatePolicy+import com.streamvault.player.playback.RefreshRateDisplayMode++/** One fullscreen owner's display vote. Preview and multiview players never acquire a vote. */+internal class DisplayRefreshRateController(private val view: PlayerView) :+ View.OnAttachStateChangeListener, SurfaceHolder.Callback, DisplayManager.DisplayListener {+ private val displayManager = view.context.getSystemService(Context.DISPLAY_SERVICE) as? DisplayManager+ private val window = view.context.activity()?.window+ private val surfaceView = view.videoSurfaceView as? SurfaceView+ private val television = view.resources.configuration.uiMode and Configuration.UI_MODE_TYPE_MASK ==+ Configuration.UI_MODE_TYPE_TELEVISION ||+ view.context.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)+ private var rate: Float? = null+ private var votedSurface: Surface? = null+ private var votedRate: Float? = null+ private var surfaceRequestsUnsupported = false+ private var originalModeId: Int? = null+ private var ownedModeId: Int? = null+ private var listening = false++ init {+ view.addOnAttachStateChangeListener(this)+ surfaceView?.holder?.addCallback(this)+ }++ fun update(frameRate: Float?) {+ rate = frameRate?.takeIf(DisplayRefreshRatePolicy::validRate)+ if (rate != null && view.isAttachedToWindow && !listening) {+ runCatching {+ displayManager?.registerDisplayListener(this, Handler(Looper.getMainLooper()))+ listening = displayManager != null+ }.onFailure { Log.w(TAG, "refresh-match display-listener unavailable", it) }+ }+ apply()+ if (rate == null) stopListening()+ }++ private fun apply() {+ val fps = rate+ if (fps == null || !view.isAttachedToWindow) {+ clearVotes()+ return+ }+ // Surface votes preserve output resolution and honor Android's Match content frame rate+ // preference. ALWAYS permits an HDMI resync only when the OS/user allows it (Android 12+).+ if (Build.VERSION.SDK_INT >= 30 && surfaceView != null && !surfaceRequestsUnsupported &&+ (Build.VERSION.SDK_INT >= 31 || !television)) {+ restoreWindowMode()+ val surface = surfaceView.holder.surface+ if (surface.isValid && (votedSurface !== surface || votedRate != fps)) {+ val requested = runCatching {+ setSurfaceRate(surface, fps, Surface.FRAME_RATE_COMPATIBILITY_FIXED_SOURCE)+ votedSurface = surface+ votedRate = fps+ Log.i(TAG, "refresh-match request fps=$fps via=surface display=${view.display?.displayId}")+ }.onFailure { Log.w(TAG, "refresh-match surface-request unavailable", it) }.isSuccess+ if (requested) return+ // Do not alternate between restoring and reacquiring a working window fallback+ // on every display callback when a vendor's Surface API consistently throws.+ surfaceRequestsUnsupported = true+ } else {+ return+ }+ }+ // Older HDMI devices and TextureView outputs need a window mode request. Restrict this+ // fallback to televisions; do not introduce disruptive display switches on phones/tablets.+ if (!television || window == null) return+ runCatching {+ val targetWindow = window ?: return@runCatching+ val display = view.display ?: return@runCatching+ val current = display.mode+ val preference = if (Build.VERSION.SDK_INT >= 31) {+ displayManager?.matchContentFrameRateUserPreference ?: DisplayManager.MATCH_CONTENT_FRAMERATE_UNKNOWN+ } else -1+ if (Build.VERSION.SDK_INT >= 31 && preference == DisplayManager.MATCH_CONTENT_FRAMERATE_NEVER) {+ restoreWindowMode()+ return@runCatching+ }+ val modes = display.supportedModes.filter { mode ->+ Build.VERSION.SDK_INT < 31 || preference != DisplayManager.MATCH_CONTENT_FRAMERATE_SEAMLESSS_ONLY ||+ mode.modeId == current.modeId || current.alternativeRefreshRates.any { absRate(it, mode.refreshRate) }+ }+ val target = DisplayRefreshRatePolicy.select(fps, current.snapshot(), modes.map { it.snapshot() })+ if (target == null) {+ Log.i(TAG, "refresh-match no-compatible-mode fps=$fps display=${display.displayId}")+ restoreWindowMode()+ return@runCatching+ }+ if (ownedModeId == null && target.id == current.modeId) return@runCatching+ val attributes = targetWindow.attributes+ if (attributes.preferredDisplayModeId == target.id) return@runCatching+ if (originalModeId == null) originalModeId = attributes.preferredDisplayModeId+ ownedModeId = target.id+ attributes.preferredDisplayModeId = target.id+ targetWindow.attributes = attributes+ Log.i(TAG, "refresh-match request fps=$fps hz=${target.hz} mode=${target.id} via=window display=${display.displayId}")+ }.onFailure { Log.w(TAG, "refresh-match window-request unavailable", it) }+ }++ private fun clearVotes() {+ if (Build.VERSION.SDK_INT >= 30) {+ votedSurface?.takeIf { it.isValid }?.let { surface ->+ runCatching {+ setSurfaceRate(surface, 0f, Surface.FRAME_RATE_COMPATIBILITY_DEFAULT)+ }+ .onFailure { Log.w(TAG, "refresh-match surface-clear unavailable", it) }+ }+ }+ votedSurface = null+ votedRate = null+ restoreWindowMode()+ }++ private fun restoreWindowMode() {+ val original = originalModeId ?: return+ runCatching {+ val targetWindow = window ?: return@runCatching+ val attributes = targetWindow.attributes+ // Do not overwrite a newer request made by another window owner.+ if (attributes.preferredDisplayModeId == ownedModeId) {+ attributes.preferredDisplayModeId = original.takeIf { id ->+ val display = view.display+ id == 0 || display?.supportedModes?.any {+ it.modeId == id && it.physicalWidth == display.mode.physicalWidth &&+ it.physicalHeight == display.mode.physicalHeight+ } == true+ } ?: 0 // HDMI hotplug may invalidate the saved mode id.+ targetWindow.attributes = attributes+ Log.i(TAG, "refresh-match restored mode=${attributes.preferredDisplayModeId}")+ }+ }.onFailure { Log.w(TAG, "refresh-match restore unavailable", it) }+ originalModeId = null+ ownedModeId = null+ }++ fun close() {+ update(null)+ view.removeOnAttachStateChangeListener(this)+ surfaceView?.holder?.removeCallback(this)+ }++ private fun stopListening() {+ if (listening) runCatching { displayManager?.unregisterDisplayListener(this) }+ listening = false+ }++ override fun onViewAttachedToWindow(v: View) = update(rate)+ override fun onViewDetachedFromWindow(v: View) { clearVotes(); stopListening() }+ override fun surfaceCreated(holder: SurfaceHolder) = apply()+ override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) = apply()+ override fun surfaceDestroyed(holder: SurfaceHolder) { votedSurface = null; votedRate = null }+ override fun onDisplayAdded(displayId: Int) = apply()+ override fun onDisplayRemoved(displayId: Int) = apply()+ override fun onDisplayChanged(displayId: Int) {+ if (view.display?.displayId == displayId) {+ if (rate != null) Log.i(TAG, "refresh-match observed hz=${view.display?.mode?.refreshRate} display=$displayId")+ apply()+ }+ }++ private fun Display.Mode.snapshot() = RefreshRateDisplayMode(modeId, physicalWidth, physicalHeight, refreshRate)++ @androidx.annotation.RequiresApi(30)+ private fun setSurfaceRate(surface: Surface, fps: Float, compatibility: Int) {+ if (Build.VERSION.SDK_INT >= 31) {+ surface.setFrameRate(fps, compatibility, Surface.CHANGE_FRAME_RATE_ALWAYS)+ } else {+ surface.setFrameRate(fps, compatibility)+ }+ }++ companion object {+ private const val TAG = "DisplayRefreshRate"+ private fun absRate(a: Float, b: Float) = kotlin.math.abs(a - b) < 0.01f+ private tailrec fun Context.activity(): Activity? = when (this) {+ is Activity -> this+ is ContextWrapper -> if (baseContext !== this) baseContext.activity() else null+ else -> null+ }+ }+}diff --git a/player/src/main/java/com/streamvault/player/ui/PlayerViewBinder.kt b/player/src/main/java/com/streamvault/player/ui/PlayerViewBinder.ktindex b64aa27f..01a5ca49 100644--- a/player/src/main/java/com/streamvault/player/ui/PlayerViewBinder.kt+++ b/player/src/main/java/com/streamvault/player/ui/PlayerViewBinder.kt@@ -21,6 +21,8 @@ class PlayerViewBinder(private val subtitleStyleController: SubtitleStyleController) {private var boundPlayerView: PlayerView? = null+ private var refreshRateController: DisplayRefreshRateController? = null+ private var displayFrameRate: Float? = nullprivate var boundResizeMode: PlayerSurfaceResizeMode = PlayerSurfaceResizeMode.FITprivate var injectedSubtitleCues: List<Cue> = emptyList()@@ -43,6 +45,7 @@ class PlayerViewBinder(val playerView = renderView as? PlayerView ?: returnboundResizeMode = resizeModeif (boundPlayerView !== playerView) {+ refreshRateController?.close()runCatching {PlayerView.switchTargetView(player, boundPlayerView, playerView)}.getOrElse {@@ -50,15 +53,18 @@ class PlayerViewBinder(playerView.player = player}boundPlayerView = playerView+ refreshRateController = DisplayRefreshRateController(playerView)} else if (playerView.player !== player) {playerView.player = player}+ refreshRateController?.update(displayFrameRate)playerView.applyResizeMode(resizeMode)subtitleStyleController.apply(playerView)applyInjectedCues(playerView)}fun attachPlayer(player: androidx.media3.exoplayer.ExoPlayer?) {+ refreshRateController?.update(if (player == null) null else displayFrameRate)boundPlayerView?.player = playerboundPlayerView?.applyResizeMode(boundResizeMode)subtitleStyleController.apply(boundPlayerView)@@ -70,15 +76,25 @@ class PlayerViewBinder(if (boundPlayerView !== playerView && playerView.player == null) returnplayerView.player = nullif (boundPlayerView === playerView) {+ refreshRateController?.close()+ refreshRateController = nullboundPlayerView = null}}fun clear() {+ displayFrameRate = null+ refreshRateController?.close()+ refreshRateController = nullboundPlayerView?.player = nullboundPlayerView = null}+ fun setDisplayFrameRate(frameRate: Float?) {+ displayFrameRate = frameRate+ refreshRateController?.update(frameRate)+ }+fun reapplyStyle() {subtitleStyleController.apply(boundPlayerView)applyInjectedCues(boundPlayerView)diff --git a/player/src/test/java/com/streamvault/player/playback/DisplayRefreshRatePolicyTest.kt b/player/src/test/java/com/streamvault/player/playback/DisplayRefreshRatePolicyTest.ktnew file mode 100644index 00000000..b6c0c60f--- /dev/null+++ b/player/src/test/java/com/streamvault/player/playback/DisplayRefreshRatePolicyTest.kt@@ -0,0 +1,59 @@+package com.streamvault.player.playback++import org.junit.Assert.*+import org.junit.Test++class DisplayRefreshRatePolicyTest {+ private fun mode(id: Int, hz: Float, width: Int = 3840, height: Int = 2160) =+ RefreshRateDisplayMode(id, width, height, hz)++ @Test fun `broadcast content selects even cadence without changing output resolution`() {+ val modes = listOf(mode(1, 60f), mode(2, 50f), mode(3, 24f), mode(4, 23.976f), mode(5, 59.94f))+ for ((fps, expected) in listOf(25f to 2, 50f to 2, 24f to 3, 23.976f to 4, 29.97f to 5, 59.94f to 5, 30f to 1, 60f to 1)) {+ assertEquals("fps=$fps", expected, DisplayRefreshRatePolicy.select(fps, modes[0], modes)?.id)+ }+ }++ @Test fun `fractional rates do not match integer display modes`() {+ assertFalse(DisplayRefreshRatePolicy.hasEvenCadence(24f, 23.976f))+ assertFalse(DisplayRefreshRatePolicy.hasEvenCadence(60f, 29.97f))+ assertFalse(DisplayRefreshRatePolicy.hasEvenCadence(59.94f, 30f))+ assertTrue(DisplayRefreshRatePolicy.hasEvenCadence(59.94006f, 29.97f))+ assertTrue(DisplayRefreshRatePolicy.hasEvenCadence(119.88f, 23.976f))+ }++ @Test fun `an already compatible higher refresh rate avoids HDMI resync`() {+ val current = mode(1, 120f)+ assertEquals(current, DisplayRefreshRatePolicy.select(24f, current, listOf(current, mode(2, 24f))))+ }++ @Test fun `unsupported cadence does not choose the nearest incompatible mode`() {+ assertNull(DisplayRefreshRatePolicy.select(25f, mode(1, 60f), listOf(mode(1, 60f))))+ assertNull(DisplayRefreshRatePolicy.select(60f, mode(1, 50f), listOf(mode(1, 50f))))+ }++ @Test fun `matching lower resolution is never substituted for the output resolution`() {+ val current = mode(1, 60f)+ assertNull(DisplayRefreshRatePolicy.select(25f, current, listOf(current, mode(2, 50f, 1920, 1080))))+ }++ @Test fun `25 and 30 fps prefer double cadence when switching from an incompatible mode`() {+ val current = mode(1, 24f)+ val supported = listOf(current, mode(2, 25f), mode(3, 50f), mode(4, 100f), mode(5, 30f), mode(6, 60f))+ assertEquals(3, DisplayRefreshRatePolicy.select(25f, current, supported)?.id)+ assertEquals(6, DisplayRefreshRatePolicy.select(30f, current, supported)?.id)+ }++ @Test fun `invalid metadata and empty capability lists do not request display modes`() {+ val current = mode(1, 60f)+ for (rate in listOf(0f, -1f, Float.NaN, Float.POSITIVE_INFINITY, 1000f)) {+ assertNull(DisplayRefreshRatePolicy.select(rate, current, listOf(current)))+ }+ assertNull(DisplayRefreshRatePolicy.select(24f, current, emptyList()))+ }++ @Test fun `user playback speed can produce a supported cadence`() {+ val current = mode(1, 50f)+ assertEquals(2, DisplayRefreshRatePolicy.select(24f * 1.25f, current, listOf(current, mode(2, 60f)))?.id)+ }+}diff --git a/player/src/test/java/com/streamvault/player/stats/FrameRateDetectorTest.kt b/player/src/test/java/com/streamvault/player/stats/FrameRateDetectorTest.ktindex 08cdaa45..5995bdff 100644--- a/player/src/test/java/com/streamvault/player/stats/FrameRateDetectorTest.kt+++ b/player/src/test/java/com/streamvault/player/stats/FrameRateDetectorTest.kt@@ -5,6 +5,15 @@ import org.junit.Testclass FrameRateDetectorTest {+ @Test+ fun `fractional timestamp cadences remain distinct from integer rates`() {+ for ((interval, expected) in listOf(41_708L to 23.976f, 33_367L to 29.97f, 16_683L to 59.94f)) {+ val detector = FrameRateDetector(framesToLock = 10)+ feed(detector, intervalUs = interval, frames = 11)+ assertThat(detector.lockedFrameRate).isEqualTo(expected)+ }+ }+private fun feed(detector: FrameRateDetector, intervalUs: Long, frames: Int, startUs: Long = 0L) {var pts = startUsrepeat(frames) {diff --git a/player/src/test/java/com/streamvault/player/ui/DisplayRefreshRateControllerTest.kt b/player/src/test/java/com/streamvault/player/ui/DisplayRefreshRateControllerTest.ktnew file mode 100644index 00000000..3623db56--- /dev/null+++ b/player/src/test/java/com/streamvault/player/ui/DisplayRefreshRateControllerTest.kt@@ -0,0 +1,103 @@+package com.streamvault.player.ui++import android.app.Activity+import android.view.Display+import androidx.media3.ui.PlayerView+import androidx.media3.exoplayer.ExoPlayer+import com.streamvault.player.PlayerSurfaceResizeMode+import org.junit.Assert.assertEquals+import org.junit.Test+import org.junit.runner.RunWith+import org.robolectric.Robolectric+import org.robolectric.RobolectricTestRunner+import org.robolectric.annotation.Config+import org.robolectric.shadows.ShadowDisplayManager+import org.robolectric.util.ReflectionHelpers+import org.robolectric.util.ReflectionHelpers.ClassParameter++@RunWith(RobolectricTestRunner::class)+@Config(sdk = [28], qualifiers = "television")+class DisplayRefreshRateControllerTest {+ @Test fun `rebinding the same rendering view reapplies a suspended fullscreen vote`() = withDisplay { activity, view, target ->+ val player = ExoPlayer.Builder(activity).build()+ val binder = PlayerViewBinder(SubtitleStyleController())+ try {+ binder.setDisplayFrameRate(25f)+ binder.bind(view, player, PlayerSurfaceResizeMode.FIT)+ assertEquals(target, activity.window.attributes.preferredDisplayModeId)+ binder.attachPlayer(null)+ assertEquals(0, activity.window.attributes.preferredDisplayModeId)+ binder.bind(view, player, PlayerSurfaceResizeMode.FIT)+ assertEquals(target, activity.window.attributes.preferredDisplayModeId)+ } finally {+ binder.clear()+ player.release()+ }+ }++ @Test fun `legacy TV matches and restores on off and disposal`() = withDisplay { activity, view, target ->+ val matcher = DisplayRefreshRateController(view)+ matcher.update(25f)+ assertEquals(target, activity.window.attributes.preferredDisplayModeId)+ matcher.update(null)+ assertEquals(0, activity.window.attributes.preferredDisplayModeId)+ matcher.update(25f)+ matcher.close()+ assertEquals(0, activity.window.attributes.preferredDisplayModeId)+ }++ @Test fun `restores the prior explicit window mode rather than always using zero`() = withDisplay { activity, view, target ->+ val original = view.display.mode.modeId+ activity.window.attributes = activity.window.attributes.apply { preferredDisplayModeId = original }+ val matcher = DisplayRefreshRateController(view)+ matcher.update(25f)+ assertEquals(target, activity.window.attributes.preferredDisplayModeId)+ matcher.close()+ assertEquals(original, activity.window.attributes.preferredDisplayModeId)+ }++ @Test fun `unsupported cadence releases a previous matching request`() = withDisplay { activity, view, _ ->+ val matcher = DisplayRefreshRateController(view)+ matcher.update(25f)+ matcher.update(23.976f)+ assertEquals(0, activity.window.attributes.preferredDisplayModeId)+ matcher.close()+ }++ @Test fun `cleanup does not overwrite a newer window request`() = withDisplay { activity, view, _ ->+ val matcher = DisplayRefreshRateController(view)+ matcher.update(25f)+ activity.window.attributes = activity.window.attributes.apply { preferredDisplayModeId = 99 }+ matcher.close()+ assertEquals(99, activity.window.attributes.preferredDisplayModeId)+ }++ @Test fun `detaching the rendering view releases the display request`() = withDisplay { activity, view, _ ->+ val matcher = DisplayRefreshRateController(view)+ matcher.update(25f)+ activity.setContentView(android.view.View(activity))+ assertEquals(0, activity.window.attributes.preferredDisplayModeId)+ matcher.close()+ }++ private fun withDisplay(block: (Activity, PlayerView, Int) -> Unit) {+ val activityController = Robolectric.buildActivity(Activity::class.java).setup().visible()+ try {+ val activity = activityController.get()+ val view = PlayerView(activity)+ activity.setContentView(view)+ val display = view.display+ val current = display.mode+ val target = current.modeId + 1+ val fifty = ReflectionHelpers.callConstructor(Display.Mode::class.java,+ ClassParameter.from(Int::class.javaPrimitiveType, target),+ ClassParameter.from(Int::class.javaPrimitiveType, current.physicalWidth),+ ClassParameter.from(Int::class.javaPrimitiveType, current.physicalHeight),+ ClassParameter.from(Float::class.javaPrimitiveType, 50f))+ ShadowDisplayManager.setSupportedModes(display.displayId, current, fifty)+ block(activity, view, target)+ } finally {+ activityController.pause().stop().destroy()+ }+ }+}