fix screenshot mem usage + fix backstage not starting after being stopped once

2026-08-01 00:46:03 -05:00
parent b68a306708
commit 7b249457a1
18 changed files with 675 additions and 99 deletions
@@ -361,6 +361,27 @@ func TestFrameFPS(t *testing.T) {
 	t.Logf("Calculated FPS: %d", fps)
 }

+func TestDesktopAndBackstageFPSCountersAreIndependent(t *testing.T) {
+	var desktop frameRateCounter
+	var backstage frameRateCounter
+	start := time.Unix(100, 0)
+
+	desktop.fps(start)
+	backstage.fps(start)
+	for i := 1; i <= 59; i++ {
+		desktop.fps(start.Add(time.Duration(i) * time.Second / 60))
+	}
+	desktopFPS := desktop.fps(start.Add(time.Second))
+	backstageFPS := backstage.fps(start.Add(time.Second))
+
+	if desktopFPS < 55 || desktopFPS > 65 {
+		t.Fatalf("expected desktop counter near 60 fps, got %d", desktopFPS)
+	}
+	if backstageFPS != 2 {
+		t.Fatalf("expected backstage counter to contain only its two samples, got %d fps", backstageFPS)
+	}
+}
+
 func TestJPEGQuality(t *testing.T) {
 	quality := desktopJPEGQuality()
 	if quality < 1 || quality > 100 {
@@ -570,6 +591,60 @@ func TestSetFrameFlowTargetFPSEnvOverride(t *testing.T) {
 	}
 }

+func TestStoppingDesktopPreservesBackstageFrameFlow(t *testing.T) {
+	t.Setenv("OVERLORD_DESKTOP_IN_FLIGHT_FRAMES", "")
+	frameStreamsMu.Lock()
+	frameStreams = make(map[string]int)
+	frameStreamsMu.Unlock()
+	ResetFrameSlots()
+	t.Cleanup(func() {
+		StopFrameFlowStream("desktop")
+		StopFrameFlowStream("backstage")
+	})
+
+	StartFrameFlowStream("desktop", 60)
+	StartFrameFlowStream("backstage", 60)
+	if got := activeFrameSlotLimit(); got != 8 {
+		t.Fatalf("expected combined 120 fps slot limit 8, got %d", got)
+	}
+	inFlightFrames.Store(2)
+	frameAckSeen.Store(true)
+
+	StopFrameFlowStream("desktop")
+	if got := activeFrameSlotLimit(); got != 4 {
+		t.Fatalf("expected remaining backstage 60 fps slot limit 4, got %d", got)
+	}
+	if got := inFlightFrames.Load(); got != 2 {
+		t.Fatalf("desktop stop reset %d backstage in-flight frames", got)
+	}
+	if !frameAckSeen.Load() {
+		t.Fatal("desktop stop disabled ACK flow control while backstage remained active")
+	}
+
+	StopFrameFlowStream("backstage")
+	if got := inFlightFrames.Load(); got != 0 {
+		t.Fatalf("last stream stop left %d in-flight frames", got)
+	}
+	if frameAckSeen.Load() {
+		t.Fatal("last stream stop did not reset ACK flow state")
+	}
+}
+
+func TestInactiveStreamTargetDoesNotChangeActiveFrameFlow(t *testing.T) {
+	t.Setenv("OVERLORD_DESKTOP_IN_FLIGHT_FRAMES", "")
+	frameStreamsMu.Lock()
+	frameStreams = make(map[string]int)
+	frameStreamsMu.Unlock()
+	ResetFrameSlots()
+	t.Cleanup(func() { StopFrameFlowStream("backstage") })
+
+	StartFrameFlowStream("backstage", 60)
+	UpdateFrameFlowStream("desktop", 240)
+	if got := activeFrameSlotLimit(); got != 4 {
+		t.Fatalf("inactive desktop target changed backstage slot limit to %d", got)
+	}
+}
+
 func TestRequestDesktopFullFrameRequestsWebRTCKeyframe(t *testing.T) {
 	_ = webrtcpub.ConsumeKeyframeRequest(webrtcpub.KindDesktop)