[summeroff]

Summary

Bumps plugins/obs-browser to the merged streamlabs/obs-browser#54, which hardens hardware-accelerated browser sources against the libcef crash spike on Streamlabs Desktop 1.21.x. Branched from 31.1.2sl19.

Change

plugins/obs-browser: 2660d9b -> 4002dac   (squash-merge of obs-browser#54 on streamlabs)

Submodule gitlink only, no other files. The merged commit contains:

1. --disable-gpu-process-crash-limit (primary) — survive transient GPU-process loss instead of escalating to Chromium's fatal IntentionallyCrashBrowserForUnusableGpuProcess() ("GPU process isn't usable. Goodbye.").
2. Re-check validity under the graphics lock in OnAcceleratedPaint (secondary hardening) — close a teardown TOCTOU window.

Root cause

Both Sentry-reported crashes share gpu_data_manager_impl_private.cc:454: GPU process isn't usable. Goodbye. — Chromium deliberately aborting after CEF's GPU process dies past its crash limit, correlated with a host D3D11 device removal / TDR (887A0005, "Rebuilding all assets", shared-texture rebuild failures). The crash-limit flag is the primary mitigation; the OnAcceleratedPaint guard is secondary. Full analysis and verification status in streamlabs/obs-browser#54.

Verification

• obs-browser#54 builds clean (combined tree, exit 0) and is merged to streamlabs.
• This PR is a gitlink-only change pointing at that squash commit (4002dac).

Status

obs-browser#54 is merged; this PR now points at its squash commit 4002dac on streamlabs (no longer the pre-merge PR-branch pointer). Ready to merge.

[summeroff]

Re-evaluation after the OBS 32.1.1 merge (#734): this PR is now redundant

Checked against streamlabs @ 2edf09bbd. The fix from obs-browser#54 already ships on streamlabs — merging this PR would move three submodules backwards.

Why it's already in

obs-browser merged #54 first, then merged its own OBS32 branch on top:

2f5161c  Merge pull request #53 from streamlabs/obs_merge_32.1.1   <- streamlabs points here today
4002dac  Harden browser source against GPU-process loss + OnAcceleratedPaint teardown race (#54)
8a3b5e8  Merge upstream obs-browser 2.26.8 into obs_merge_32.1.1
2660d9b  Merge pull request #52 from streamlabs/obs_merge_31.1.2   <- this PR's merge base

git merge-base --is-ancestor 4002dac 2f5161c → true.

Both hunks verified physically present in the tree at 2f5161c, so nothing was dropped in obs-browser's own OBS32 merge resolution:

• browser-app.cpp:110 — command_line->AppendSwitch("disable-gpu-process-crash-limit"); (with the "Survive transient GPU-process loss" comment)
• browser-client.cpp — the /* Re-check under the lock: ... */ + if (!valid()) { obs_leave_graphics(); return; } block after obs_enter_graphics() in OnAcceleratedPaint

What merging it would cost

submodule	streamlabs	this PR	effect
plugins/obs-browser	2f5161c	4002dac	regress — drops obs-browser's entire OBS32 merge
plugins/mediasoup-connector	7ea6f2c	7a8e2f6	regress — reverts #745 (libmediasoupclient 3.5.0 + webrtc m140)
plugins/obs-ndi	785194e	d76cf94	content-identical tree; d76cf94 is the pre-merge SHA of the same fix
deps/libdshowcapture/src	48a97c9	48a97c9	identical

The remaining files in the diff (libobs/*, libobs-winrt/winrt-capture.cpp, plugins/mac-virtualcam/..., .gitmodules) are the cherry-picked #746/#749/#751 commits, all of which landed on streamlabs under their canonical SHAs. .gitmodules already reads branch = streamlabs for obs-ndi on both sides.

Suggested action

Close as already-shipped. No re-targeting or conflict resolution is worthwhile — there is no unique payload left to carry forward.