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
This commit is contained in:
yuanyuanxianganddeepseek-flash committed 2026-11-07 14:11:47 +01:00
1 parent f96e4a7320
commit a190c21217
12 files changed
+216 -156

No files matched your search

+34 -9
View File
@@ -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;
}