fix(client): fix DXGI black screen on rotated displays and slow first frame
1. Black screen on rotated displays Root cause: with DXGI Desktop Duplication on a rotated output, DXGI_OUTDUPL_DESC.ModeDesc reports the logical desktop size (e.g. 1440x2560) while the surface returned by AcquireNextFrame is the unrotated landscape bitmap (2560x1440). The old code created cpuTexture from the ModeDesc size. On a mismatch ID3D11DeviceContext::CopyResource returns void and silently copies nothing, leaving the destination texture all zeros, so the first screen and every H.264 frame were fully black (IDR was only 5KB). The GDI path does not go through DXGI and was unaffected; the web client uses the DIFF algorithm and was hit too, but looked different. Fixes: - Create cpuTexture from the real D3D11_TEXTURE2D_DESC; when the probe fails, derive the real surface size from Rotation instead of falling back to ModeDesc, which would reintroduce the black screen - Add BlitRotated() to upright the image for ROTATE90/180/270, with a whole-row memcpy fast path for IDENTITY; m_ulFullWidth/Height now hold the upright logical size - Treat DXGI_ERROR_WAIT_TIMEOUT as "no new frame" instead of a failure, so a static desktop reuses the previous frame instead of always returning nullptr - GetFirstScreenData: fix the write offset (start at +1, previously the color channels were all wrong) and report the scaled size instead of the full size, which used to send about 8.5MB of garbage - Validate the frame format against a whitelist; fall back to BGRA and warn for formats that are not 4 bytes per pixel 2. Slow first frame (the probe frame consumed the initial frame) Root cause: the probe frame AcquireNextFrame(500), added to read the real texture description, was released right after use and therefore discarded. But the frame DXGI pushes after DuplicateOutput is often the only frame available on a static desktop. After discarding it, the first-screen AcquireNextFrame always timed out (and that timeout was 1000ms at the time), ScreenManager had already set m_SendFirst = TRUE so it never retried, and the encoder had no input to produce an IDR, so the picture only appeared once the desktop changed. Symptom: MDLL/EXE builds with this fix took a long time to show the remote desktop, while the old build without the probe frame was fast. Fixes: - Keep the probe frame: stash it in m_probeRes without calling ReleaseFrame and let the new ConsumeProbeFrame() fill the first screen once the buffers are allocated, so the first screen no longer depends on the desktop changing - Probe timeout 500 -> 200ms; verify both size and format of the probe frame against cpuTexture and skip consumption on mismatch, otherwise a silently failed CopyResource would be taken as a valid all-black first screen - CaptureFrame: drop "reuseOk ? 100 : 1000" and use a fixed 100ms timeout. The AcquireNextFrame timeout is an upper bound rather than a fixed wait, and blocking on a static desktop only slowed the capture loop down to 1Hz - Retry the first screen up to 3 times on "no new frame" (100ms timeout plus a 20ms gap); skip the capture entirely when the probe frame already filled it - Release m_probeRes in CleanupDXGI and ReinitDuplication so the duplication object can be released 3. Incomplete picture - Add ScreenCapture::FitDefaultSendSize(), which scales proportionally so the long edge stays at or below 1920 and the short edge at or below 1080, for both landscape and portrait. The old min(1920,w) and min(1080,h) clamped the axes independently and broke the aspect ratio: a 1440x2560 portrait desktop was squeezed to 1440x1080, keeping only 42% of the height - Use the same helper for both the GDI and DXGI paths; common landscape resolutions (1920x1080, 2560x1440, 3840x2160, 1280x720) are unchanged 4. Incidental fixes - CaptureFrame leaked desktopResource when QueryInterface failed, one DXGI resource per failure - Drop the frame and warn when the surface size changes, for example after the user changed the resolution, so BlitRotated does not read out of bounds using stale sizes
This commit is contained in:
1 parent
46f4bf2dfb
commit
bc75e1ae99
3 files changed
+304
-34
No files matched your search
@@ -66,9 +66,8 @@ CScreenSpy::CScreenSpy(ULONG ulbiBitCount, BYTE algo, BOOL vDesk, int gop, BOOL
|
||||
Mprintf("CScreenSpy: 自定义分辨率 %dx%d\n",
|
||||
m_BitmapInfor_Send->bmiHeader.biWidth, m_BitmapInfor_Send->bmiHeader.biHeight);
|
||||
} else {
|
||||
// strategy=0 或 maxWidth=0: 默认 1080p 限制
|
||||
m_BitmapInfor_Send->bmiHeader.biWidth = min(1920, m_BitmapInfor_Send->bmiHeader.biWidth);
|
||||
m_BitmapInfor_Send->bmiHeader.biHeight = min(1080, m_BitmapInfor_Send->bmiHeader.biHeight);
|
||||
// strategy=0 或 maxWidth=0: 默认 1080p 限制(等比,避免竖屏被压扁)
|
||||
FitDefaultSendSize(m_BitmapInfor_Send->bmiHeader.biWidth, m_BitmapInfor_Send->bmiHeader.biHeight);
|
||||
m_BitmapInfor_Send->bmiHeader.biSizeImage =
|
||||
((m_BitmapInfor_Send->bmiHeader.biWidth * m_BitmapInfor_Send->bmiHeader.biBitCount + 31) / 32) *
|
||||
4 * m_BitmapInfor_Send->bmiHeader.biHeight;
|
||||
|
||||
Reference in new issue
Block a user