From ca4e85826fd085dfcb6fd93083f465a4a5a8e057 Mon Sep 17 00:00:00 2001 From: yuanyuanxiang <962914132@qq.com> Date: Wed, 4 Nov 2026 14:06:35 +0100 Subject: [PATCH] Feature: remote desktop tuning flags, on by default with per-item opt-out Adds "Advanced -> Remote desktop tuning" with three independently checkable items, all enabled by default: x264 bitrate cap (VBV) TUNING_X264_VBV 0x1 GDI capture: no slice delay TUNING_GDI_NO_SLEEP 0x2 Send pacing FPS floor TUNING_PACE_FPS_FLOOR 0x4 Unticking an item clears its bit and restores the pre-commit behaviour exactly, so the escape hatch is one click per measure -- no rebuild, no config edit. Each bit is independent; a problem with one does not force turning all three off. Plumbing -------- Menu state -> [settings] Tuning* -> CMy2015RemoteDlg::GetScreenTuningFlags() -> CScreenSpyDlg::SendScreenTuning() (right after TOKEN_BITMAPINFO) -> CMD_SCREEN_TUNING = 178 [cmd:1][flags:4 LE] -> CScreenManager::OnReceive -> m_nTuningFlags -> ScreenCapture::SetTuningFlags Why it is safe to send to old clients: CScreenManager::OnReceive has no default branch in its switch, so an unknown command falls straight out (verified). 178 was unassigned (177 = COMMAND_SET_PROTO, 199 = TOKEN_DECRYPT), and the enum re-anchors explicitly so nothing auto- increments onto it. Flags are sent even when all-zero on purpose: the client's flag lives in CScreenManager, which survives closing and reopening the remote desktop window on the same connection. Without the zero send, unticking the menu would leave the previous flags in effect. Per-measure notes ----------------- VBV: capped CRF (peak = target, 0.5s buffer, init 0.9). The hardware paths already cap via rc_max_rate (1.5x, 1s buffer); this is tighter and only affects x264. After an IDR the buffer drains and takes up to 0.5s to refill, so a brief quality dip follows every keyframe -- if that shows up, relaxing to 1.5x/1s would match NVENC/QSV. GDI: keeps the 50-line BitBlt slicing (large single BitBlts hit driver limits) and only drops the 5ms sleep between slices -- 1080p is 22 slices = a forced 110ms per frame against a 50ms budget at 20fps. Pacing: clamps s0 to 2x the base interval instead of 4x (2fps -> 4fps), taken as max(2x base, 1000/MaxFPS) so it never exceeds the configured MaxFPS. The growth/decay code itself is untouched. This one works against the loop's own congestion signal, so it is the first to untick if a bad link feels laggier rather than smoother. SetTuningFlags only rebuilds the encoder when TUNING_ENCODER_BITS (currently just VBV) changes -- the GDI and pacing bits are read live by the capture and send threads, and rebuilding for them would drop an IDR and visibly flash the picture. Defaults: the on-by-default value lives in the third argument of THIS_CFG.GetInt(), which only applies when the key is absent. A machine that already has an explicit 0 keeps it, so the flip is not retroactive and a test machine can end up with a mixed state. Verified on the Debug build: with no Tuning* keys all three items start checked; unticking VBV alone leaves the other two checked and survives a restart; en_US/de_DE/zh_TW translations all resolve. Not yet measured end to end on a real remote desktop session. --- client/EncoderFactory.cpp | 5 +- client/EncoderFactory.h | 3 ++ client/ScreenCapture.h | 29 +++++++++++ client/ScreenManager.cpp | 28 +++++++++++ client/ScreenManager.h | 3 ++ client/ScreenSpy.cpp | 7 ++- client/VideoEncoderBase.h | 5 ++ client/X264Encoder.cpp | 24 +++++++-- client/X264Encoder.h | 5 +- common/commands.h | 18 +++++++ server/2015Remote/2015Remote.rc | Bin 180440 -> 181066 bytes server/2015Remote/2015RemoteDlg.cpp | 73 ++++++++++++++++++++++++++++ server/2015Remote/2015RemoteDlg.h | 13 +++++ server/2015Remote/ScreenSpyDlg.cpp | 15 ++++++ server/2015Remote/ScreenSpyDlg.h | 2 + server/2015Remote/lang/de_DE.ini | 4 ++ server/2015Remote/lang/en_US.ini | 4 ++ server/2015Remote/lang/zh_TW.ini | 4 ++ server/2015Remote/resource.h | 6 ++- 19 files changed, 239 insertions(+), 9 deletions(-) diff --git a/client/EncoderFactory.cpp b/client/EncoderFactory.cpp index 70ff97b..e04ec2c 100644 --- a/client/EncoderFactory.cpp +++ b/client/EncoderFactory.cpp @@ -60,8 +60,11 @@ std::unique_ptr CreateEncoder(const EncoderRequest& req) { auto enc = std::make_unique(); p.rc = RateControl::CRF; p.crf = BitRateToCRF(req.bitrate_kbps); + // capped CRF:由主控端「高级 → 远程桌面调优」控制,默认开、可取消勾选 + p.vbv_cap = req.vbv_cap; if (enc->open(p)) { - Mprintf("=> encoder: %s (SW, crf=%d)\n", enc->backendName(), p.crf); + Mprintf("=> encoder: %s (SW, crf=%d%s)\n", enc->backendName(), p.crf, + p.vbv_cap ? ", vbv capped" : ""); return enc; } } diff --git a/client/EncoderFactory.h b/client/EncoderFactory.h index 291c779..0496ca4 100644 --- a/client/EncoderFactory.h +++ b/client/EncoderFactory.h @@ -12,6 +12,9 @@ struct EncoderRequest { int fps = 30; int bitrate_kbps = 4000; int encodeLevel = LEVEL_H264_SOFT; + // x264 软编加 VBV 峰值上限(capped CRF)。硬编路径本来就是 VBR + rc_max_rate, + // 天然有上限,此标志对它们无影响。默认 false = 与历史行为一致。 + bool vbv_cap = false; }; // 按客户端能力 + 本机硬件能力创建一个 VideoEncoderBase。 diff --git a/client/ScreenCapture.h b/client/ScreenCapture.h index 803595c..d0cfb80 100644 --- a/client/ScreenCapture.h +++ b/client/ScreenCapture.h @@ -171,6 +171,9 @@ public: int m_nScrollDetectInterval; // 滚动检测间隔(0=禁用, 1=每帧, 2=每2帧, ...) int m_nInstructionSet = 0; int m_nBitRate = 0; // H264 编码码率 (kbps), 0=自动 + int m_nTuningFlags = 0; // 远程桌面调优开关位(CMD_SCREEN_TUNING 下发)。 + // 本地初值恒为 0,由服务端在打开远程桌面时下发, + // 主控端默认下发 0x7(三项全开);位定义见 TUNING_* // 感兴趣区域 (ROI) RECT m_ROI = {0,0,0,0}; @@ -895,6 +898,7 @@ public: req.fps = 20; req.bitrate_kbps = (m_nBitRate > 0) ? m_nBitRate : (width * height / 1266); req.encodeLevel = m_EncodeLevel; + req.vbv_cap = (m_nTuningFlags & TUNING_X264_VBV) != 0; m_encoder = CreateEncoder(req); } @@ -1087,6 +1091,31 @@ public: return m_nBitRate; } + // 远程桌面调优开关(CMD_SCREEN_TUNING)。返回 true 表示标志有变化。 + // 只有影响编码器参数的位(TUNING_ENCODER_BITS)变化才丢弃编码器;GDI 抓屏、发送节流 + // 这类位由抓屏/发送线程每次现读,改了立刻生效,不该为它们白丢一个 IDR 让画面闪一下。 + // 编码器重建后第一帧必然是 IDR,服务端能正确解码,不需要额外的关键帧握手。 + virtual bool SetTuningFlags(int flags) + { + if (m_nTuningFlags == flags) return false; + const bool encoderChanged = ((m_nTuningFlags ^ flags) & TUNING_ENCODER_BITS) != 0; + m_nTuningFlags = flags; + if (encoderChanged && m_encoder) { + Mprintf("=> TuningFlags: 0x%08X,重建编码器以应用新参数\n", flags); + m_encoder.reset(); + m_bEncoderPrimed = false; // 重建后首帧必须真正 encode,不能走 skip + } else { + Mprintf("=> TuningFlags: 0x%08X(%s)\n", flags, + m_encoder ? "不影响编码器,无需重建" : "编码器尚未创建,首帧时生效"); + } + return true; + } + + virtual int GetTuningFlags() const + { + return m_nTuningFlags; + } + // 鼠标位置转换:将服务端坐标(基于发送分辨率)转换为客户端坐标(原始分辨率) virtual void PointConversion(POINT& pt) const { diff --git a/client/ScreenManager.cpp b/client/ScreenManager.cpp index 52fa70f..b0bf783 100644 --- a/client/ScreenManager.cpp +++ b/client/ScreenManager.cpp @@ -603,6 +603,11 @@ void CScreenManager::InitScreenSpy() if (m_ScreenSpyObject && level >= 0 && level < QUALITY_COUNT) { m_ScreenSpyObject->SetBitRate(m_QualityProfiles[level].bitRate); } + // 调优开关:服务端在打开远程桌面时下发,截屏对象因换窗口/改分辨率重建后要重新应用, + // 否则重建出来的编码器又退回默认参数。 + if (m_ScreenSpyObject && m_nTuningFlags) { + m_ScreenSpyObject->SetTuningFlags(m_nTuningFlags); + } } BOOL IsRunningAsSystem() @@ -735,6 +740,15 @@ DWORD WINAPI CScreenManager::WorkThreadProc(LPVOID lParam) if (szBuffer) { 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); + if (s0 > floorS0) s0 = floorS0; + } int span = s0-(clock() - last); Sleep(span > 0 ? span : 1); if (span < 0) { // 发送数据耗时较长,网络较差或数据较多 @@ -1132,6 +1146,20 @@ VOID CScreenManager::OnReceive(PBYTE szBuffer, ULONG ulLength) } break; } + case CMD_SCREEN_TUNING: { + // 远程桌面调优开关:[cmd:1][flags:4 LE]。主控端「高级 → 远程桌面调优」三项, + // 默认下发 0x7;取消勾选时对应位清零,等于回到加开关前的行为。 + // 老客户端不认识这条命令,switch 无 default 直接忽略。 + 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; + if (m_ScreenSpyObject) { + m_ScreenSpyObject->SetTuningFlags(flags); + } + break; + } case CMD_INSTRUCTION_SET: { int set = unsigned(szBuffer[1]); iniFile cfg(CLIENT_PATH); diff --git a/client/ScreenManager.h b/client/ScreenManager.h index 1cca8ec..49f4f57 100644 --- a/client/ScreenManager.h +++ b/client/ScreenManager.h @@ -42,6 +42,9 @@ public: HANDLE m_hWorkThread; ScreenSettings m_ScreenSettings = { 20 }; QualityProfile m_QualityProfiles[QUALITY_COUNT]; // 本地质量配置(可被服务端覆盖) + // 远程桌面调优开关位(CMD_SCREEN_TUNING 下发),本地初值 0,主控端默认下发 0x7。 + // 保存在这里而不是 ScreenSettings 里,避免改动服务端↔客户端的固定结构体布局。 + int m_nTuningFlags = 0; virtual void InitScreenSpy(); void LoadQualityProfiles(); // 从配置文件加载质量配置 diff --git a/client/ScreenSpy.cpp b/client/ScreenSpy.cpp index 23f9b67..58589c3 100644 --- a/client/ScreenSpy.cpp +++ b/client/ScreenSpy.cpp @@ -194,11 +194,16 @@ VOID CScreenSpy::ScanScreen(HDC hdcDest, HDC hdcSour, ULONG ulWidth, ULONG ulHei #else const ULONG ulJumpLine = 50; const ULONG ulJumpSleep = ulJumpLine / 10; + // 段间 Sleep 的用途是让出 CPU(避免长时间占满一个核)。代价很大:1080p 要切 22 段, + // 每帧强制 110ms,而 20fps 的每帧预算只有 50ms —— 抓屏本身就超时,帧率被拖死。 + // 主控端「高级 → 远程桌面调优 → GDI 抓屏去分段延时」勾选后不再 Sleep; + // 仍按行分段,避开超大尺寸单次 BitBlt 的驱动限制。 + const bool bNoSleep = (GetTuningFlags() & TUNING_GDI_NO_SLEEP) != 0; for (int i = 0, ulToJump = 0; i < (int)ulHeight; i += ulToJump) { ULONG ulv1 = ulHeight - i; ulToJump = (ulv1 > ulJumpLine) ? ulJumpLine : ulv1; BitBlt(hdcDest, 0, i, ulWidth, ulToJump, hdcSour, 0, i, SRCCOPY); - Sleep(ulJumpSleep); + if (!bNoSleep) Sleep(ulJumpSleep); } #endif } diff --git a/client/VideoEncoderBase.h b/client/VideoEncoderBase.h index 8eef802..3afc30b 100644 --- a/client/VideoEncoderBase.h +++ b/client/VideoEncoderBase.h @@ -23,6 +23,11 @@ struct EncoderParams { int crf = 23; // 当 rc == CRF int bitrate_kbps = 4000; // 当 rc == BITRATE int gop_seconds = 15; // 关键帧间隔(秒),与 x264 i_keyint_max=fps*15 对齐 + + // 给 CRF 编码加 VBV 峰值上限(capped CRF)。硬编路径本来就是 VBR + rc_max_rate, + // 天然有上限;x264 走纯 CRF 时没有,复杂帧能冲到目标码率好几倍,跨洲际会堵死链路。 + // 默认 false = 不加 VBV,与历史行为一致,由主控端「远程桌面调优」开关打开。 + bool vbv_cap = false; }; class VideoEncoderBase { diff --git a/client/X264Encoder.cpp b/client/X264Encoder.cpp index 8f241b0..ba72889 100644 --- a/client/X264Encoder.cpp +++ b/client/X264Encoder.cpp @@ -1,4 +1,5 @@ #include "X264Encoder.h" +#include "common/logger.h" #include #include @@ -17,7 +18,7 @@ // 合规构建的桩实现:头文件已不含 x264 类型,这里也不能碰 m_Param / x264_param_t。 CX264Encoder::CX264Encoder() { m_forceIDR = false; } CX264Encoder::~CX264Encoder() {} -bool CX264Encoder::open(int, int, int, int) { return false; } +bool CX264Encoder::open(int, int, int, int, int) { return false; } bool CX264Encoder::open(const EncoderParams&) { return false; } void CX264Encoder::close() {} int CX264Encoder::encode(uint8_t*, uint8_t, uint32_t, uint32_t, uint32_t, uint8_t**, uint32_t*, int) { return -1; } @@ -44,7 +45,7 @@ CX264Encoder::~CX264Encoder() close(); } -bool CX264Encoder::open(int width, int height, int fps, int crf) +bool CX264Encoder::open(int width, int height, int fps, int crf, int vbv_kbps) { x264_param_t param = { 0 }; x264_param_default_preset(¶m, "ultrafast", "zerolatency"); @@ -63,10 +64,19 @@ bool CX264Encoder::open(int width, int height, int fps, int crf) param.i_csp = X264_CSP_I420; // CRF: 静态画面自动降至极低码率,动态画面按质量需要分配 - // 不设 VBV —— 避免 IDR/复杂帧后的质量振荡 param.rc.i_rc_method = X264_RC_CRF; param.rc.f_rf_constant = (float)crf; + // capped CRF:CRF 保证画质,VBV 保证峰值不失控。纯 CRF 下复杂帧(视频、切大窗口) + // 单帧能冲到目标码率好几倍,跨洲际 2Mbps 链路上一个 500KB 的帧要传 2 秒, + // 后续帧全排队 → 用户看到的是"卡住几秒然后画面猛跳"。默认不开(vbv_kbps=0), + // 由主控端「高级 → 远程桌面调优」勾选后下发 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 秒缓冲:够压住尖峰,又不至于抖动 + param.rc.f_vbv_buffer_init = 0.9f; // 从接近满缓冲起步,避免首帧质量塌 + } + //设置profile. if (x264_param_apply_profile(¶m, x264_profile_names[0])) { return false; @@ -106,7 +116,13 @@ bool CX264Encoder::open(const EncoderParams& params) { // x264 软编只支持 CRF;调用方走 BITRATE 时降级为 CRF=23(与 BitRateToCRF 默认一致) int crf = (params.rc == RateControl::CRF) ? params.crf : 23; - return open(params.width, params.height, params.fps, crf); + // vbv_cap 打开时用 bitrate_kbps 当峰值上限;bitrate 未知(<=0)则不加,退回纯 CRF + int vbv = params.vbv_cap ? params.bitrate_kbps : 0; + if (vbv > 0) { + Mprintf("=> x264: capped CRF, crf=%d, vbv_max=%dkbps, buffer=%dkb\n", + crf, vbv, vbv / 2); + } + return open(params.width, params.height, params.fps, crf, vbv); } diff --git a/client/X264Encoder.h b/client/X264Encoder.h index 38b3f9e..8ac8015 100644 --- a/client/X264Encoder.h +++ b/client/X264Encoder.h @@ -19,7 +19,7 @@ private: bool m_forceIDR; // 保留成员以对齐两套实现的行为,桩里不使用 public: // 旧签名保留:与非合规构建保持同一份对外接口 - bool open(int width, int height, int fps, int crf); + bool open(int width, int height, int fps, int crf, int vbv_kbps = 0); // VideoEncoderBase bool open(const EncoderParams& params) override; @@ -59,7 +59,8 @@ private: bool m_forceIDR; // 下一次 encode 强制 IDR public: // 旧签名保留:被 ScreenCapture 临时直接调;新增 EncoderParams overload 走接口路径 - bool open(int width, int height, int fps, int crf); + // vbv_kbps > 0 时给 CRF 加 VBV 峰值上限(capped CRF),0 = 不加(历史行为) + bool open(int width, int height, int fps, int crf, int vbv_kbps = 0); bool open(x264_param_t * param); // VideoEncoderBase diff --git a/common/commands.h b/common/commands.h index 025496d..152b8e8 100644 --- a/common/commands.h +++ b/common/commands.h @@ -352,6 +352,11 @@ enum { // 客户端把入口写进本机配置后断开,重连循环按新入口重连;新入口连不上会自动回退。 COMMAND_SET_PROTO = 177, // [ProtoSwitchPacket][certLen 字节 PEM 正文] + // 远程桌面调优开关:主控端「高级 → 远程桌面调优」的勾选项,打开远程桌面时下发一次。 + // [cmd:1][flags:4 LE],位定义见下方 TUNING_*。全 0 = 与加开关前行为完全一致。 + // 老客户端 OnReceive 的 switch 无 default 分支,收到不认识的命令直接忽略,故可安全下发。 + CMD_SCREEN_TUNING = 178, + TOKEN_DECRYPT = 199, TOKEN_REGEDIT = 200, // 注册表 COMMAND_REG_FIND, // 注册表 管理标识 @@ -1346,6 +1351,19 @@ struct QualityProfile { int bitRate; // kbps - H264 }; +// ===== 远程桌面调优开关(CMD_SCREEN_TUNING 的位定义)===== +// 主控端「高级 → 远程桌面调优」里逐项勾选。三项默认全部勾选;取消勾选即把对应位清零, +// 回到加开关前的行为。每一位都能独立开关,某项出问题可以只关那一项,不必全关。 +// 默认值改在 CMy2015RemoteDlg::OnInitDialog 的 GetInt 第三参数上,注意存量机器如果 +// 已经写过 0,改默认值不会覆盖它们。 +#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 + +// 其中会影响编码器参数、必须在变更时重建编码器的位。其余位由抓屏/发送线程每次现读, +// 改了立刻生效,不需要重建(重建会丢一个 IDR,画面上能看出闪一下)。 +#define TUNING_ENCODER_BITS (TUNING_X264_VBV) + // 控制端使用,客户端优先从配置中读取 inline const QualityProfile& GetQualityProfile(int level) { // 预定义质量配置: algorithm: 0=GRAY, 1=DIFF, 2=H264, 3=RGB565 diff --git a/server/2015Remote/2015Remote.rc b/server/2015Remote/2015Remote.rc index 7da79d34553c98cc535c4d80bf9da2074a1aafa8..36498e6bf1dae23e46c27f4f5b4b415b2ab9a992 100644 GIT binary patch delta 272 zcmcc7$bG7fyP<_~3sZ>v^n$mHd?I)HxvP9KlBP5FNcd|os4;{vXfjMUc*PhXUBO_) zV8&p=puoUb(O%3LQ#M0^L4zTT!HFSkdf|CS#pw%}m;_`)7(yBR7(9X4ogtnf0;(q- zsxI*pqoJrfg9}iB0>k7a|CrsuY(ZPIzr}r<{!x`l9&Cg>su2*?@eIKXJ`Aov7%&}V zh`_~Q#tBVLj=Ab_?Zw=F0n?^$xX-8r)~|}HKY+oJ!5OG8p23YF0B8z`_F?d!zVJPx Wvbc0)rBHM2%G8HTY0D1=rX#fBK diff --git a/server/2015Remote/2015RemoteDlg.cpp b/server/2015Remote/2015RemoteDlg.cpp index cf3d56c..5ea64d2 100644 --- a/server/2015Remote/2015RemoteDlg.cpp +++ b/server/2015Remote/2015RemoteDlg.cpp @@ -1149,6 +1149,9 @@ BEGIN_MESSAGE_MAP(CMy2015RemoteDlg, CDialogEx) ON_COMMAND(ID_TOOL_PREVIEW_LEVELS, &CMy2015RemoteDlg::OnPreviewLevels) ON_COMMAND(ID_TOOL_FILE_SPEED, &CMy2015RemoteDlg::OnFileTransferSpeed) ON_COMMAND(ID_TOOL_EMBED_TLS_ANCHOR, &CMy2015RemoteDlg::OnToolEmbedTlsAnchor) + 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_EXECUTE_TESTRUN, &CMy2015RemoteDlg::OnExecuteTestrun) ON_COMMAND(ID_EXECUTE_GHOST, &CMy2015RemoteDlg::OnExecuteGhost) ON_COMMAND(ID_MASTER_TRAIL, &CMy2015RemoteDlg::OnMasterTrail) @@ -2800,10 +2803,16 @@ BOOL CMy2015RemoteDlg::OnInitDialog() m_runNormal = THIS_CFG.GetInt("settings", "RunNormal", 0); // 高级菜单:DLL内嵌TLS证书(勾选状态来自 [settings] EmbedTlsInDll,见上面的加载) + // 以及「远程桌面调优」子菜单里的三项,默认全开;取消勾选即回到加开关前的行为。 + // 第三参数是默认值:只对从没写过该键的机器生效,已写过 0 的存量机器保持关。 + m_bTuningX264Vbv = THIS_CFG.GetInt("settings", "TuningX264Vbv", 1) != 0; + m_bTuningGdiNoSleep = THIS_CFG.GetInt("settings", "TuningGdiNoSleep", 1) != 0; + m_bTuningPaceFpsFloor = THIS_CFG.GetInt("settings", "TuningPaceFpsFloor", 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) { @@ -10762,6 +10771,70 @@ void CMy2015RemoteDlg::OnToolEmbedTlsAnchor() } } +// 把「高级 → 远程桌面调优」里各项的勾选状态同步到菜单。 +// 这些项挂在子菜单里,在顶级菜单上 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); +} + +// 高级→远程桌面调优→x264 码率封顶(VBV):默认开,取消勾选即关闭。 +// 只影响此后打开的远程桌面窗口(打开时经 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 打开远程桌面时下发 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 b5e8fd7..6e9c20d 100644 --- a/server/2015Remote/2015RemoteDlg.h +++ b/server/2015Remote/2015RemoteDlg.h @@ -280,6 +280,19 @@ public: void ReloadKernelPayloads(); // 高级→DLL内嵌TLS证书 afx_msg void OnToolEmbedTlsAnchor(); + // 高级→远程桌面调优:三项默认全开,取消勾选即回到加开关前的行为。 + // 勾选后打开远程桌面时经 CMD_SCREEN_TUNING 下发,某项出问题可以只关那一项。 + // 持久化在 [settings] Tuning*;注意默认值只对没写过该键的机器生效。 + bool m_bTuningX264Vbv = true; // TUNING_X264_VBV x264 软编加 VBV 码率封顶 + bool m_bTuningGdiNoSleep = true; // TUNING_GDI_NO_SLEEP GDI 抓屏去分段延时 + bool m_bTuningPaceFpsFloor = true; // TUNING_PACE_FPS_FLOOR 发送节流帧率下限 + afx_msg void OnToolTuningX264Vbv(); + afx_msg void OnToolTuningGdiSleep(); + afx_msg void OnToolTuningPaceFpsFloor(); + // 把上述各项的勾选状态同步到「远程桌面调优」子菜单 + void SyncTuningMenuChecks(); + // 当前调优开关位,供 CScreenSpyDlg 下发 CMD_SCREEN_TUNING 用 + int GetScreenTuningFlags() const; MasterSettings m_settings; // 缓存上次检测到的上级 FRP 配置([settings] FrpConfig),由定时器检测外部模块写入的变更。 // 检出变更后会热切换 FRPC(首次=启动 / 覆盖=重启 / 撤销=停止),并在主对话框信息列表中给出友好提示。 diff --git a/server/2015Remote/ScreenSpyDlg.cpp b/server/2015Remote/ScreenSpyDlg.cpp index 203e6d4..4c9764b 100644 --- a/server/2015Remote/ScreenSpyDlg.cpp +++ b/server/2015Remote/ScreenSpyDlg.cpp @@ -266,6 +266,18 @@ CScreenSpyDlg::CScreenSpyDlg(CMy2015RemoteDlg* Parent, Server* IOCPServer, CONTE } +// 下发主控端「高级 → 远程桌面调优」的开关位:[cmd:1][flags:4 LE]。主控端默认 0x7。 +// 全 0 也照发,客户端据此把可能残留的旧标志清掉(同一客户端先后被不同主控端打开时)。 +// 老客户端不认识这条命令,OnReceive 的 switch 无 default 分支,直接忽略。 +VOID CScreenSpyDlg::SendScreenTuning(void) +{ + int flags = (m_pParent != nullptr) ? m_pParent->GetScreenTuningFlags() : 0; + BYTE cmd[1 + sizeof(int)] = { CMD_SCREEN_TUNING }; + memcpy(cmd + 1, &flags, sizeof(int)); + m_ContextObject->Send2Client(cmd, sizeof(cmd)); + Mprintf("[ScreenSpy] 下发调优开关: 0x%08X\n", flags); +} + VOID CScreenSpyDlg::SendNext(void) { BYTE bToken[32] = { COMMAND_NEXT }; @@ -1147,6 +1159,9 @@ VOID CScreenSpyDlg::OnReceiveComplete() m_ClientID = *((uint64_t*)(m_ContextObject->InDeCompressedBuffer.GetBuffer(1 + sizeof(BITMAPINFOHEADER)))); } PrepareDrawing(m_BitmapInfor_Full); + // 调优开关紧随位图信息下发:此刻客户端的截屏对象刚建好、编码器还没创建 + // (ensureEncoder 是 lazy 的),标志赶在第一帧编码前到位,不需要重建编码器。 + SendScreenTuning(); // 重连或切换显示器后重新校验鼠标补偿(客户端上报分辨率可能已变化)。 LoadMouseScale(); // 分辨率切换完成,允许解码 diff --git a/server/2015Remote/ScreenSpyDlg.h b/server/2015Remote/ScreenSpyDlg.h index 0511ddc..6839b24 100644 --- a/server/2015Remote/ScreenSpyDlg.h +++ b/server/2015Remote/ScreenSpyDlg.h @@ -223,6 +223,8 @@ public: void BroadcastCursorToWeb(bool force); VOID SendNext(void); + // 下发主控端「高级 → 远程桌面调优」的开关位(CMD_SCREEN_TUNING),主控端默认 0x7 + VOID SendScreenTuning(void); VOID OnReceiveComplete(); HDC m_hFullDC; HDC m_hFullMemDC; diff --git a/server/2015Remote/lang/de_DE.ini b/server/2015Remote/lang/de_DE.ini index 041b3bc..b22cdaf 100644 --- a/server/2015Remote/lang/de_DE.ini +++ b/server/2015Remote/lang/de_DE.ini @@ -2086,6 +2086,10 @@ MCPԶ ¸߼¶(&A)=&Erweitert Զ³Ì×ÀÃæÖÊÁ¿µȼ¶(&Q)=Remote Desktop &Qualitaetsstufen Զ³Ì×ÀÃæÖÊÁ¿µȼ¶=Remote Desktop Qualitaetsstufen +Զ³Ì×ÀÃæµ÷ÓÅ(&T)=Remote-Desktop-Optimierung(&T) +x264 ÂëÂʷⶥ (VBV)=x264 Bitraten-Deckel (VBV) +GDI ץÆÁȥ·ֶÎÑÓʱ=GDI-Aufnahme ohne Segment-Pause +·¢ËͽÚÁ÷֡ÂÊÏÂÏÞ=Mindest-Framerate beim Senden µȼ¶=Stufe ֡ÂÊ(FPS)=FPS ×î´ó¿í¶È=Max. Breite diff --git a/server/2015Remote/lang/en_US.ini b/server/2015Remote/lang/en_US.ini index 47514b6..56947c8 100644 --- a/server/2015Remote/lang/en_US.ini +++ b/server/2015Remote/lang/en_US.ini @@ -2091,6 +2091,10 @@ HTTPS ¸߼¶(&A)=&Advanced Զ³Ì×ÀÃæÖÊÁ¿µȼ¶(&Q)=Remote Desktop &Quality Levels Զ³Ì×ÀÃæÖÊÁ¿µȼ¶=Remote Desktop Quality Levels +Զ³Ì×ÀÃæµ÷ÓÅ(&T)=Remote desktop tuning(&T) +x264 ÂëÂʷⶥ (VBV)=x264 bitrate cap (VBV) +GDI ץÆÁȥ·ֶÎÑÓʱ=GDI capture: no per-slice delay +·¢ËͽÚÁ÷֡ÂÊÏÂÏÞ=Send pacing FPS floor µȼ¶=Level ֡ÂÊ(FPS)=FPS ×î´ó¿í¶È=Max Width diff --git a/server/2015Remote/lang/zh_TW.ini b/server/2015Remote/lang/zh_TW.ini index 912805d..5023fdd 100644 --- a/server/2015Remote/lang/zh_TW.ini +++ b/server/2015Remote/lang/zh_TW.ini @@ -2084,6 +2084,10 @@ HTTPS ¸߼¶(&A)=ßMëA(&A) Զ³Ì×ÀÃæÖÊÁ¿µȼ¶(&Q)=ßh¶Ë×ÀÃæƷÙ|µȼ‰(&Q) Զ³Ì×ÀÃæÖÊÁ¿µȼ¶=ßh¶Ë×ÀÃæƷÙ|µȼ‰ +Զ³Ì×ÀÃæµ÷ÓÅ(&T)=ßh¶Ë×ÀÃæÕ{У(&T) +x264 ÂëÂʷⶥ (VBV)=x264 λԪÂÊÉÏÏÞ (VBV) +GDI ץÆÁȥ·ֶÎÑÓʱ=GDI ”Xȡȥ³ý·ֶÎÑÓßt +·¢ËͽÚÁ÷֡ÂÊÏÂÏÞ=‚÷Ë͹�Á÷Ӱ¸ñÂÊÏÂÏÞ µȼ¶=µȼ‰ ֡ÂÊ(FPS)=ެÂÊ(FPS) ×î´ó¿í¶È=×î´󌒶È diff --git a/server/2015Remote/resource.h b/server/2015Remote/resource.h index 536ead0..4877bd4 100644 --- a/server/2015Remote/resource.h +++ b/server/2015Remote/resource.h @@ -1122,6 +1122,10 @@ #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_EXIT_FULLSCREEN 40001 // Next default values for new objects @@ -1129,7 +1133,7 @@ #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 417 -#define _APS_NEXT_COMMAND_VALUE 33102 +#define _APS_NEXT_COMMAND_VALUE 33105 #define _APS_NEXT_CONTROL_VALUE 2621 #define _APS_NEXT_SYMED_VALUE 105 #endif