Fix: Keep the captured monitor stable across restarts

GDI and DXGI each kept their own static monitor index, and DXGI
committed the index before its initialization had succeeded. When a
quality change restarted capture and DXGI fell back to GDI, the next
DXGI attempt read the failed attempt's index and jumped to the other
monitor. Both backends now share one process-wide index with separate
peek and commit steps, and the commit only happens after the backend
is actually up.

Manual switching is made a one-shot request: InitScreenSpy consumes
the flag and RestartScreen only sets it, so an adaptive restart that
lands in the middle of a switch no longer drops the request or
re-applies it on every later rebuild. Window capture no longer
touches the index at all, so leaving window mode returns to the
monitor that was on screen.

Also: restart capture on a bitrate change only when the target level
is still H.264 (switching to RGB565/DIFF never uses the bitrate), and
bound the DXGI output fallback so a session without any enumerable
output cannot spin forever in InitDXGI.

Co-Authored-By: deepseek-flash
This commit is contained in:
yuanyuanxianganddeepseek-flash committed 2026-11-08 20:44:49 +01:00
1 parent d8048979e3
commit 2e34e49186
5 files changed
+77 -27

No files matched your search

+17 -8
View File
@@ -168,6 +168,15 @@ public:
int m_nScreenCount; // 屏幕数量
BOOL m_bEnableMultiScreen;// 多显示器支持
// ===== 屏索引(GDI 与 DXGI 共用同一份)=====
// 0 = 所有显示器拼成的虚拟桌面,k>=1 = 第 k 块显示器(DXGI 下对应输出 k-1)。
// 选屏(Peek)和确认(Commit)必须分开:DXGI 初始化失败会回退 GDI,失败的尝试
// 若推进了索引,回退后第一次重建就会跳到另一块屏上(现场表现:调个质量档就换屏)。
static int& MonitorCur() { static int v = 0; return v; } // 当前正在显示的屏
static int& MonitorNext() { static int v = 0; return v; } // 下一次"切换显示器"要去的屏
static void CommitMonitorIndex(int idx) { MonitorCur() = idx; MonitorNext() = idx + 1; }
int m_nMonitorIndex = 0; // 本次构造选中的屏;后端初始化成功后由它提交
// 滚动检测相关
CScrollDetector* m_pScrollDetector; // 滚动检测器
bool m_bEnableScrollDetect; // 是否启用滚动检测
@@ -230,17 +239,16 @@ public:
m_BlockNum = 8;
m_ThreadPool = new ThreadPool(m_BlockNum);
auto monitors = GetAllMonitors();
// index = 下一次切屏要用的索引(沿用原语义:切屏时自增)
// current = 当前正在显示的索引。重建截屏对象(质量档位、分辨率、ROI、窗口捕获)
// 必须沿用它,不能用 index —— index 永远指向"下一块",比正在显示的那块
// 大 1,所以 switchScreen=false 时读 index 会跳到下一块屏幕上。
static int index = 0;
static int current = 0;
// 屏索引全进程只有一份(MonitorCur/MonitorNext),GDI 与 DXGI 共用。
// 这里只“取”不“提交”:重建截屏对象时(质量档位、分辨率、ROI、窗口捕获)
// 必须沿用当前屏(switchScreen=false),只有"切换显示器"才前进一格。
// 提交留给真正建成的后端——DXGI 构造完才知道初始化成不成功,而失败要回退
// GDI,此时索引不能已经前进过。
m_nScreenCount = monitors.size();
m_bEnableMultiScreen = all;
if (all && !monitors.empty()) {
int idx = (switchScreen ? index++ : current) % (monitors.size()+1);
current = idx;
int idx = (switchScreen ? MonitorNext() : MonitorCur()) % (int)(monitors.size()+1);
m_nMonitorIndex = idx;
if (idx == 0) {
m_iScreenX = GetSystemMetrics(SM_XVIRTUALSCREEN);
m_iScreenY = GetSystemMetrics(SM_YVIRTUALSCREEN);
@@ -254,6 +262,7 @@ public:
m_ulFullHeight = rt.bottom - rt.top;
}
} else {
m_nMonitorIndex = 0; // 单屏模式不参与屏索引
//::GetSystemMetrics(SM_CXSCREEN/SM_CYSCREEN)获取屏幕大小不准
//例如当屏幕显示比例为125%时,获取到的屏幕大小需要乘以1.25才对
DEVMODE devmode;
+31 -13
View File
@@ -97,6 +97,8 @@ public:
CreateDXGIFactory1(__uuidof(IDXGIFactory1), (void**)&pFactory);
if (!pFactory) return;
// 输出回落标记:索引在当前适配器上不存在时回到主输出重试一次
bool forceFirstOutput = false;
do {
// 3. 获取设备
static UINT idx = 0;
@@ -105,25 +107,31 @@ public:
if (!dxgiAdapter)break;
// 4. 获取 DXGI 输出(屏幕)
// screen = 下一次切屏要用的输出索引(沿用原语义:切屏时自增)
// current = 当前正在用的输出。重建截屏对象(质量/分辨率变化)必须沿用它:
// 读 screen 会跳到下一个输出,多显示器下表现为"调个质量就换屏",
// 单显示器下 EnumOutputs(1) 不存在,会让 DXGI 初始化失败降级成 GDI。
static UINT screen = 0;
static UINT current = 0;
UINT outIndex = switchScreen ? screen++ : current;
// 屏索引与 GDI 共用一份(ScreenCapture::MonitorCur):0=虚拟桌面(DXGI 抓不了,
// 落到主输出),k>=1 表示第 k 块显示器,映射到输出 k-1。重建截屏对象
// (质量/分辨率变化)沿用当前屏,只有"切换显示器"才前进一格。
// 这里只取不提交:失败会回退 GDI,提交在初始化成功之后(见 break 前)。
UINT outIndex = 0;
if (all && !forceFirstOutput) {
const int n = m_nScreenCount + 1;
const int sel = (switchScreen ? MonitorNext() : MonitorCur()) % n;
outIndex = sel >= 1 ? (UINT)(sel - 1) : 0u;
}
HRESULT r = dxgiAdapter->EnumOutputs(outIndex, &dxgiOutput);
if (r == DXGI_ERROR_NOT_FOUND && all) {
// 索引在当前适配器上不存在(拔掉外接屏等):回到主输出再试,
// 避免拿一个无效索引去遍历适配器,最后降级成 GDI。
screen = 0;
current = 0;
if (r == DXGI_ERROR_NOT_FOUND && all && !forceFirstOutput) {
// 索引在当前适配器上不存在(拔掉外接屏、显示器挂在另一块显卡上等):
// 回到主输出再试一次,避免拿一个无效索引去遍历适配器,最后降级成 GDI。
// 只回落一次:若连主输出都枚举不到(无显示器的会话),必须落到下面
// 的 break 去回退 GDI,否则会在「切适配器 → 再枚举 → 又 NOT_FOUND」
// 之间空转,把抓屏线程挂死。
Mprintf("[DXGI] output %u not found on adapter %u, retry with primary output\n",
outIndex, (unsigned)idx);
forceFirstOutput = true;
idx ++;
dxgiAdapter->Release();
dxgiAdapter = nullptr;
continue;
}
current = outIndex;
if (!dxgiOutput)break;
// 4.1 获取屏幕位置(多显示器支持)
@@ -209,6 +217,13 @@ public:
desc.Usage = D3D11_USAGE_STAGING;
desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
d3dDevice->CreateTexture2D(&desc, NULL, &cpuTexture);
// IsInitSucceed() 判的就是 cpuTexture;建不出来就别再往下分配十几 MB
// 缓冲、也别提交屏索引——直接 break,由 InitScreenSpy 回退 GDI,
// GDI 会从同一份“未提交”的索引重建,两条路径仍然落在同一块屏上。
if (!cpuTexture) {
Mprintf("[DXGI] CreateTexture2D failed, fall back to GDI\n");
break;
}
// 9. 初始化 BITMAPINFO
m_BitmapInfor_Full = ConstructBitmapInfo(32, m_ulFullWidth, m_ulFullHeight);
@@ -257,6 +272,9 @@ public:
m_BitmapInfor_Send->bmiHeader.biHeight = h;
m_BitmapInfor_Send->bmiHeader.biSizeImage = w * h * 4;
}
// 初始化到这里才算成功,此时才能提交屏索引:中途失败(DuplicateOutput 等)
// 会回退 GDI,如果把失败尝试的索引提交了,回退后第一次重建就会换屏。
if (all && m_nScreenCount > 0) CommitMonitorIndex((int)outIndex + 1);
Mprintf("[DXGI] out=%u mode=%ux%u surf=%ux%u fmt=%d rot=%d -> send=%dx%d\n",
outIndex, duplDesc.ModeDesc.Width, duplDesc.ModeDesc.Height,
m_surfW, m_surfH, (int)realFmt, (int)m_rotation,
+18 -4
View File
@@ -216,7 +216,10 @@ bool CScreenManager::RestartScreen(BOOL switchScreen)
// 3. 重新启动工作线程(InitScreenSpy 会创建新对象)
m_bIsWorking = TRUE;
m_SendFirst = FALSE;
m_SwitchScreen = switchScreen;
// 只有请求切换时才置位,普通重建(质量档/分辨率/ROI/换窗口)不清除:
// 切屏请求要挂起到某次重建真正提交了屏索引为止。否则「切屏后紧跟一个质量档
// 调整」会把请求覆盖成 false,截屏对象建好前被顶掉,切换就静默丢了。
if (switchScreen) m_SwitchScreen = TRUE;
m_hWorkThread = __CreateThread(NULL, 0, WorkThreadProc, this, 0, NULL);
return true;
}
@@ -506,7 +509,12 @@ void CScreenManager::InitScreenSpy()
BYTE* user = (BYTE*)m_ptrUser;
BOOL all = FALSE;
RECT rect = m_ROI;
// 「切换显示器」是一次性请求:取用即清除。之后的自适应重启(质量档、分辨率、
// ROI、换窗口)一律 switchScreen=false,沿用当前屏。不清除的话,工作线程里
// 因窗口尺寸变化触发的原地重建(WorkThreadProc 直接调本函数,不经过
// RestartScreen)会把旧请求再消费一次,每重建一次就换一块屏。
BOOL switchScreen = m_SwitchScreen;
m_SwitchScreen = FALSE;
if (!(user == NULL || ((int)user) == 1)) {
UserParam* param = (UserParam*)user;
if (param && param->length>0) {
@@ -543,7 +551,10 @@ void CScreenManager::InitScreenSpy()
}
// 保存屏幕类型,服务端用于判断是否显示虚拟桌面相关菜单
m_ScreenSettings.ScreenType = DXGI;
Mprintf("CScreenManager: Type %d Algorithm: %d (QualityLevel=%d)\n", DXGI, int(algo), level);
// switch 是本次重建是否要换屏,all 是客户端是否支持多显示器;屏索引变化会打印
// 在各后端自己的日志里(CScreenSpy 的 monitor= / DXGI 的 out=)。
Mprintf("CScreenManager: Type %d Algorithm: %d (QualityLevel=%d) switch=%d all=%d\n",
DXGI, int(algo), level, (int)switchScreen, (int)all);
if (DXGI == USING_VIRTUAL) {
m_virtual = TRUE;
HDESK hDesk = SelectDesktop((char*)m_DesktopID.c_str());
@@ -1138,10 +1149,13 @@ VOID CScreenManager::OnReceive(PBYTE szBuffer, ULONG ulLength)
m_ScreenSettings.MaxFPS = profile.maxFPS;
bool needRestart = false;
if (m_ScreenSpyObject) {
// 如果当前是 H264 且码率变化,需要重启以重新创建编码器
// 码率变化要重建编码器,但只在「目标档位仍是 H264」时才有意义:
// 换到 RGB565/DIFF 的档位根本不用码率(profile.bitRate=0),
// 为一次 3000→0 重启截屏纯属白丢一个 IDR(还连带重建抓屏对象)。
bool isH264 = (m_ScreenSpyObject->GetAlgorithm() == ALGORITHM_H264);
bool staysH264 = (profile.algorithm == ALGORITHM_H264);
bool bitRateChanged = m_ScreenSpyObject->SetBitRate(profile.bitRate);
if (isH264 && bitRateChanged) {
if (isH264 && staysH264 && bitRateChanged) {
needRestart = true;
}
m_ScreenSpyObject->SetAlgorithm(profile.algorithm);
+2
View File
@@ -71,6 +71,8 @@ public:
RECT m_ROI = {0};
HWND m_hTargetWnd = NULL; // 窗口捕获目标(NULL=全屏)
bool m_bDynamicForeground = false; // true=每帧自动跟踪前景窗口(HWND sentinel=-1触发)
// 挂起的「切换显示器」请求:InitScreenSpy 取用一次即清除,只有 SwitchScreen()
// 会把它重新置位。为 TRUE 时下一次建截屏对象前进一格屏索引,否则沿用当前屏。
BOOL m_SwitchScreen = TRUE;
BOOL SendClientClipboard(BOOL fast);
VOID UpdateClientClipboard(char *szBuffer, ULONG ulLength);
+9 -2
View File
@@ -20,6 +20,13 @@ CScreenSpy::CScreenSpy(ULONG ulbiBitCount, BYTE algo, BOOL vDesk, int gop, BOOL
m_bDynamicForeground = dynamicFg;
m_GOP = gop;
// GDI 构造本身没有失败路径,到这里就确认当前屏。DXGI 初始化失败回退到 GDI 时
// 也走这里:两条路径必须落到同一块屏上,否则下一次重建会换屏。
// 窗口捕获(含动态前景)不参与屏索引:下面的窗口矩形会覆盖基类的显示器几何,
// 此时若提交,一次窗口重建就会把索引往前推一格,取消窗口捕获后画面就换屏了。
if (!hwnd && !m_bDynamicForeground && m_bEnableMultiScreen && m_nScreenCount > 0)
CommitMonitorIndex(m_nMonitorIndex);
// 窗口捕获模式:用 DWM 真实边界覆盖基类的全屏尺寸,并缓存阴影偏移量
if (hwnd) {
RECT wndRc = {}, frameRc = {};
@@ -49,8 +56,8 @@ CScreenSpy::CScreenSpy(ULONG ulbiBitCount, BYTE algo, BOOL vDesk, int gop, BOOL
m_BitmapInfor_Send = new BITMAPINFO(*m_BitmapInfor_Full);
m_nInstructionSet = cfg.GetInt("settings", "CpuSpeedup", 0);
Mprintf("CScreenSpy: strategy=%d, maxWidth=%d, fullWidth=%d, algo=%d\n",
strategy, maxWidth, m_BitmapInfor_Send->bmiHeader.biWidth, m_bAlgorithm);
Mprintf("CScreenSpy: strategy=%d, maxWidth=%d, fullWidth=%d, algo=%d, monitor=%d\n",
strategy, maxWidth, m_BitmapInfor_Send->bmiHeader.biWidth, m_bAlgorithm, m_nMonitorIndex);
if (strategy == 1) {
// strategy=1: 用户明确选择原始分辨率