From a190c212177dfc2853698218dc63240994c6cd1f Mon Sep 17 00:00:00 2001 From: yuanyuanxiang <962914132@qq.com> Date: Sat, 7 Nov 2026 14:11:47 +0100 Subject: [PATCH] Feature: make remote desktop tuning per client The tuning switches lived in the master's Advanced menu and were saved globally, so two hosts could not use different settings. The client already sends ScreenSettings when a remote desktop starts, so the state belongs there: the four items now sit in the remote desktop window's system menu, directly below Screen quality, and are saved per client. ScreenSettings had a 40-byte Reserved area at offset 56; four bytes became TuningFlags, keeping the struct at 100 bytes with Capabilities at 96. A new Capabilities bit marks a value written by a versioned master; old clients, and new clients never configured, report 0 and are not trusted. CMD_SCREEN_TUNING now ends with a version byte. A five-byte command comes from an older master that does not know the server-only adaptive bit: the client applies those three bits to the session but does not save them. A fresh client starts at 0, so an old master still gets pre-feature behaviour; the new master's 0xE default is persisted on its first session. The per-client master copy stays as the old-client fallback, and the old global [settings] Tuning* keys are honoured when neither exists, so an explicit opt-out survives the migration. Verified on the Debug server with the in-process test client: a fresh client stored 0xE on first use; toggling VBV wrote 0xF to both sides; after deleting the master copy and reopening, the menu restored VBV from the client report. Co-Authored-By: deepseek-flash --- client/EncoderFactory.cpp | 2 +- client/ScreenManager.cpp | 43 ++++++++-- client/ScreenManager.h | 7 +- client/ScreenSpy.cpp | 2 +- client/X264Encoder.cpp | 2 +- common/commands.h | 43 ++++++++-- server/2015Remote/2015Remote.rc | Bin 181558 -> 180786 bytes server/2015Remote/2015RemoteDlg.cpp | 95 --------------------- server/2015Remote/2015RemoteDlg.h | 22 ----- server/2015Remote/ScreenSpyDlg.cpp | 124 ++++++++++++++++++++++++++-- server/2015Remote/ScreenSpyDlg.h | 26 +++++- server/2015Remote/resource.h | 6 -- 12 files changed, 216 insertions(+), 156 deletions(-) diff --git a/client/EncoderFactory.cpp b/client/EncoderFactory.cpp index 9f34a75..75dd415 100644 --- a/client/EncoderFactory.cpp +++ b/client/EncoderFactory.cpp @@ -60,7 +60,7 @@ std::unique_ptr CreateEncoder(const EncoderRequest& req) { auto enc = std::make_unique(); p.rc = RateControl::CRF; p.crf = BitRateToCRF(req.bitrate_kbps); - // capped CRF:由主控端「高级 → 远程桌面调优」控制,默认关、仅限洲际弱网勾选 + // capped CRF:由远程桌面对话框「远程桌面调优」控制,默认关、仅限洲际弱网勾选 p.vbv_cap = req.vbv_cap; if (enc->open(p)) { Mprintf("=> encoder: %s (SW, crf=%d%s)\n", enc->backendName(), p.crf, diff --git a/client/ScreenManager.cpp b/client/ScreenManager.cpp index 2d6de20..87a6be9 100644 --- a/client/ScreenManager.cpp +++ b/client/ScreenManager.cpp @@ -166,6 +166,17 @@ CScreenManager::CScreenManager(IOCPClient* ClientObject, int n, void* user, BOOL m_ScreenSettings.CpuSpeedup = cfg.GetInt("settings", "CpuSpeedup", 0); m_ScreenSettings.AudioEnabled = cfg.GetInt("settings", "AudioEnabled", 0); // 默认禁用音频 m_ScreenSettings.EncodeLevel = cfg.GetInt("settings", "EncodeLevel", LEVEL_H264_SOFT); + // 远程桌面调优:只有本机存过才上报(Capabilities 位=「四位都由新主控端写入」)。 + // 没存过就保持 0 并让能力位为 0——客户端按加开关前的行为运行,主控端看到能力位 + // 为空则用它自己的默认值/Persistent 副本,下发后才落盘。这样被老主控端打开时 + // 不会被新默认值悄悄改掉行为。 + m_nTuningFlags = 0; + std::string tuning = cfg.GetStr("settings", "TuningFlags"); + if (!tuning.empty()) { + m_nTuningFlags = atoi(tuning.c_str()); + m_ScreenSettings.TuningFlags = m_nTuningFlags; + m_ScreenSettings.Capabilities |= SCREEN_CAP_TUNING_FLAGS; + } LoadQualityProfiles(); // 加载质量配置 @@ -741,9 +752,9 @@ DWORD WINAPI CScreenManager::WorkThreadProc(LPVOID lParam) s0 = max(s0, 1000./This->m_ScreenSettings.MaxFPS); // 最快每秒20帧 s0 = min(s0, 1000); // 帧率下限:网络慢时节流会把帧间隔放大到 4 倍(fps=8 → 500ms → ≈2fps), - // 操作反馈变得很钝。主控端「高级 → 远程桌面调优 → 发送节流帧率下限」默认开, + // 操作反馈变得很钝。主控端「远程桌面调优 → 发送节流帧率下限」默认开, // 上限收到 2 倍(≈4fps)。代价是链路已饱和时排队更明显,弱网下若觉得画面 - // 更连贯但更滞后,应在高级菜单里关掉这一项。 + // 更连贯但更滞后,应在远程桌面对话框的「远程桌面调优」里关掉这一项。 // 下限不能越过用户配置的 MaxFPS(MaxFPS 很低时间隔本来就更长),取两者较大值。 if (This->m_nTuningFlags & TUNING_PACE_FPS_FLOOR) { const float floorS0 = max(sleep * 2.f, 1000.f / This->m_ScreenSettings.MaxFPS); @@ -1147,17 +1158,31 @@ VOID CScreenManager::OnReceive(PBYTE szBuffer, ULONG ulLength) break; } case CMD_SCREEN_TUNING: { - // 远程桌面调优开关:[cmd:1][flags:4 LE]。主控端「高级 → 远程桌面调优」三项, - // 默认下发 0x3(GDI 去延时+发送节流;x264 码率封顶默认关,仅限洲际弱网); - // 取消勾选时对应位清零,等于回到加开关前的行为。 - // 老客户端不认识这条命令,switch 无 default 直接忽略。 + // 远程桌面调优开关:[cmd:1][flags:4 LE][version:1](老主控端只发前 5 字节)。 + // 带版本字节说明主控端认识全部四位(含纯服务端的 bit3),此时四位都落盘并 + // 回报;不带版本字节的是老主控端,只让低三位本次即时生效,不落盘——否则 + // 它不知道的 bit3 会被覆盖成 0,新主控端下次打开就看不到自适应设置了。 if (ulLength < 1 + sizeof(int)) break; int flags = 0; memcpy(&flags, szBuffer + 1, sizeof(int)); - Mprintf("[CScreenManager] TuningFlags: 0x%08X\n", flags); - m_nTuningFlags = flags; + const bool versioned = ulLength >= 1 + sizeof(int) + 1; + if (versioned) { + if (flags != m_nTuningFlags || + !(m_ScreenSettings.Capabilities & SCREEN_CAP_TUNING_FLAGS)) { + Mprintf("[CScreenManager] TuningFlags: 0x%08X\n", flags); + m_nTuningFlags = flags; + m_ScreenSettings.TuningFlags = flags; + m_ScreenSettings.Capabilities |= SCREEN_CAP_TUNING_FLAGS; + iniFile cfg(CLIENT_PATH); + cfg.SetInt("settings", "TuningFlags", flags); + } + } else { + Mprintf("[CScreenManager] TuningFlags(legacy): 0x%08X\n", flags); + m_nTuningFlags = (m_nTuningFlags & ~(TUNING_X264_VBV | TUNING_GDI_NO_SLEEP | TUNING_PACE_FPS_FLOOR)) + | (flags & (TUNING_X264_VBV | TUNING_GDI_NO_SLEEP | TUNING_PACE_FPS_FLOOR)); + } if (m_ScreenSpyObject) { - m_ScreenSpyObject->SetTuningFlags(flags); + m_ScreenSpyObject->SetTuningFlags(m_nTuningFlags); } break; } diff --git a/client/ScreenManager.h b/client/ScreenManager.h index afca313..e89bee9 100644 --- a/client/ScreenManager.h +++ b/client/ScreenManager.h @@ -42,9 +42,10 @@ public: HANDLE m_hWorkThread; ScreenSettings m_ScreenSettings = { 20 }; QualityProfile m_QualityProfiles[QUALITY_COUNT]; // 本地质量配置(可被服务端覆盖) - // 远程桌面调优开关位(CMD_SCREEN_TUNING 下发),本地初值 0,主控端默认下发 0x3 - //(GDI 去延时+发送节流;x264 码率封顶默认关,仅限洲际弱网时勾选)。 - // 保存在这里而不是 ScreenSettings 里,避免改动服务端↔客户端的固定结构体布局。 + // 远程桌面调优开关位(CMD_SCREEN_TUNING 下发)。客户端把它存进本机配置, + // 并写进 ScreenSettings.TuningFlags 随位图信息上报,主控端下次打开远程桌面 + // 时据此恢复勾选状态。没有本机记录时按 0 运行(加开关前的行为),等新主控端 + // 下发后再保存;不能默认 TUNING_DEFAULT,否则被老主控端打开也会悄悄开启调优。 int m_nTuningFlags = 0; virtual void InitScreenSpy(); diff --git a/client/ScreenSpy.cpp b/client/ScreenSpy.cpp index 58589c3..18a8c35 100644 --- a/client/ScreenSpy.cpp +++ b/client/ScreenSpy.cpp @@ -196,7 +196,7 @@ VOID CScreenSpy::ScanScreen(HDC hdcDest, HDC hdcSour, ULONG ulWidth, ULONG ulHei const ULONG ulJumpSleep = ulJumpLine / 10; // 段间 Sleep 的用途是让出 CPU(避免长时间占满一个核)。代价很大:1080p 要切 22 段, // 每帧强制 110ms,而 20fps 的每帧预算只有 50ms —— 抓屏本身就超时,帧率被拖死。 - // 主控端「高级 → 远程桌面调优 → GDI 抓屏去分段延时」勾选后不再 Sleep; + // 主控端「远程桌面调优 → GDI 抓屏去分段延时」勾选后不再 Sleep; // 仍按行分段,避开超大尺寸单次 BitBlt 的驱动限制。 const bool bNoSleep = (GetTuningFlags() & TUNING_GDI_NO_SLEEP) != 0; for (int i = 0, ulToJump = 0; i < (int)ulHeight; i += ulToJump) { diff --git a/client/X264Encoder.cpp b/client/X264Encoder.cpp index ba72889..e0def21 100644 --- a/client/X264Encoder.cpp +++ b/client/X264Encoder.cpp @@ -70,7 +70,7 @@ bool CX264Encoder::open(int width, int height, int fps, int crf, int vbv_kbps) // capped CRF:CRF 保证画质,VBV 保证峰值不失控。纯 CRF 下复杂帧(视频、切大窗口) // 单帧能冲到目标码率好几倍,跨洲际 2Mbps 链路上一个 500KB 的帧要传 2 秒, // 后续帧全排队 → 用户看到的是"卡住几秒然后画面猛跳"。默认不开(vbv_kbps=0), - // 由主控端「高级 → 远程桌面调优」勾选后下发 TUNING_X264_VBV 打开。 + // 由主控端「远程桌面调优」勾选后下发 TUNING_X264_VBV 打开。 if (vbv_kbps > 0) { param.rc.i_vbv_max_bitrate = vbv_kbps; // 峰值 = 目标码率 param.rc.i_vbv_buffer_size = vbv_kbps / 2; // 0.5 秒缓冲:够压住尖峰,又不至于抖动 diff --git a/common/commands.h b/common/commands.h index 3d3abdd..eef7bab 100644 --- a/common/commands.h +++ b/common/commands.h @@ -352,8 +352,10 @@ enum { // 客户端把入口写进本机配置后断开,重连循环按新入口重连;新入口连不上会自动回退。 COMMAND_SET_PROTO = 177, // [ProtoSwitchPacket][certLen 字节 PEM 正文] - // 远程桌面调优开关:主控端「高级 → 远程桌面调优」的勾选项,打开远程桌面时下发一次。 - // [cmd:1][flags:4 LE],位定义见下方 TUNING_*。全 0 = 与加开关前行为完全一致。 + // 远程桌面调优开关:远程桌面对话框「远程桌面调优」的勾选项,打开远程桌面时下发一次。 + // [cmd:1][flags:4 LE][version:1],位定义见下方 TUNING_*。老主控端负载只有前 5 字节; + // 版本字节让新客户端区分老主控端(不认识 bit3)与新主控端(bit3 明确为 0/1)。 + // 全 0 = 与加开关前行为完全一致。 // 老客户端 OnReceive 的 switch 无 default 分支,收到不认识的命令直接忽略,故可安全下发。 CMD_SCREEN_TUNING = 178, @@ -1370,15 +1372,30 @@ struct QualityProfile { int bitRate; // kbps - H264 }; -// ===== 远程桌面调优开关(CMD_SCREEN_TUNING 的位定义)===== -// 主控端「高级 → 远程桌面调优」里逐项勾选。GDI 去延时与发送节流默认勾选, -// x264 码率封顶默认不勾选(仅限洲际弱网);取消勾选即把对应位清零, -// 回到加开关前的行为。每一位都能独立开关,某项出问题可以只关那一项,不必全关。 -// 默认值改在 CMy2015RemoteDlg::OnInitDialog 的 GetInt 第三参数上,注意存量机器只要 -// 已经写过该键,改默认值就不会覆盖它们(保持用户上次的显式选择)。 +// ===== 远程桌面调优开关(CMD_SCREEN_TUNING 与 ScreenSettings.TuningFlags 的位定义)===== +// 远程桌面对话框「远程桌面调优」子菜单里逐项勾选,按客户端分别保存: +// 主控端把勾选结果随 CMD_SCREEN_TUNING 下发,客户端存进本机配置并回填到 +// ScreenSettings.TuningFlags,下次建立远程桌面时随位图信息一起上报,主控端据此 +// 恢复勾选状态。GDI 去延时、发送节流、自适应判据默认勾选,x264 码率封顶默认不勾选。 +// 取消勾选即把对应位清零,回到加开关前的行为;每一位都能独立开关。 +// +// 命令负载是 [cmd:1][flags:4 LE][version:1]。版本字节只有新主控端会发:客户端据此 +// 区分「新主控端明确关掉了 bit3」和「老主控端根本不知道 bit3」,后一种情况只让低 +// 三位即时生效、不落盘,避免把客户端保存的四位值覆盖成老主控端的认知。 #define TUNING_X264_VBV 0x00000001 // x264 软编加 VBV 码率封顶(跨洲际防单帧打爆链路) #define TUNING_GDI_NO_SLEEP 0x00000002 // GDI 抓屏去掉分段 BitBlt 之间的 5ms 延时(1080p 省 110ms/帧) #define TUNING_PACE_FPS_FLOOR 0x00000004 // 发送节流帧率下限:慢链路下不再把帧率压到 2fps +// 纯服务端判据(自适应质量是否叠加吞吐判断)。客户端不解释这一位,只原样保存并回报, +// 这样四个开关能共用同一个持久化/上报字段。 +#define TUNING_ADAPTIVE_DUAL 0x00000008 + +// 新主控端为还没有本机记录的客户端准备的默认值,与旧版全局设置的默认一致。 +// 注意客户端自己并不默认使用这个值:没有本机记录时客户端按 0 运行(加开关前的 +// 行为),等新主控端下发后才会保存;这样被老主控端打开时不会被悄悄打开调优项。 +#define TUNING_DEFAULT (TUNING_GDI_NO_SLEEP | TUNING_PACE_FPS_FLOOR | TUNING_ADAPTIVE_DUAL) + +// CMD_SCREEN_TUNING 末尾版本字节的当前值。老主控端的负载只有 [cmd][flags] 5 字节。 +#define SCREEN_TUNING_CMD_VERSION 1 // 其中会影响编码器参数、必须在变更时重建编码器的位。其余位由抓屏/发送线程每次现读, // 改了立刻生效,不需要重建(重建会丢一个 IDR,画面上能看出闪一下)。 @@ -1547,10 +1564,18 @@ typedef struct ScreenSettings { int AudioEnabled; // 偏移 44, 音频传输(0: 禁用, 1: 启用) int EncodeLevel; // 偏移 48, 编码等级 int CustomCursor; // 偏移 52, 自定义光标 - char Reserved[40]; // 偏移 56, 保留字段(新能力参数从此处扩展) + int TuningFlags; // 偏移 56, 远程桌面调优开关位(TUNING_*),客户端持久化并上报 + char Reserved[36]; // 偏移 60, 保留字段(新能力参数从此处扩展) uint32_t Capabilities; // 偏移 96, 能力位标志(放最后) } ScreenSettings; // 总大小 100 字节 +// ScreenSettings.Capabilities 位定义:客户端上报的能力。 +// 没有这一位的是老客户端,或者还没被新主控端下发过调优开关的客户端;两种情况 +// TuningFlags 都不可信(可能是 0,也可能残留老主控端给的低三位)。 +#define SCREEN_CAP_TUNING_FLAGS 0x00000001 // TuningFlags 四位均由新主控端写入,可信 + +static_assert(sizeof(ScreenSettings) == 100, "ScreenSettings 是固定的 100 字节线上结构,不能变大变小"); + // 音频控制常量 #define CYCLEAUDIO_DISABLE 0 // 停止音频 #define CYCLEAUDIO_ENABLE 1 // 启动音频 diff --git a/server/2015Remote/2015Remote.rc b/server/2015Remote/2015Remote.rc index faca26e185fd0d99a4ca465f26678dcf6b560623..3c033989739c52d1d8ce871d4a4b05336851e717 100644 GIT binary patch delta 27 jcmdni#l5M8o9X|*h8D&xOd;~q4Q?@tY|m3-Iopma7<8sD zlxGr`4Pgjn@MG`-55xK<6EJ!zd$gF_>{eQ@bjN(*wUV%1*ag$|yAbogkCL^nmk>BHOd%nNBPM0C<{9 diff --git a/server/2015Remote/2015RemoteDlg.cpp b/server/2015Remote/2015RemoteDlg.cpp index fc7c050..e85e60f 100644 --- a/server/2015Remote/2015RemoteDlg.cpp +++ b/server/2015Remote/2015RemoteDlg.cpp @@ -1176,10 +1176,6 @@ BEGIN_MESSAGE_MAP(CMy2015RemoteDlg, CDialogEx) ON_COMMAND(ID_TOOL_EMBED_TLS_ANCHOR, &CMy2015RemoteDlg::OnToolEmbedTlsAnchor) ON_COMMAND(ID_TOOL_RUN_TEST, &CMy2015RemoteDlg::OnToolRunTest) ON_MESSAGE(WM_LOCAL_TEST_FINISHED, &CMy2015RemoteDlg::OnLocalTestFinished) - ON_COMMAND(ID_TOOL_TUNING_X264_VBV, &CMy2015RemoteDlg::OnToolTuningX264Vbv) - ON_COMMAND(ID_TOOL_TUNING_GDI_SLEEP, &CMy2015RemoteDlg::OnToolTuningGdiSleep) - ON_COMMAND(ID_TOOL_TUNING_PACE_FPS_FLOOR, &CMy2015RemoteDlg::OnToolTuningPaceFpsFloor) - ON_COMMAND(ID_TOOL_TUNING_ADAPTIVE_LOAD, &CMy2015RemoteDlg::OnToolTuningAdaptiveLoad) ON_COMMAND(ID_EXECUTE_TESTRUN, &CMy2015RemoteDlg::OnExecuteTestrun) ON_COMMAND(ID_EXECUTE_GHOST, &CMy2015RemoteDlg::OnExecuteGhost) ON_COMMAND(ID_MASTER_TRAIL, &CMy2015RemoteDlg::OnMasterTrail) @@ -2834,22 +2830,10 @@ BOOL CMy2015RemoteDlg::OnInitDialog() m_runNormal = THIS_CFG.GetInt("settings", "RunNormal", 0); // 高级菜单:DLL内嵌TLS证书(勾选状态来自 [settings] EmbedTlsInDll,见上面的加载) - // 以及「远程桌面调优」子菜单。GDI 去延时、发送节流帧率下限默认开; - // x264 码率封顶默认关 —— 它靠压 QP 兑现码率上限,画面变化多时会明显发糊, - // 只适合洲际/弱网链路(防止单帧打爆链路导致"卡几秒再猛跳")。 - // 第三参数是默认值:只对从没写过该键的机器生效,已写过值的存量机器保持原样。 - m_bTuningX264Vbv = THIS_CFG.GetInt("settings", "TuningX264Vbv", 0) != 0; - m_bTuningGdiNoSleep = THIS_CFG.GetInt("settings", "TuningGdiNoSleep", 1) != 0; - m_bTuningPaceFpsFloor = THIS_CFG.GetInt("settings", "TuningPaceFpsFloor", 1) != 0; - // 自适应加吞吐判据:纯服务端,默认开。判据分不清"链路慢"和"本机慢", - // 所以配套了三条防振荡措施(RTT 迟滞、升档失败封顶、探测样本门槛), - // 见 CScreenSpyDlg::EvaluateQuality。取消勾选即完全回到只看 RTT 的行为。 - m_bAdaptiveDualCriteria = THIS_CFG.GetInt("settings", "AdaptiveDualCriteria", 1) != 0; if (CMenu* advMenu = m_MainMenu.GetSubMenu(5)) { advMenu->CheckMenuItem(ID_TOOL_EMBED_TLS_ANCHOR, m_bEmbedTlsInDll ? MF_CHECKED : MF_UNCHECKED); } - SyncTuningMenuChecks(); CMenu* SubMenu = m_MainMenu.GetSubMenu(2); if (SubMenu) { @@ -10927,85 +10911,6 @@ void CMy2015RemoteDlg::SetLocalTestMenuEnabled(BOOL enable) ::DrawMenuBar(GetSafeHwnd()); } -// 把「高级 → 远程桌面调优」里各项的勾选状态同步到菜单。 -// 这些项挂在子菜单里,在顶级菜单上 CheckMenuItem 找不到,必须先定位子菜单。 -void CMy2015RemoteDlg::SyncTuningMenuChecks() -{ - CMenu* advMenu = m_MainMenu.GetSubMenu(5); - if (advMenu == nullptr) return; - CMenu* tuningMenu = FindSubMenuByCommand(advMenu, ID_TOOL_TUNING_X264_VBV); - if (tuningMenu == nullptr) return; - tuningMenu->CheckMenuItem(ID_TOOL_TUNING_X264_VBV, - m_bTuningX264Vbv ? MF_CHECKED : MF_UNCHECKED); - tuningMenu->CheckMenuItem(ID_TOOL_TUNING_GDI_SLEEP, - m_bTuningGdiNoSleep ? MF_CHECKED : MF_UNCHECKED); - tuningMenu->CheckMenuItem(ID_TOOL_TUNING_PACE_FPS_FLOOR, - m_bTuningPaceFpsFloor ? MF_CHECKED : MF_UNCHECKED); - tuningMenu->CheckMenuItem(ID_TOOL_TUNING_ADAPTIVE_LOAD, - m_bAdaptiveDualCriteria ? MF_CHECKED : MF_UNCHECKED); -} - -// 高级→远程桌面调优→x264 码率封顶(VBV):默认关,勾选即开启,仅限洲际/弱网链路。 -// 开启后动场(视频、滚动、拖窗)会被 VBV 上限压 QP 而发糊,换来的是单帧不炸链路。 -// 只影响此后打开的远程桌面窗口(打开时经 CMD_SCREEN_TUNING 下发),已打开的窗口不变, -// 因为改编码器参数要重建编码器,会在画面上留下一次可感知的断流。 -void CMy2015RemoteDlg::OnToolTuningX264Vbv() -{ - m_bTuningX264Vbv = !m_bTuningX264Vbv; - THIS_CFG.SetInt("settings", "TuningX264Vbv", m_bTuningX264Vbv ? 1 : 0); - SyncTuningMenuChecks(); - Mprintf("[Tuning] TuningX264Vbv = %d(对之后打开的远程桌面生效)\n", - m_bTuningX264Vbv ? 1 : 0); -} - -// 高级→远程桌面调优→GDI 抓屏去分段延时:默认开,取消勾选即关闭。 -// 客户端 GDI 抓屏按 50 行一段 BitBlt,段间 Sleep(5ms) 让出 CPU;1080p 要切 22 段, -// 等于每帧强制 110ms,而 20fps 的预算只有 50ms —— 抓屏本身就把帧率拖死了。 -// 勾选后不再 Sleep,仍按行分段(避开大尺寸单次 BitBlt 的驱动限制)。 -void CMy2015RemoteDlg::OnToolTuningGdiSleep() -{ - m_bTuningGdiNoSleep = !m_bTuningGdiNoSleep; - THIS_CFG.SetInt("settings", "TuningGdiNoSleep", m_bTuningGdiNoSleep ? 1 : 0); - SyncTuningMenuChecks(); - Mprintf("[Tuning] TuningGdiNoSleep = %d(对之后打开的远程桌面生效)\n", - m_bTuningGdiNoSleep ? 1 : 0); -} - -// 高级→远程桌面调优→发送节流帧率下限:默认开,取消勾选即关闭。 -// 客户端发送节流在网络慢时把帧间隔放大到 4 倍(≈2fps),操作反馈变得很钝。 -// 勾选后上限收到 2 倍(≈4fps)。代价是链路已饱和时排队更明显——三项里这一项 -// 最可能在弱网下变成负优化,怀疑画面"更连贯但更滞后"时优先关掉它。 -void CMy2015RemoteDlg::OnToolTuningPaceFpsFloor() -{ - m_bTuningPaceFpsFloor = !m_bTuningPaceFpsFloor; - THIS_CFG.SetInt("settings", "TuningPaceFpsFloor", m_bTuningPaceFpsFloor ? 1 : 0); - SyncTuningMenuChecks(); - Mprintf("[Tuning] TuningPaceFpsFloor = %d(对之后打开的远程桌面生效)\n", - m_bTuningPaceFpsFloor ? 1 : 0); -} - -// 高级→远程桌面调优→自适应加吞吐判据:默认关,取消/勾选立即对当前会话生效。 -// 与前四项不同,这一项是纯服务端的:只改 CScreenSpyDlg::EvaluateQuality 的判据, -// 不下发任何命令给客户端,所以不需要 CMD_SCREEN_TUNING 位,也不必重开远程桌面窗口。 -void CMy2015RemoteDlg::OnToolTuningAdaptiveLoad() -{ - m_bAdaptiveDualCriteria = !m_bAdaptiveDualCriteria; - THIS_CFG.SetInt("settings", "AdaptiveDualCriteria", m_bAdaptiveDualCriteria ? 1 : 0); - SyncTuningMenuChecks(); - Mprintf("[Tuning] AdaptiveDualCriteria = %d(自适应质量的吞吐判据)\n", - m_bAdaptiveDualCriteria ? 1 : 0); -} - -// 当前调优开关位,供 CScreenSpyDlg 打开远程桌面时下发 CMD_SCREEN_TUNING。 -int CMy2015RemoteDlg::GetScreenTuningFlags() const -{ - int flags = 0; - if (m_bTuningX264Vbv) flags |= TUNING_X264_VBV; - if (m_bTuningGdiNoSleep) flags |= TUNING_GDI_NO_SLEEP; - if (m_bTuningPaceFpsFloor) flags |= TUNING_PACE_FPS_FLOOR; - return flags; -} - // 按当前开关与证书重建六份内核载荷(ServerDll/ShellCode/TinyRun × x86/x64)。 // 换证书、切开关后都要走一遍:已加载的旧 Buffer 里是旧锚,继续下发会让新客户端钉住旧证书, // 证书轮换后它们就再也连不上(客户端是 fail-closed)。重建后 md5 变化,客户端下次请求时会重下。 diff --git a/server/2015Remote/2015RemoteDlg.h b/server/2015Remote/2015RemoteDlg.h index 52eaba2..b17ce70 100644 --- a/server/2015Remote/2015RemoteDlg.h +++ b/server/2015Remote/2015RemoteDlg.h @@ -280,28 +280,6 @@ public: void ReloadKernelPayloads(); // 高级→DLL内嵌TLS证书 afx_msg void OnToolEmbedTlsAnchor(); - // 高级→远程桌面调优:四项默认全开,取消勾选即回到加开关前的行为。 - // 前三项勾选后经 CMD_SCREEN_TUNING 下发客户端,某项出问题可以只关那一项。 - // 持久化在 [settings] Tuning*;注意默认值只对没写过该键的机器生效。 - bool m_bTuningX264Vbv = false; // TUNING_X264_VBV x264 软编加 VBV 码率封顶(默认关,仅限洲际弱网) - bool m_bTuningGdiNoSleep = true; // TUNING_GDI_NO_SLEEP GDI 抓屏去分段延时 - bool m_bTuningPaceFpsFloor = true; // TUNING_PACE_FPS_FLOOR 发送节流帧率下限 - // 高级→远程桌面调优→自适应加吞吐判据:这一项是纯服务端的,不下发客户端。 - // 自适应原本只看 RTT,"短 RTT + 窄链路"会被判成网络很好(RTT 20~40ms 时甚至会选到 - // DIFF/RGB565 那两个零码率控制的档位);勾选后增加"链路是否已饱和"作为第二判据, - // 与 RTT 判据取更保守者。持久化在 [settings] AdaptiveDualCriteria,默认开。 - // 防振荡(RTT 迟滞 / 升档失败封顶 / 探测样本门槛)都门控在开关内,见 EvaluateQuality。 - bool m_bAdaptiveDualCriteria = true; - afx_msg void OnToolTuningX264Vbv(); - afx_msg void OnToolTuningGdiSleep(); - afx_msg void OnToolTuningPaceFpsFloor(); - afx_msg void OnToolTuningAdaptiveLoad(); - // 把上述各项的勾选状态同步到「远程桌面调优」子菜单 - void SyncTuningMenuChecks(); - // 当前调优开关位,供 CScreenSpyDlg 下发 CMD_SCREEN_TUNING 用 - int GetScreenTuningFlags() const; - // 自适应质量是否启用吞吐判据(双判据),供 CScreenSpyDlg::EvaluateQuality 查询 - bool IsAdaptiveDualCriteria() const { return m_bAdaptiveDualCriteria; } // 高级→运行测试程序:把 m_ServerDLL 里的 DLL 在**本进程**内存加载,本机即上线一台 // 测试主机。同一时间只跑一份,跑完后工作线程释放模块并重新启用菜单项。 afx_msg void OnToolRunTest(); diff --git a/server/2015Remote/ScreenSpyDlg.cpp b/server/2015Remote/ScreenSpyDlg.cpp index 351b229..bf4cad9 100644 --- a/server/2015Remote/ScreenSpyDlg.cpp +++ b/server/2015Remote/ScreenSpyDlg.cpp @@ -215,7 +215,10 @@ CScreenSpyDlg::CScreenSpyDlg(CMy2015RemoteDlg* Parent, Server* IOCPServer, CONTE const ULONG ulBitmapInforLength = sizeof(BITMAPINFOHEADER); m_BitmapInfor_Full = (BITMAPINFO *) new BYTE[ulBitmapInforLength]; m_ContextObject->InDeCompressedBuffer.CopyBuffer(m_BitmapInfor_Full, ulBitmapInforLength, 1); - m_ContextObject->InDeCompressedBuffer.CopyBuffer(&m_Settings, sizeof(ScreenSettings), 57); + // CopyBuffer 用 ULONG 相减做长度检查,缓冲比偏移 57 还短时会下溢成一个大数而 + // “通过”检查;所以这里先确认整块 ScreenSettings 都在。超短包保留默认值。 + if (m_ContextObject->InDeCompressedBuffer.GetBufferLength() >= 57 + (int)sizeof(ScreenSettings)) + m_ContextObject->InDeCompressedBuffer.CopyBuffer(&m_Settings, sizeof(ScreenSettings), 57); // 解析 clientID (在 BITMAPINFOHEADER 之后,偏移 41) // 格式: [TOKEN_BITMAPINFO:1][BITMAPINFOHEADER:40][clientID:8][dlgID:8][ScreenSettings:...] @@ -242,6 +245,9 @@ CScreenSpyDlg::CScreenSpyDlg(CMy2015RemoteDlg* Parent, Server* IOCPServer, CONTE } } + // 逐客户端的调优开关:对话框建立时读回本客户端的设置,之后打开远程桌面即按此下发。 + LoadScreenTuning(); + // 从客户端配置初始化自适应质量状态 (QualityLevel: -2=关闭, -1=自适应, 0-5=具体等级) m_AdaptiveQuality.startTime = GetTickCount64(); // 记录启动时间 if (m_Settings.QualityLevel == QUALITY_DISABLED) { @@ -266,18 +272,93 @@ CScreenSpyDlg::CScreenSpyDlg(CMy2015RemoteDlg* Parent, Server* IOCPServer, CONTE } -// 下发主控端「高级 → 远程桌面调优」的开关位:[cmd:1][flags:4 LE]。主控端默认 0x7。 -// 全 0 也照发,客户端据此把可能残留的旧标志清掉(同一客户端先后被不同主控端打开时)。 +// 下发本会话「远程桌面调优」的开关位:[cmd:1][flags:4 LE][version:1]。 +// 四位全发:低三位让客户端立刻生效,bit3 是主控端自用判据,客户端只原样存进 +// 本机配置,下次随 ScreenSettings.TuningFlags 回报。全 0 也照发,客户端据此把 +// 可能残留的旧标志清掉(同一客户端先后被不同主控端打开时)。 +// 末尾的版本字节让新客户端区分本端和老主控端(负载只有 5 字节):老主控端不认识 +// bit3,新客户端收到时就只让低三位生效、不落盘。 // 老客户端不认识这条命令,OnReceive 的 switch 无 default 分支,直接忽略。 VOID CScreenSpyDlg::SendScreenTuning(void) { - int flags = (m_pParent != nullptr) ? m_pParent->GetScreenTuningFlags() : 0; - BYTE cmd[1 + sizeof(int)] = { CMD_SCREEN_TUNING }; + int flags = GetScreenTuningFlags(); + BYTE cmd[1 + sizeof(int) + 1] = { CMD_SCREEN_TUNING }; memcpy(cmd + 1, &flags, sizeof(int)); + cmd[1 + sizeof(int)] = SCREEN_TUNING_CMD_VERSION; m_ContextObject->Send2Client(cmd, sizeof(cmd)); Mprintf("[ScreenSpy] 下发调优开关: 0x%08X\n", flags); } +// 当前开关位。bit3(自适应吞吐判据)也包含在内:客户端不解释它,只负责保存并回报, +// 这样四个开关能共用 ScreenSettings.TuningFlags 一个字段实现逐客户端持久化。 +int CScreenSpyDlg::GetScreenTuningFlags() const +{ + int flags = 0; + if (m_bTuningX264Vbv) flags |= TUNING_X264_VBV; + if (m_bTuningGdiNoSleep) flags |= TUNING_GDI_NO_SLEEP; + if (m_bTuningPaceFpsFloor) flags |= TUNING_PACE_FPS_FLOOR; + if (m_bTuningAdaptiveDual) flags |= TUNING_ADAPTIVE_DUAL; + return flags; +} + +// 恢复顺序:客户端随 ScreenSettings 上报的值为准(新客户端,逐客户端、跨主控端一致), +// 老客户端没有 SCREEN_CAP_TUNING_FLAGS,退回主控端 THIS_CFG [screen_tuning] 里按 +// 客户端 ID 保存的副本(与 mouse_scale 同一种做法);两者都没有时沿用旧版全局 +// [settings] Tuning* 的选择,最后才落到默认值。旧版全局项不能直接丢掉:用户可能 +// 在那里显式关过某一项,迁移后第一次打开远程桌面应当尊重它。 +void CScreenSpyDlg::LoadScreenTuning() +{ + int v = -1; + if (m_Settings.Capabilities & SCREEN_CAP_TUNING_FLAGS) { + v = m_Settings.TuningFlags; + Mprintf("[Tuning] device %llu: 客户端上报调优开关 0x%X\n", m_ClientID, v); + } else if (m_ClientID != 0) { + v = THIS_CFG.GetInt("screen_tuning", std::to_string(m_ClientID), -1); + } + if (v < 0) { + v = 0; + if (THIS_CFG.GetInt("settings", "TuningX264Vbv", 0)) v |= TUNING_X264_VBV; + if (THIS_CFG.GetInt("settings", "TuningGdiNoSleep", 1)) v |= TUNING_GDI_NO_SLEEP; + if (THIS_CFG.GetInt("settings", "TuningPaceFpsFloor", 1)) v |= TUNING_PACE_FPS_FLOOR; + if (THIS_CFG.GetInt("settings", "AdaptiveDualCriteria", 1)) v |= TUNING_ADAPTIVE_DUAL; + Mprintf("[Tuning] device %llu: 无本机记录,沿用旧版全局设置 0x%X\n", m_ClientID, v); + } + m_bTuningX264Vbv = (v & TUNING_X264_VBV) != 0; + m_bTuningGdiNoSleep = (v & TUNING_GDI_NO_SLEEP) != 0; + m_bTuningPaceFpsFloor = (v & TUNING_PACE_FPS_FLOOR) != 0; + m_bTuningAdaptiveDual = (v & TUNING_ADAPTIVE_DUAL) != 0; +} + +// 主控端副本只对老客户端有意义(新客户端自己存),但仍照写:万一客户端换回老版本, +// 至少主控端还记得上次的勾选。 +void CScreenSpyDlg::SaveScreenTuning() const +{ + if (m_ClientID == 0) return; + int v = GetScreenTuningFlags(); + THIS_CFG.SetInt("screen_tuning", std::to_string(m_ClientID), v); + Mprintf("[Tuning] device %llu: 保存调优开关 0x%X\n", m_ClientID, v); +} + +// 调优项全在「远程桌面调优」子菜单里,顶级系统菜单上 CheckMenuItem 找不到,得先定位子菜单。 +void CScreenSpyDlg::SyncTuningMenuChecks() +{ + CMenu* SysMenu = GetSystemMenu(FALSE); + if (!SysMenu) return; + CMenu* tuningMenu = nullptr; + for (UINT i = 0; i < (UINT)SysMenu->GetMenuItemCount(); i++) { + CMenu* sub = SysMenu->GetSubMenu(i); + if (sub && sub->GetMenuState(IDM_TUNING_X264_VBV, MF_BYCOMMAND) != 0xFFFFFFFF) { + tuningMenu = sub; + break; + } + } + if (!tuningMenu) return; + tuningMenu->CheckMenuItem(IDM_TUNING_X264_VBV, m_bTuningX264Vbv ? MF_CHECKED : MF_UNCHECKED); + tuningMenu->CheckMenuItem(IDM_TUNING_GDI_SLEEP, m_bTuningGdiNoSleep ? MF_CHECKED : MF_UNCHECKED); + tuningMenu->CheckMenuItem(IDM_TUNING_PACE_FPS_FLOOR, m_bTuningPaceFpsFloor ? MF_CHECKED : MF_UNCHECKED); + tuningMenu->CheckMenuItem(IDM_TUNING_ADAPTIVE_LOAD, m_bTuningAdaptiveDual ? MF_CHECKED : MF_UNCHECKED); +} + // 要求客户端下一帧强制 IDR。客户端在 SetAlgorithm 换算法时也会自己丢编码器, // 这里是兜底:解码器被 flush 过之后必须拿到 IDR 才能恢复,不能等自然 GOP。 VOID CScreenSpyDlg::RequestClientKeyFrame(void) @@ -821,6 +902,16 @@ BOOL CScreenSpyDlg::OnInitDialog() qualityMenu.AppendMenuL(MF_STRING, IDM_QUALITY_MINIMAL, "Minimal (8FPS, H264) - 极差/极低带宽"); SysMenu->AppendMenuL(MF_STRING | MF_POPUP, (UINT_PTR)qualityMenu.Detach(), _T("屏幕质量(&Q)")); } + + // 远程桌面调优子菜单(逐客户端设置,紧跟「屏幕质量」之后) + CMenu tuningMenu; + if (tuningMenu.CreatePopupMenu()) { + tuningMenu.AppendMenuL(MF_STRING, IDM_TUNING_X264_VBV, "x264 码率封顶 (VBV,仅限洲际弱网)"); + tuningMenu.AppendMenuL(MF_STRING, IDM_TUNING_GDI_SLEEP, "GDI 抓屏去分段延时"); + tuningMenu.AppendMenuL(MF_STRING, IDM_TUNING_PACE_FPS_FLOOR, "发送节流帧率下限"); + tuningMenu.AppendMenuL(MF_STRING, IDM_TUNING_ADAPTIVE_LOAD, "自适应加吞吐判据"); + SysMenu->AppendMenuL(MF_STRING | MF_POPUP, (UINT_PTR)tuningMenu.Detach(), _T("远程桌面调优(&T)")); + } // 音频菜单项 SysMenu->AppendMenuL(MF_STRING, IDM_AUDIO_TOGGLE, "系统音频(&U)"); SysMenu->CheckMenuItem(IDM_AUDIO_TOGGLE, m_Settings.AudioEnabled ? MF_CHECKED : MF_UNCHECKED); @@ -833,6 +924,7 @@ BOOL CScreenSpyDlg::OnInitDialog() // 初始化勾选状态 UpdateQualityMenuCheck(SysMenu); + SyncTuningMenuChecks(); BOOL all = THIS_CFG.GetInt("settings", "MultiScreen", TRUE); SysMenu->EnableMenuItem(IDM_SWITCHSCREEN, all ? MF_ENABLED : MF_GRAYED); @@ -2194,6 +2286,26 @@ void CScreenSpyDlg::OnSysCommand(UINT nID, LPARAM lParam) ShowMouseCalibration(); break; } + case IDM_TUNING_X264_VBV: + case IDM_TUNING_GDI_SLEEP: + case IDM_TUNING_PACE_FPS_FLOOR: { + if (nID == IDM_TUNING_X264_VBV) m_bTuningX264Vbv = !m_bTuningX264Vbv; + else if (nID == IDM_TUNING_GDI_SLEEP) m_bTuningGdiNoSleep = !m_bTuningGdiNoSleep; + else m_bTuningPaceFpsFloor = !m_bTuningPaceFpsFloor; + SaveScreenTuning(); + SyncTuningMenuChecks(); + // 客户端按新标志即时生效:影响编码器参数的那一项会重建编码器(丢一个 IDR, + // 画面闪一下),其余两项由抓屏/发送线程下次现读,不必重开会话。 + SendScreenTuning(); + break; + } + case IDM_TUNING_ADAPTIVE_LOAD: { // 服务端判据立即生效;同时下发让客户端存进本机配置 + m_bTuningAdaptiveDual = !m_bTuningAdaptiveDual; + SaveScreenTuning(); + SyncTuningMenuChecks(); + SendScreenTuning(); + break; + } case IDM_SAVEDIB: { // 快照保存 SaveSnapshot(); break; @@ -2670,7 +2782,7 @@ void CScreenSpyDlg::EvaluateQuality() } int currentLevel = m_AdaptiveQuality.currentLevel; - const bool dual = (m_pParent && m_pParent->IsAdaptiveDualCriteria()); + const bool dual = m_bTuningAdaptiveDual; // 0.9 锁档检查(放在所有判据之前,锁档期间一次评估都不做)。 // 上面的措施各自针对一种具体成因,这一条是不依赖成因的兜底。 diff --git a/server/2015Remote/ScreenSpyDlg.h b/server/2015Remote/ScreenSpyDlg.h index d479552..2a13f74 100644 --- a/server/2015Remote/ScreenSpyDlg.h +++ b/server/2015Remote/ScreenSpyDlg.h @@ -146,6 +146,11 @@ enum { IDM_ENABLE_H264_HARD, IDM_ENABLE_AV1_HARD, IDM_MOUSE_CALIB, // 鼠标坐标校准(逐主机补偿客户端坐标换算偏差) + // 远程桌面调优(放在「屏幕质量」下方,逐客户端独立设置) + IDM_TUNING_X264_VBV, // x264 码率封顶(默认关,仅限洲际弱网) + IDM_TUNING_GDI_SLEEP, // GDI 抓屏去分段延时(默认开) + IDM_TUNING_PACE_FPS_FLOOR, // 发送节流帧率下限(默认开) + IDM_TUNING_ADAPTIVE_LOAD, // 自适应加吞吐判据(纯服务端,默认开) }; // 状态信息窗口 - 全屏时显示帧率/速度/质量 @@ -199,12 +204,26 @@ class CScreenSpyDlg : public DialogBase public: CStatusInfoWnd* m_pStatusInfoWnd = nullptr; - // MaxFPS=20, ScrollDetectInterval=2, Reserved={}, Capabilities=0 // MaxFPS=20, CompressThread=0, ScreenStrategy=0, ScreenWidth=0, ScreenHeight=0, // FullScreen=0, RemoteCursor=0, ScrollDetectInterval=2, QualityLevel=-1, - // CpuSpeedup=0, ScreenType=0, AudioEnabled=0, Reserved={}, Capabilities=0 + // CpuSpeedup=0, ScreenType=0, AudioEnabled=0, EncodeLevel=0, CustomCursor=0, + // TuningFlags=0, Reserved={}, Capabilities=0 ScreenSettings m_Settings = { 20, 0, 0, 0, 0, 0, 0, 2, -1, 0, 0, 0, {}, 0 }; + // 远程桌面调优:逐客户端独立设置。新客户端把开关存进本机配置,并随 + // ScreenSettings.TuningFlags 上报(Capabilities 带 SCREEN_CAP_TUNING_FLAGS); + // 没有上报的(老客户端,或新客户端还没被新主控端下发过)退回 THIS_CFG + // [screen_tuning] 按客户端 ID 保存的主控端副本,再退回旧版全局 [settings] Tuning*。 + // 默认值与旧版全局设置一致:GDI 去延时、发送节流、自适应吞吐判据开,x264 VBV 关。 + bool m_bTuningX264Vbv = false; // TUNING_X264_VBV x264 软编加 VBV 码率封顶 + bool m_bTuningGdiNoSleep = true; // TUNING_GDI_NO_SLEEP GDI 抓屏去分段延时 + bool m_bTuningPaceFpsFloor = true; // TUNING_PACE_FPS_FLOOR 发送节流帧率下限 + bool m_bTuningAdaptiveDual = true; // TUNING_ADAPTIVE_DUAL 自适应质量加吞吐判据 + void LoadScreenTuning(); // 客户端上报 → 按客户端副本 → 旧版全局设置 + void SaveScreenTuning() const; // 把当前开关写回主控端的按客户端副本 + int GetScreenTuningFlags() const; // 下发的开关位(四位全发,bit3 由客户端原样回报) + void SyncTuningMenuChecks(); // 同步「远程桌面调优」子菜单的勾选状态 + public: // 快速缩放模式(全局配置,所有实例共享) static int s_nFastStretch; // -1=未初始化, 0=关闭, 1=开启 @@ -227,7 +246,8 @@ public: void BroadcastCursorToWeb(bool force); VOID SendNext(void); - // 下发主控端「高级 → 远程桌面调优」的开关位(CMD_SCREEN_TUNING),主控端默认 0x3 + // 下发本会话「远程桌面调优」的开关位(CMD_SCREEN_TUNING,末尾带版本字节), + // 默认 0xE(GDI 去延时+发送节流+自适应判据;x264 码率封顶默认关) VOID SendScreenTuning(void); // 要求客户端下一帧强制 IDR(COMMAND_SCREEN_KEYFRAME_REQ) VOID RequestClientKeyFrame(void); diff --git a/server/2015Remote/resource.h b/server/2015Remote/resource.h index eb81c2b..64f203f 100644 --- a/server/2015Remote/resource.h +++ b/server/2015Remote/resource.h @@ -1123,12 +1123,6 @@ #define ID_PROTO_SWITCH_WSS 33100 // 高级菜单开关:把服务端 TLS 证书内嵌进下发给客户端的 ServerDll #define ID_TOOL_EMBED_TLS_ANCHOR 33101 -// 高级 → 远程桌面调优:逐项勾选的开关,三项默认全开,取消勾选即回到旧行为 -#define ID_TOOL_TUNING_X264_VBV 33102 -#define ID_TOOL_TUNING_GDI_SLEEP 33103 -#define ID_TOOL_TUNING_PACE_FPS_FLOOR 33104 -// 高级 → 远程桌面调优:自适应质量加吞吐判据(纯服务端,不下发客户端) -#define ID_TOOL_TUNING_ADAPTIVE_LOAD 33105 // 高级 → 运行测试程序:把内存里的 ServerDll 在主控进程内加载,本机上线一台测试主机 #define ID_TOOL_RUN_TEST 33106 #define ID_EXIT_FULLSCREEN 40001