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.
75 lines
2.8 KiB
C++
75 lines
2.8 KiB
C++
#include "EncoderFactory.h"
|
||
#include "common/config.h"
|
||
#include "common/logger.h"
|
||
#include "X264Encoder.h"
|
||
// 合规守护:DISABLE_FFMPEG_FOR_TEST=1 时硬编实现整体移出工程,仅保留 x264 软编路径
|
||
#if defined(_WIN64) && !DISABLE_FFMPEG_FOR_TEST
|
||
#include "CFFmpegH264Encoder.h"
|
||
#include "CFFmpegAV1Encoder.h"
|
||
#endif
|
||
|
||
namespace {
|
||
// 与 ScreenCapture::BitRateToCRF 同步:码率越高 CRF 越低(质量更好)。
|
||
// 仅 x264 软编路径用,硬编路径直接用 bitrate_kbps 走 CBR。
|
||
int BitRateToCRF(int bitRate) {
|
||
if (bitRate <= 0) return 23;
|
||
if (bitRate >= 3000) return 20;
|
||
if (bitRate >= 2000) return 20 + (3000 - bitRate) * 3 / 1000;
|
||
if (bitRate >= 800) return 23 + (2000 - bitRate) * 7 / 1200;
|
||
return 32;
|
||
}
|
||
}
|
||
|
||
std::unique_ptr<VideoEncoderBase> CreateEncoder(const EncoderRequest& req) {
|
||
EncoderParams p;
|
||
p.width = req.width;
|
||
p.height = req.height;
|
||
p.fps = req.fps;
|
||
|
||
#if defined(_WIN64) && !DISABLE_FFMPEG_FOR_TEST
|
||
// AV1 硬编路径(仅当客户端声明支持 AV1 解码)
|
||
// 硬件门槛高:仅 RTX 40+ / RX 7000+ / Intel Arc 才有 av1 encoder ASIC;
|
||
// 没合适硬件时 open() 全部失败,自然 fall through 到下面 H.264 路径。
|
||
if (req.encodeLevel >= LEVEL_AV1_HARD) {
|
||
auto enc = std::make_unique<CFFmpegAV1Encoder>();
|
||
p.rc = RateControl::BITRATE;
|
||
p.bitrate_kbps = req.bitrate_kbps;
|
||
if (enc->open(p)) {
|
||
Mprintf("=> encoder: %s (HW AV1, bitrate=%dk)\n", enc->backendName(), req.bitrate_kbps);
|
||
return enc;
|
||
}
|
||
Mprintf("=> all AV1 HW backends failed, falling back to H.264\n");
|
||
}
|
||
|
||
|
||
// H.264 硬编:CFFmpegH264Encoder 内部按 nvenc/qsv/amf/mf 顺序探
|
||
if (req.encodeLevel >= LEVEL_H264_HARD) {
|
||
auto enc = std::make_unique<CFFmpegH264Encoder>();
|
||
p.rc = RateControl::BITRATE;
|
||
p.bitrate_kbps = req.bitrate_kbps;
|
||
if (enc->open(p)) {
|
||
Mprintf("=> encoder: %s (HW, bitrate=%dk)\n", enc->backendName(), req.bitrate_kbps);
|
||
return enc;
|
||
}
|
||
Mprintf("=> all H.264 HW backends failed, falling back to x264\n");
|
||
}
|
||
#endif
|
||
|
||
// x264 软编兜底(无硬件 / 全失败 / 虚拟机 / 远程桌面会话场景)
|
||
if (req.encodeLevel >= LEVEL_H264_SOFT) {
|
||
auto enc = std::make_unique<CX264Encoder>();
|
||
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%s)\n", enc->backendName(), p.crf,
|
||
p.vbv_cap ? ", vbv capped" : "");
|
||
return enc;
|
||
}
|
||
}
|
||
|
||
Mprintf("=> ERROR: no encoder could be opened\n");
|
||
return nullptr;
|
||
}
|