refactor: remove duplicate session frame limiter (#1616)

This commit is contained in:
Kurt Himebauch authored and GitHub committed 2026-10-26 11:25:31 -04:00
1 parent ee1b3b26e1
commit 5d945d7784
47 files changed
+94 -170

No files matched your search

@@ -1,9 +1,11 @@
package com.droiddeck.launcher.glasses
import android.content.Context
import android.hardware.display.DisplayManager
import android.view.Display
import androidx.compose.runtime.MutableState
import com.droiddeck.launcher.SessionActivity
import com.droiddeck.launcher.session.SessionPrefs
import com.droiddeck.launcher.session.SessionState
import org.junit.After
import org.junit.Assert.assertEquals
@@ -36,10 +38,14 @@ class GlassesMirrorPacingTest {
val panel = Shadow.extract<ModeDisplay>(activity.display)
panel.supported = arrayOf(mode(1, 60f), mode(2, 90f), mode(3, 120f))
panel.current = panel.supported.last()
SessionState.fpsLimit = 0
SessionState.performanceMode = false
activity.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit()
}
@After fun cleanup() { SessionState.fpsLimit = 0 }
@After fun cleanup() {
SessionState.performanceMode = false
activity.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit()
}
@Test fun connectingChangingRateAndDisconnectingUpdatePhonePacingWithoutSavingPreferences() {
apply(connected, settings)
@@ -48,18 +54,25 @@ class GlassesMirrorPacingTest {
expect(2, 90f, 90)
apply(GlassesState(), settings)
expect(3, 120f, 0)
assertEquals(0, SessionState.fpsLimit)
}
@Test fun lowerSavedLimitSurvivesMirroringAndStalePhoneRefreshReports() {
SessionState.fpsLimit = 30
@Test fun retiredSavedLimitsDoNotCapThePhoneOrMirroredOutput() {
activity.getSharedPreferences("session", Context.MODE_PRIVATE).edit()
.putInt("fpsLimit.steam", 30).putInt("fpsLimit.desktop", 40).commit()
apply(connected, settings)
expect(1, 60f, 30)
expect(1, 60f, 60)
apply(connected.copy(hz = 120f), settings)
expect(1, 60f, 30)
expect(1, 60f, 60)
apply(GlassesState(), settings)
expect(3, 120f, 30)
assertEquals(30, SessionState.fpsLimit)
expect(3, 120f, 0)
}
@Test fun performanceModeResumesUnpacedOutputAfterMirrorDisconnects() {
SessionState.performanceMode = true
apply(connected, settings)
expect(1, 60f, 60)
apply(GlassesState(), settings)
expect(3, 120f, SessionPrefs.FPS_UNPACED)
}
@Test fun pacingFollowsThePanelWhenTheSystemKeepsALowerRateThanRequested() {
@@ -58,13 +58,6 @@ class GlassesRenderingTest {
assertEquals(0, GlassesRendering.mirrorRefreshLimit(settings, ultra, true))
}
@Test fun mirrorCapPreservesLowerLimitsAndRestoresTheRequestedLimitAfterDisconnect() {
for (requested in listOf(0, 30, 60, 90, 120)) {
assertEquals(if (requested == 30) 30 else 60, GlassesRendering.fpsLimit(requested, 60))
assertEquals(requested, GlassesRendering.fpsLimit(requested, 0))
}
}
private fun render(settings: GlassesSettings, state: GlassesState = ultra, steamVr: Boolean = false) =
GlassesRendering.cardboard(base, settings, state, outputActive = true, steamVrRunning = steamVr)
@@ -24,19 +24,13 @@ class PerformanceModeTest {
assertFalse(SessionPrefs.performanceMode(app, SessionService.MODE_DESKTOP))
}
@Test fun offKeepsTodaysPacing() {
@Test fun offKeepsDisplayAndMirrorPacing() {
assertEquals(0, SessionPrefs.compositorFpsLimit(0, false))
assertEquals(60, SessionPrefs.compositorFpsLimit(60, false))
}
@Test fun onWithoutALimitIsUnpacedAndAChosenLimitStillPaces() {
@Test fun onIsUnpacedUnlessMirroring() {
assertEquals(SessionPrefs.FPS_UNPACED, SessionPrefs.compositorFpsLimit(0, true))
assertEquals(60, SessionPrefs.compositorFpsLimit(60, true))
}
@Test fun anOldUncappedFrameLimitReadsAsOff() {
session.edit().putInt("fpsLimit.steam", -1).commit()
assertEquals(0, SessionPrefs.fpsLimit(app, SessionService.MODE_STEAM))
assertFalse(SessionPrefs.fpsLimitChoices.any { it.first < 0 })
}
}
@@ -29,7 +29,7 @@ class SettingsResetTest {
SessionPrefs.setTheme(app, "ocean")
SessionPrefs.setUnfoldedControlsWithController(app, true)
SessionPrefs.setNoXalia(app, false)
SessionPrefs.setFpsLimit(app, SessionService.MODE_STEAM, 30)
session.edit().putInt("fpsLimit.steam", 30).commit()
SessionPrefs.setHdr(app, SessionService.MODE_DESKTOP, true)
SessionPrefs.setResolutionChoice(app, SessionService.MODE_STEAM, "1280x800")
SessionPrefs.setGuestHostname(app, "MyDeck")
@@ -48,7 +48,7 @@ class SettingsResetTest {
assertEquals("graphite", SessionPrefs.theme(app))
assertFalse(SessionPrefs.unfoldedControlsWithController(app))
assertTrue(SessionPrefs.noXalia(app))
assertEquals(0, SessionPrefs.fpsLimit(app, SessionService.MODE_STEAM))
assertFalse(session.contains("fpsLimit.steam"))
assertFalse(SessionPrefs.hdr(app, SessionService.MODE_DESKTOP))
assertFalse(SessionPrefs.resolutionChosen(app, SessionService.MODE_STEAM))
assertEquals(SessionPrefs.DEFAULT_GUEST_HOSTNAME, SessionPrefs.guestHostname(app))