d2daeacc60
ci / web (push) Successful in 52s
apple / swift (push) Successful in 1m13s
ci / docs-site (push) Successful in 1m11s
ci / bench (push) Successful in 5m35s
apple / screenshots (push) Successful in 6m28s
docker / build-push (--build-arg FEDORA_VERSION=44, ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora44-rpm) (push) Successful in 12s
decky / build-publish (push) Successful in 29s
docker / build-push (., web/Dockerfile, punktfunk-web) (push) Successful in 11s
docker / build-push (ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora-rpm) (push) Successful in 10s
docker / build-push (ci, ci/rust-ci-noble.Dockerfile, punktfunk-rust-ci-noble) (push) Successful in 9s
docker / build-push (ci, ci/rust-ci.Dockerfile, punktfunk-rust-ci) (push) Successful in 10s
docker / build-push (docs-site, docs-site/Dockerfile, punktfunk-docs) (push) Successful in 12s
android / android (push) Successful in 13m34s
deb / build-publish (push) Successful in 9m10s
deb / build-publish-host (push) Successful in 9m26s
arch / build-publish (push) Successful in 17m58s
windows-host / package (push) Successful in 16m40s
ci / rust (push) Successful in 29m45s
rpm / build-publish (43, bazzite, punktfunk-fedora-rpm) (push) Successful in 20m12s
rpm / build-publish (44, fedora-44, punktfunk-fedora44-rpm) (push) Successful in 20m8s
docker / deploy-docs (push) Successful in 28s
A PyroWave session on an NVIDIA-auto host was forced onto CPU-RGB capture
(session_plan flipped gpu=false): Mutter blits tiled->LINEAR, we mmap +
de-pad ~30 MB, the encoder re-uploads it - three full-frame CPU touches
per frame at 5120x1440 while an HEVC session on the same box rides the
tiled EGL/CUDA zero-copy. The dmabuf passthrough + Vulkan tiled import
were already validated (8dc5d672) but only reachable via the global
PUNKTFUNK_ENCODER=pyrowave lab policy.
ZeroCopyPolicy gains pyrowave_session (from OutputFormat.pyrowave, i.e.
the negotiated codec): the capturer skips the NVENC-only EGL->CUDA
importer, takes the raw-dmabuf passthrough, and advertises the wavelet
encoder's Vulkan-importable modifiers so Mutter+NVIDIA negotiates tiled
zero-copy. The forced-CPU flip in session_plan is gone.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
174 lines
8.7 KiB
Rust
174 lines
8.7 KiB
Rust
//! Frame capture facade (plan §7 / §W6). The capturers themselves live in the `pf-capture`
|
|
//! subsystem crate; this host module is the thin BRIDGE that (a) re-exports the shared frame
|
|
//! vocabulary + the capturer types so every `crate::capture::*` path is unchanged, and (b) keeps
|
|
//! the orchestration entry points — [`open_portal_monitor`] / [`capture_virtual_output`] — which
|
|
//! know about `crate::{vdisplay, session_plan, inject, encode}` and hand pf-capture the pre-resolved
|
|
//! facts it needs (the [`pf_capture::ZeroCopyPolicy`] and, on Windows, the
|
|
//! [`pf_capture::FrameChannelSender`]) so the capturer never reaches back into the orchestrator.
|
|
|
|
use anyhow::Result;
|
|
|
|
// The shared frame vocabulary lives in `pf-frame`; re-export the pieces host modules still name via
|
|
// `crate::capture::*` (the capture mechanics that used the rest moved into pf-capture).
|
|
pub use pf_frame::{CapturedFrame, OutputFormat, PixelFormat};
|
|
// The capturer types + trait + synthetics live in `pf-capture`; re-export them at the old paths.
|
|
pub use pf_capture::{
|
|
capturer_supports_444, capturer_supports_hdr, Capturer, FastSyntheticCapturer,
|
|
SyntheticCapturer,
|
|
};
|
|
// `crate::capture::dxgi::{install_gpu_pref_hook, hdr_p010_selftest}` (main.rs subcommands) and
|
|
// `crate::capture::synthetic_nv12` resolve through pf-capture's Windows modules.
|
|
#[cfg(target_os = "windows")]
|
|
pub use pf_capture::{dxgi, synthetic_nv12};
|
|
|
|
/// Resolve the [`pf_capture::ZeroCopyPolicy`] for a Linux capture session from the encode backend —
|
|
/// the one reach into `crate::encode` the capturer must NOT make itself (it would recreate the
|
|
/// capture→encode cycle). Resolved here (the host facade) and threaded in, so the edge stays one-way
|
|
/// (plan §2.4 / §W6).
|
|
#[cfg(target_os = "linux")]
|
|
fn zero_copy_policy(pyrowave_session: bool) -> pf_capture::ZeroCopyPolicy {
|
|
let backend_is_vaapi = crate::encode::linux_zero_copy_is_vaapi();
|
|
// The raw-dmabuf passthrough serves a PyroWave session on ANY vendor (the wavelet encoder's
|
|
// own Vulkan device imports the dmabuf) — per-session from the negotiated codec, plus the
|
|
// global `PUNKTFUNK_ENCODER=pyrowave` lab lever (which also flips `backend_is_vaapi`).
|
|
#[cfg(feature = "pyrowave")]
|
|
let pyrowave_session =
|
|
pyrowave_session || pf_host_config::config().encoder_pref.as_str() == "pyrowave";
|
|
#[cfg(not(feature = "pyrowave"))]
|
|
let pyrowave_session = {
|
|
let _ = pyrowave_session;
|
|
false
|
|
};
|
|
#[cfg(feature = "pyrowave")]
|
|
let pyrowave_modifiers = if pyrowave_session {
|
|
// BGRx is the capture path's canonical packed-RGB format (the modifier advertisement keys
|
|
// on it). `drm_fourcc(Bgrx)` is always `Some`.
|
|
pf_frame::drm_fourcc(PixelFormat::Bgrx)
|
|
.map(crate::encode::pyrowave_capture_modifiers)
|
|
.unwrap_or_default()
|
|
} else {
|
|
Vec::new()
|
|
};
|
|
#[cfg(not(feature = "pyrowave"))]
|
|
let pyrowave_modifiers = Vec::new();
|
|
pf_capture::ZeroCopyPolicy {
|
|
backend_is_vaapi,
|
|
backend_is_gpu: crate::encode::resolved_backend_is_gpu(),
|
|
pyrowave_session,
|
|
pyrowave_modifiers,
|
|
}
|
|
}
|
|
|
|
/// Open a live capturer for a client-sized monitor via the xdg ScreenCast portal. `want_hdr`
|
|
/// offers the GNOME 50+ 10-bit PQ/BT.2020 formats (pass it only when the session negotiated HDR
|
|
/// AND the mirrored monitor is in HDR mode — see [`pf_capture::gnome_hdr_monitor_active`]).
|
|
#[cfg(target_os = "linux")]
|
|
pub fn open_portal_monitor(want_hdr: bool) -> Result<Box<dyn Capturer>> {
|
|
// On RemoteDesktop-capable desktops (KWin/GNOME) anchor ScreenCast to a RemoteDesktop
|
|
// session so it inherits that grant headlessly; wlroots/Sway has no RemoteDesktop portal,
|
|
// so use a plain ScreenCast session there.
|
|
let anchored = crate::inject::default_backend() == crate::inject::Backend::Libei;
|
|
// Monitor mirrors never carry the native PyroWave plane (GameStream protocol) — per-session
|
|
// passthrough is virtual-output-only; the global encoder-pref lever still applies inside.
|
|
pf_capture::open_portal_monitor(anchored, want_hdr, zero_copy_policy(false))
|
|
}
|
|
|
|
#[cfg(not(target_os = "linux"))]
|
|
pub fn open_portal_monitor(_want_hdr: bool) -> Result<Box<dyn Capturer>> {
|
|
anyhow::bail!("portal capture requires Linux (xdg-desktop-portal + PipeWire)")
|
|
}
|
|
|
|
/// Build a capturer from an already-created virtual output ([`crate::vdisplay::VirtualOutput`]).
|
|
/// Explodes the output into the primitives pf-capture needs (so the capturer never depends on the
|
|
/// vdisplay type); the capturer takes the keepalive, so dropping it releases the output.
|
|
#[cfg(target_os = "linux")]
|
|
pub fn capture_virtual_output(
|
|
vout: crate::vdisplay::VirtualOutput,
|
|
want: OutputFormat,
|
|
_capture: crate::session_plan::CaptureBackend,
|
|
) -> Result<Box<dyn Capturer>> {
|
|
// The Linux NATIVE plane stays 8-bit (Mutter's virtual-monitor streams are SDR-only upstream;
|
|
// the GNOME 50+ HDR path is monitor-mirror only — `open_portal_monitor`) and the portal
|
|
// negotiates its own pixel format, so `want.gpu` gates GPU zero-copy capture (the capture
|
|
// backend is always the portal — the `CaptureBackend` arg is a Windows-only dispatch) and
|
|
// `want.chroma_444` selects the worker's planar-YUV444 GPU convert. `gpu = false` (4:4:4
|
|
// without zero-copy) forces the CPU mmap path so the encoder gets CPU-resident RGB to swscale
|
|
// into YUV444P.
|
|
pf_capture::open_virtual_output(
|
|
vout.remote_fd,
|
|
vout.node_id,
|
|
vout.preferred_mode,
|
|
vout.keepalive,
|
|
want.gpu,
|
|
want.chroma_444,
|
|
zero_copy_policy(want.pyrowave),
|
|
)
|
|
}
|
|
|
|
#[cfg(target_os = "windows")]
|
|
pub fn capture_virtual_output(
|
|
vout: crate::vdisplay::VirtualOutput,
|
|
want: OutputFormat,
|
|
_capture: crate::session_plan::CaptureBackend,
|
|
) -> Result<Box<dyn Capturer>> {
|
|
let target = vout.win_capture.clone().ok_or_else(|| {
|
|
anyhow::anyhow!(
|
|
"pf-vdisplay target not yet an active display path (activation failed — see the \
|
|
virtual-display warnings above)"
|
|
)
|
|
})?;
|
|
let pref = vout.preferred_mode;
|
|
let keep = vout.keepalive;
|
|
// The sealed-channel delivery seam: resolve the pf-vdisplay control device ONCE (it is
|
|
// process-global — a dead one is retired, kept alive — so the raw value is stable for the
|
|
// process) and wrap `send_frame_channel` in a `Send + Sync` closure the IDD-push capturer calls
|
|
// at ring attach. This is the ONE reach into `crate::vdisplay` the capturer would otherwise make;
|
|
// building it here keeps the capture→vdisplay dependency out of pf-capture (plan §W6).
|
|
let control = crate::vdisplay::manager::control_device_handle().ok_or_else(|| {
|
|
anyhow::anyhow!(
|
|
"pf-vdisplay control device not open (monitor not created via the manager?)"
|
|
)
|
|
})?;
|
|
// `HANDLE` is not `Send`; capture the raw value and rebuild it inside the closure (the control
|
|
// device is never closed for the process lifetime, so the value stays valid).
|
|
let control_raw = control.0 as isize;
|
|
let sender: pf_capture::FrameChannelSender = std::sync::Arc::new(
|
|
move |req: &pf_driver_proto::control::SetFrameChannelRequest| {
|
|
// SAFETY: `control_raw` is the pf-vdisplay control handle resolved above; it is never
|
|
// closed for the process lifetime, so reconstructing the `HANDLE` and issuing the
|
|
// `IOCTL_SET_FRAME_CHANNEL` is sound (`send_frame_channel`'s precondition).
|
|
unsafe {
|
|
crate::vdisplay::driver::send_frame_channel(
|
|
windows::Win32::Foundation::HANDLE(control_raw as *mut core::ffi::c_void),
|
|
req,
|
|
)
|
|
}
|
|
},
|
|
);
|
|
// IDD direct-push is the sole Windows capture path: consume frames straight from the pf-vdisplay
|
|
// driver's shared ring (in-process, Session 0 — it captures the secure desktop too; no Desktop
|
|
// Duplication, no WGC helper). A FRESH monitor + ring is created per session. `want.hdr`
|
|
// proactively enables advanced color and selects the per-frame conversion. There is NO fallback:
|
|
// if it can't open or the driver doesn't attach, the session fails cleanly and the client
|
|
// reconnects.
|
|
pf_capture::open_idd_push(
|
|
target,
|
|
pref,
|
|
want.hdr,
|
|
want.chroma_444,
|
|
want.pyrowave,
|
|
keep,
|
|
sender,
|
|
)
|
|
.map_err(|(e, _keep)| e.context("IDD-push capture open (no fallback)"))
|
|
}
|
|
|
|
#[cfg(not(any(target_os = "linux", target_os = "windows")))]
|
|
pub fn capture_virtual_output(
|
|
_vout: crate::vdisplay::VirtualOutput,
|
|
_want: OutputFormat,
|
|
_capture: crate::session_plan::CaptureBackend,
|
|
) -> Result<Box<dyn Capturer>> {
|
|
anyhow::bail!("virtual-output capture requires Linux or Windows")
|
|
}
|