EncoderCaps::blends_cursor's contract said the HOST must fall back to capturer-side compositing when a cursor-as-metadata session lands on an encoder that can't composite — but that host half was never built: open_video warned and the session streamed WITHOUT a pointer (confirmed on the VAAPI dmabuf and libav-NVENC CUDA paths; latent on vulkan RGB-direct/native-NV12). The negotiation is now caps-aware, ahead of capture, on both planes: * pf-encode grows cursor_blend_capable() — the pre-open dispatch mirror (sibling of linux_native_nv12_ok) answering whether the resolved backend composites frame.cursor; its pure core is test-pinned arm by arm. * Native plane: handshake::cursor_forward grants the cursor channel only where the resolved backend can blend (the capture-mouse flip makes the host draw the pointer on demand); denied sessions keep the pre-channel path — the compositor EMBEDS the pointer, never cursorless, never doubled. The Welcome's HOST_CAP_CURSOR bit is computed once and read back at both session-wiring sites instead of recomputed. SessionPlan::output_format additionally keeps every cursor-blend session off producer-native NV12 (the arm with no CSC to fold a cursor into), and vulkan RGB-direct now yields to a cursor-blend session even when pinned (EFC cannot composite; the open logs the override). Windows plans cursor_blend=false via the new shared cursor_blend_for() rule — the IDD capturer composites the pointer itself, and asking the encoder anyway fired the blends-cursor warn spuriously on every cursor-channel session. * GameStream plane: the hardcoded cursor_blend=true is gone. The portal source asks for cursor-as-metadata only when the resolved backend blends, otherwise negotiates an Embedded pointer (choose_cursor_mode's new ladder); the capturer pool now also keys on that mode. The virtual-output source passes false — its capture embeds the pointer where it can. The per-arm warns in vulkan_video (RGB-direct, native-NV12) are now structurally unreachable and removed. open_video's post-open check stays as the single backstop for what planning cannot see: a Vulkan-open falling back to VAAPI mid-session, and the gamescope residual (no embedded mode exists there, so a never-blending backend — H.264-on-AMD VAAPI, software — still streams cursorless; fixing that needs a compositing stage, deliberately not built in this pass). Zero-copy is preserved throughout — every fallback is a capture-negotiation change, never a readback. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
267 lines
14 KiB
Rust
267 lines
14 KiB
Rust
//! `SessionPlan` — the per-session capture / topology / encoder decision, resolved **once** from
|
||
//! [`HostConfig`](crate::config) (+ the handshake-negotiated bit depth) into a typed, logged value.
|
||
//!
|
||
//! **Goal-1 stage 3** (`design/windows-host-rewrite.md` §2.2): before this, the Windows session decision was
|
||
//! re-derived at three call sites — the capture backend inside `capture::capture_virtual_output`, the
|
||
//! process topology in `native::should_use_helper`, and the encode backend in
|
||
//! `encode::windows_resolved_backend` — each reading [`config`](crate::config) independently, with no
|
||
//! single owner (the latent "capture and encode disagree on the backend" hazard, plan §2.4). `SessionPlan`
|
||
//! resolves them together, once, so the deployed path reads one typed artifact.
|
||
//!
|
||
//! Stage 3 routes the **capture** and **topology** decisions through the plan (see
|
||
//! `capture::capture_virtual_output` taking [`CaptureBackend`] in, and `virtual_stream` reading
|
||
//! [`SessionTopology`]). The **encoder** is resolved by `encode::windows_resolved_backend` (config-backed
|
||
//! and GPU-vendor cached since stage 2, so already a single source) and *recorded* here as
|
||
//! [`EncoderBackend`]. Threading `encoder`/`input_format` into the encoder + capturer opens — which
|
||
//! removes the `capture → encode::windows_resolved_backend()` back-reference recomputed in `dxgi.rs` —
|
||
//! is **stage 5**.
|
||
//!
|
||
//! The type is platform-neutral so it threads through the shared `virtual_stream`/`build_pipeline`
|
||
//! signatures; on Linux it resolves to the single portal/single-process path (the 3-way dispatch is a
|
||
//! Windows-only concern).
|
||
|
||
/// Where a session's frames come from.
|
||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||
pub enum CaptureBackend {
|
||
/// Linux: the xdg ScreenCast portal → PipeWire (the only Linux capture path).
|
||
Portal,
|
||
/// Windows: IDD direct-push — frames pulled straight from the pf-vdisplay driver's shared ring
|
||
/// (in-process, Session 0; captures the secure desktop too). The sole Windows capture path —
|
||
/// DXGI Desktop Duplication (DDA) and the WGC two-process relay were removed.
|
||
IddPush,
|
||
}
|
||
|
||
impl CaptureBackend {
|
||
/// Resolve the capture backend from [`config`](crate::config). This is the single resolver shared by
|
||
/// [`SessionPlan::resolve`] and the standalone callers (GameStream / spike), so they can't drift.
|
||
#[cfg(target_os = "linux")]
|
||
pub fn resolve() -> Self {
|
||
CaptureBackend::Portal
|
||
}
|
||
|
||
/// Windows: IDD direct-push is the sole capture path (DDA + the WGC two-process relay were removed).
|
||
#[cfg(target_os = "windows")]
|
||
pub fn resolve() -> Self {
|
||
CaptureBackend::IddPush
|
||
}
|
||
|
||
#[cfg(not(any(target_os = "linux", target_os = "windows")))]
|
||
pub fn resolve() -> Self {
|
||
CaptureBackend::Portal
|
||
}
|
||
}
|
||
|
||
/// How a session is structured across processes.
|
||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||
pub enum SessionTopology {
|
||
/// One process captures + encodes. The only topology: Linux (portal) and Windows (in-process
|
||
/// IDD-push in Session 0). The SYSTEM-host + user-session WGC relay was removed with DDA/WGC.
|
||
SingleProcess,
|
||
}
|
||
|
||
/// The resolved encode backend (recorded for logging / stages 4–5; the per-session encoder open still
|
||
/// resolves via `encode::windows_resolved_backend`, which is config-backed + GPU-vendor cached).
|
||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||
pub enum EncoderBackend {
|
||
/// Linux: NVENC vs VAAPI is auto-detected inside `encode::open_video` (not modeled here).
|
||
PlatformAuto,
|
||
Nvenc,
|
||
Amf,
|
||
Qsv,
|
||
Software,
|
||
}
|
||
|
||
impl EncoderBackend {
|
||
/// True if this backend encodes on the GPU (so the capturer should produce GPU-resident frames). Only
|
||
/// the software encoder takes CPU staging; `PlatformAuto` (Linux NVENC/VAAPI) is always GPU.
|
||
pub fn is_gpu(self) -> bool {
|
||
!matches!(self, EncoderBackend::Software)
|
||
}
|
||
}
|
||
|
||
/// The per-session decision, resolved once. `Copy` so it threads through the capture/encode chain
|
||
/// without ceremony (stage 4 folds it, with the rest of the arg soup, into a `SessionContext`).
|
||
#[derive(Clone, Copy, Debug)]
|
||
pub struct SessionPlan {
|
||
pub capture: CaptureBackend,
|
||
pub topology: SessionTopology,
|
||
pub encoder: EncoderBackend,
|
||
/// Handshake-negotiated encode bit depth (8, or 10 = HEVC Main10).
|
||
pub bit_depth: u8,
|
||
/// The IDD-push HDR hint (`bit_depth >= 10`) — the want-HDR flag handed to the capturer so it
|
||
/// proactively enables advanced color on the virtual display. The Linux NATIVE plane is 8-bit
|
||
/// (Mutter's virtual-monitor streams are SDR-only upstream — GNOME 50 HDR is monitor-mirror
|
||
/// only, which the GameStream portal path uses; see `capture::capturer_supports_hdr`).
|
||
pub hdr: bool,
|
||
/// Handshake-negotiated chroma subsampling (4:2:0, or full-chroma 4:4:4 when the client + host +
|
||
/// GPU all support it). Resolved before the Welcome; `Yuv420` on every backend that declined it.
|
||
pub chroma: crate::encode::ChromaFormat,
|
||
/// Handshake-negotiated video codec the encoder emits — HEVC by default, H.264 for a GPU-less
|
||
/// software host (`resolve_codec` over the client's advertised codecs ∩ the host's capability).
|
||
pub codec: crate::encode::Codec,
|
||
/// Datagram-aligned wire chunking for the encoder (plan §4.4): `Some(shard_payload)` on a
|
||
/// PyroWave session — applied to EVERY encoder this plan opens (initial + all rebuilds) so
|
||
/// AUs stay shard-aligned across mode/bitrate/stall rebuilds. `None` for the H.26x codecs.
|
||
pub wire_chunk: Option<usize>,
|
||
/// The session may hand the encoder cursor bitmaps to composite (cursor-as-metadata
|
||
/// captures). Set via [`cursor_blend_for`] — the single platform rule — so it is `true` only
|
||
/// where the ENCODER is the compositing stage (Linux cursor-forward and gamescope sessions);
|
||
/// Windows is always `false` (the IDD capturer composites the pointer itself). Encoders
|
||
/// whose fast path cannot blend (the Vulkan EFC RGB-direct source, native NV12) stay off
|
||
/// those shapes when this is set — see [`Self::output_format`] and
|
||
/// `encode::cursor_blend_capable`, the pre-open mirror that gates the cursor channel — so
|
||
/// the pointer never silently vanishes from the stream.
|
||
pub cursor_blend: bool,
|
||
/// The session negotiated the cursor-forward channel (M2/M2c): the client draws the pointer
|
||
/// locally, so `cursor_blend` is off AND (on Windows) the capturer sets the driver's
|
||
/// hardware cursor up via [`OutputFormat::hw_cursor`](pf_frame::OutputFormat).
|
||
pub cursor_forward: bool,
|
||
/// This is a gamescope session and its cursor comes from the XFixes source, NOT the
|
||
/// (absent) `SPA_META_Cursor` (remote-desktop-sweep Phase C). Distinct from `cursor_forward`:
|
||
/// gamescope can't embed the pointer OR carry the channel for a plain capture-mode client, so
|
||
/// the host ALWAYS composites the XFixes-sourced cursor into the video (`cursor_blend` is set
|
||
/// too). `build_pipeline` reads this to attach the XFixes reader to the capturer.
|
||
pub gamescope_cursor: bool,
|
||
}
|
||
|
||
impl SessionPlan {
|
||
/// Resolve the whole plan once from [`config`](crate::config) + the negotiated `bit_depth`,
|
||
/// `chroma`, and `codec`.
|
||
pub fn resolve(
|
||
bit_depth: u8,
|
||
chroma: crate::encode::ChromaFormat,
|
||
codec: crate::encode::Codec,
|
||
cursor_blend: bool,
|
||
cursor_forward: bool,
|
||
) -> Self {
|
||
SessionPlan {
|
||
capture: CaptureBackend::resolve(),
|
||
topology: resolve_topology(),
|
||
encoder: resolve_encoder(),
|
||
bit_depth,
|
||
hdr: bit_depth >= 10,
|
||
chroma,
|
||
codec,
|
||
wire_chunk: None,
|
||
cursor_blend,
|
||
cursor_forward,
|
||
// Set by the resolve callers (they know the compositor); default off keeps every
|
||
// non-gamescope plan unchanged.
|
||
gamescope_cursor: false,
|
||
}
|
||
}
|
||
|
||
/// The capturer's target output format (Goal-1 stage 5): `gpu` from the already-resolved `encoder`
|
||
/// (no second backend probe), `hdr` from the plan. Handed into `capture::capture_virtual_output` so the
|
||
/// capturer never re-derives the encode backend.
|
||
pub fn output_format(&self) -> crate::capture::OutputFormat {
|
||
let gpu = self.encoder.is_gpu();
|
||
// Linux NVENC 4:4:4: libavcodec `hevc_nvenc` only emits 4:4:4 from a YUV444 *input* frame —
|
||
// RGB-in is always subsampled to 4:2:0 (verified on the RTX 5070 Ti). With zero-copy
|
||
// enabled the import worker produces that input ON the GPU (`ImportKind::Tiled444` — the
|
||
// planar-YUV444 convert), so the session stays fully zero-copy at full chroma. Without
|
||
// zero-copy the encoder swscales CPU RGB → YUV444P, which needs CPU-resident frames —
|
||
// force the GPU capture off for that case only. (VAAPI 4:4:4, where the hardware supports
|
||
// it, keeps its dmabuf path via `scale_vaapi`; Windows NVENC ingests BGRA directly.)
|
||
#[cfg(target_os = "linux")]
|
||
let gpu = {
|
||
let force_cpu_for_nvenc_444 = self.chroma.is_444()
|
||
&& !crate::encode::linux_zero_copy_is_vaapi()
|
||
&& !crate::zerocopy::enabled();
|
||
if gpu && force_cpu_for_nvenc_444 {
|
||
// Surface the trade loudly: this is the single biggest per-frame cost a 4:4:4
|
||
// session adds (full-res CPU readback + swscale RGB→YUV444P every frame), and
|
||
// it looks like an unexplained fps ceiling if you don't know it happened.
|
||
tracing::warn!(
|
||
"4:4:4 session on the NVENC path without PUNKTFUNK_ZEROCOPY: zero-copy GPU \
|
||
capture DISABLED — every frame is CPU RGB + swscale RGB→YUV444P; expect a \
|
||
lower fps ceiling than 4:2:0 at this mode (set PUNKTFUNK_ZEROCOPY=1 for the \
|
||
GPU 4:4:4 convert)"
|
||
);
|
||
}
|
||
gpu && !force_cpu_for_nvenc_444
|
||
};
|
||
// PyroWave on Linux keeps `gpu = true`: the capture facade sees `pyrowave` below and
|
||
// routes the session onto the raw-dmabuf passthrough (the wavelet encoder's own Vulkan
|
||
// device imports the compositor's dmabuf on ANY vendor — `ZeroCopyPolicy::pyrowave_session`
|
||
// advertises its importable modifiers, so Mutter+NVIDIA negotiates tiled zero-copy instead
|
||
// of the old forced CPU-RGB readback). The EGL→CUDA importer is skipped there — its
|
||
// payloads only NVENC consumes.
|
||
crate::capture::OutputFormat {
|
||
gpu,
|
||
hdr: self.hdr,
|
||
hw_cursor: self.cursor_forward,
|
||
// 4:4:4 needs a full-chroma source: on Windows this keeps the capturer on RGB (not the
|
||
// default NV12/P010 video-engine output) so NVENC can CSC to 4:4:4.
|
||
chroma_444: self.chroma.is_444(),
|
||
// PyroWave: on Windows the IDD-push capturer makes its NV12 out-ring shareable + signals
|
||
// a shared fence so the wavelet encoder can zero-copy-import the texture into its own
|
||
// Vulkan device; on Linux the capture facade flips the zero-copy policy to the
|
||
// raw-dmabuf passthrough (see above).
|
||
pyrowave: self.codec == crate::encode::Codec::PyroWave,
|
||
// Producer-native NV12 (gamescope) is consumable only by the Linux Vulkan Video
|
||
// backend — resolved HERE from the plan's codec so the capturer never reaches back
|
||
// into encode (the same one-way edge as `gpu` above). BUT the native-NV12 encode path
|
||
// has no CSC stage to fold the cursor into — so ANY cursor-compositing session
|
||
// (gamescope Phase C, whose XFixes pointer is absent from the PipeWire node, AND a
|
||
// cursor-forward session, whose capture-mouse flip needs the host composite on
|
||
// demand) must capture RGB instead, routing to the compute-CSC / VkSlotBlend blend
|
||
// that draws `frame.cursor`. Costs the RGB→NV12 CSC we'd otherwise skip; the
|
||
// native-NV12 cursor blend is the perf-preserving follow-up. (`cursor_blend`
|
||
// subsumes `gamescope_cursor` — see [`cursor_blend_for`].)
|
||
#[cfg(target_os = "linux")]
|
||
nv12_native: crate::encode::linux_native_nv12_ok(self.codec) && !self.cursor_blend,
|
||
#[cfg(not(target_os = "linux"))]
|
||
nv12_native: false,
|
||
}
|
||
}
|
||
}
|
||
|
||
/// Process topology. Single-process is the only topology now: Linux (portal) and Windows (in-process
|
||
/// IDD-push in Session 0). The Windows SYSTEM-host + user-session WGC relay was removed with DDA/WGC.
|
||
pub(crate) fn resolve_topology() -> SessionTopology {
|
||
SessionTopology::SingleProcess
|
||
}
|
||
|
||
/// THE rule for [`SessionPlan::cursor_blend`], shared by every resolve caller (initial plan and
|
||
/// the mid-stream compositor re-gate) so they can't drift:
|
||
/// * **Linux**: the encoder is the compositing stage — blend for a cursor-forward session (the
|
||
/// capture-mouse flip needs the host composite on demand) and for gamescope (its capture
|
||
/// carries no pointer at all; the XFixes-sourced cursor must be drawn into the video).
|
||
/// * **Windows**: never — the IDD capturer composites the pointer itself (`cursor_blend.rs` /
|
||
/// DWM), and no Windows encode backend reads `frame.cursor`. Asking the encoder anyway made
|
||
/// `open_video`'s blends-cursor backstop fire spuriously on every cursor-channel session.
|
||
pub(crate) fn cursor_blend_for(cursor_forward: bool, gamescope: bool) -> bool {
|
||
#[cfg(target_os = "windows")]
|
||
{
|
||
let _ = (cursor_forward, gamescope);
|
||
false
|
||
}
|
||
#[cfg(not(target_os = "windows"))]
|
||
{
|
||
cursor_forward || gamescope
|
||
}
|
||
}
|
||
|
||
#[cfg(target_os = "windows")]
|
||
fn resolve_encoder() -> EncoderBackend {
|
||
match crate::encode::windows_resolved_backend() {
|
||
crate::encode::WindowsBackend::Nvenc => EncoderBackend::Nvenc,
|
||
crate::encode::WindowsBackend::Amf => EncoderBackend::Amf,
|
||
crate::encode::WindowsBackend::Qsv => EncoderBackend::Qsv,
|
||
crate::encode::WindowsBackend::Software => EncoderBackend::Software,
|
||
}
|
||
}
|
||
|
||
#[cfg(not(target_os = "windows"))]
|
||
fn resolve_encoder() -> EncoderBackend {
|
||
// `PUNKTFUNK_ENCODER=software` forces the GPU-less openh264 path — which must take CPU-staged
|
||
// capture (`EncoderBackend::Software.is_gpu() == false` → `output_format().gpu = false`), so the
|
||
// portal capturer delivers CPU RGB. Everything else stays `PlatformAuto` (NVENC/VAAPI resolved
|
||
// inside `encode::open_video`).
|
||
match pf_host_config::config().encoder_pref.as_str() {
|
||
"software" | "sw" | "openh264" => EncoderBackend::Software,
|
||
_ => EncoderBackend::PlatformAuto,
|
||
}
|
||
}
|