feat(host,clients): PyroWave ships in default builds; NVIDIA hosts advertise it
windows-msix / package (arm64, C:\Users\Public\ffmpeg-arm64, --no-default-features, aarch64-pc-windows-msvc, C:\t-a64) (push) Successful in 4m7s
windows-msix / package (x64, C:\Users\Public\ffmpeg, , x86_64-pc-windows-msvc, C:\t) (push) Successful in 4m14s
windows / build (aarch64-pc-windows-msvc) (push) Successful in 5m16s
ci / web (push) Successful in 55s
ci / docs-site (push) Successful in 1m7s
decky / build-publish (push) Successful in 19s
docker / build-push (--build-arg FEDORA_VERSION=44, ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora44-rpm) (push) Successful in 9s
docker / build-push (., web/Dockerfile, punktfunk-web) (push) Successful in 9s
docker / build-push (ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora-rpm) (push) Successful in 8s
docker / build-push (ci, ci/rust-ci.Dockerfile, punktfunk-rust-ci) (push) Successful in 7s
android / android (push) Successful in 12m17s
docker / build-push (docs-site, docs-site/Dockerfile, punktfunk-docs) (push) Successful in 51s
windows / build (x86_64-pc-windows-msvc) (push) Successful in 6m28s
arch / build-publish (push) Successful in 13m54s
ci / bench (push) Successful in 6m18s
docker / deploy-docs (push) Successful in 22s
flatpak / build-publish (push) Successful in 6m50s
apple / swift (push) Successful in 5m8s
deb / build-publish (push) Successful in 12m0s
ci / rust (push) Successful in 24m15s
rpm / build-publish (43, bazzite, punktfunk-fedora-rpm) (push) Successful in 13m2s
rpm / build-publish (44, fedora-44, punktfunk-fedora44-rpm) (push) Successful in 14m29s
windows-host / package (push) Successful in 16m45s
apple / screenshots (push) Successful in 23m19s
windows-msix / package (arm64, C:\Users\Public\ffmpeg-arm64, --no-default-features, aarch64-pc-windows-msvc, C:\t-a64) (push) Successful in 4m7s
windows-msix / package (x64, C:\Users\Public\ffmpeg, , x86_64-pc-windows-msvc, C:\t) (push) Successful in 4m14s
windows / build (aarch64-pc-windows-msvc) (push) Successful in 5m16s
ci / web (push) Successful in 55s
ci / docs-site (push) Successful in 1m7s
decky / build-publish (push) Successful in 19s
docker / build-push (--build-arg FEDORA_VERSION=44, ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora44-rpm) (push) Successful in 9s
docker / build-push (., web/Dockerfile, punktfunk-web) (push) Successful in 9s
docker / build-push (ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora-rpm) (push) Successful in 8s
docker / build-push (ci, ci/rust-ci.Dockerfile, punktfunk-rust-ci) (push) Successful in 7s
android / android (push) Successful in 12m17s
docker / build-push (docs-site, docs-site/Dockerfile, punktfunk-docs) (push) Successful in 51s
windows / build (x86_64-pc-windows-msvc) (push) Successful in 6m28s
arch / build-publish (push) Successful in 13m54s
ci / bench (push) Successful in 6m18s
docker / deploy-docs (push) Successful in 22s
flatpak / build-publish (push) Successful in 6m50s
apple / swift (push) Successful in 5m8s
deb / build-publish (push) Successful in 12m0s
ci / rust (push) Successful in 24m15s
rpm / build-publish (43, bazzite, punktfunk-fedora-rpm) (push) Successful in 13m2s
rpm / build-publish (44, fedora-44, punktfunk-fedora44-rpm) (push) Successful in 14m29s
windows-host / package (push) Successful in 16m45s
apple / screenshots (push) Successful in 23m19s
Flip the `pyrowave` cargo feature into the default set across punktfunk-host, pf-client-core, pf-presenter and the session client — every packaged build (flatpak, arch/rpm/copr, windows x64 client) now carries the codec. Selection stays strictly per-session opt-in: a client must pick "PyroWave (wired LAN)" in Settings (or PUNKTFUNK_PREFER_PYROWAVE=1); nothing changes for normal HEVC/AV1 sessions. The Windows ARM64 client leg builds --no-default-features and keeps skipping it (decode is Linux-native + Apple Metal today). Advertisement no longer waits for the PUNKTFUNK_ENCODER=pyrowave lab override on NVIDIA: host_wire_caps sets the bit whenever the feature is present and the host isn't the GPU-less software pref, and SessionPlan::output_format flips a PyroWave session on the NVIDIA-auto capture path to CPU RGB frames (the EGL→CUDA import only NVENC consumes; the wavelet backend ingests raw dmabufs or CPU RGB). AMD/Intel keep their raw-dmabuf zero-copy unchanged; per-session raw-dmabuf passthrough on NVIDIA (true zero-copy without the env's global capture policy) stays a follow-up. On-glass on .21 (RTX 5070 Ti, default-features binaries, NO env overrides): host advertises + negotiates PyroWave, the CPU-capture fallback engages, 60 fps at e2e 3.2-5.7 ms p50, and a mid-stream 1080p→720p resize rides on top cleanly. Workspace clippy --locked clean; 33 client + 314 host tests. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -13,9 +13,11 @@ name = "punktfunk-session"
|
|||||||
path = "src/main.rs"
|
path = "src/main.rs"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
default = ["ui"]
|
default = ["ui", "pyrowave"]
|
||||||
# PyroWave client decode (the opt-in wired-LAN wavelet codec) — enables the decode
|
# PyroWave client decode (the wired-LAN wavelet codec) — enables the decode backend + the
|
||||||
# backend + the planar present path; runtime opt-in stays PUNKTFUNK_PREFER_PYROWAVE=1.
|
# planar present path. ON by default; each session still opts in explicitly (the Settings
|
||||||
|
# codec pick, or PUNKTFUNK_PREFER_PYROWAVE=1). The Windows ARM64 leg builds
|
||||||
|
# --no-default-features and so skips it (video decode is Linux-only anyway).
|
||||||
pyrowave = ["pf-client-core/pyrowave", "pf-presenter/pyrowave"]
|
pyrowave = ["pf-client-core/pyrowave", "pf-presenter/pyrowave"]
|
||||||
# The Skia console UI (stats OSD, capture HUD, later the gamepad library). Dropping it
|
# The Skia console UI (stats OSD, capture HUD, later the gamepad library). Dropping it
|
||||||
# (`--no-default-features`) is the ~15 MB-smaller power-user build: same streaming,
|
# (`--no-default-features`) is the ~15 MB-smaller power-user build: same streaming,
|
||||||
|
|||||||
@@ -64,6 +64,8 @@ windows = { git = "https://github.com/microsoft/windows-rs", rev = "a4f7b2cb7c63
|
|||||||
] }
|
] }
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
# PyroWave client decode — OFF by default (the flatpak/default builds stay unchanged);
|
# PyroWave client decode ships in every default build (flatpak included; pyrowave-sys is a
|
||||||
# the Linux session client turns it on together with the host-side feature.
|
# vendored in-repo tree, offline-safe, and an empty stub off Linux/Windows). The codec is
|
||||||
|
# still strictly per-session opt-in (Settings codec pick / PUNKTFUNK_PREFER_PYROWAVE=1).
|
||||||
|
default = ["pyrowave"]
|
||||||
pyrowave = ["dep:pyrowave-sys", "dep:ash"]
|
pyrowave = ["dep:pyrowave-sys", "dep:ash"]
|
||||||
|
|||||||
@@ -46,5 +46,6 @@ windows-sys = { version = "0.61", features = [
|
|||||||
|
|
||||||
[features]
|
[features]
|
||||||
# PyroWave planar present path (the wired-LAN wavelet codec) — forwards to the decode
|
# PyroWave planar present path (the wired-LAN wavelet codec) — forwards to the decode
|
||||||
# backend in pf-client-core; OFF by default.
|
# backend in pf-client-core; ON by default, matching pf-client-core's default.
|
||||||
|
default = ["pyrowave"]
|
||||||
pyrowave = ["pf-client-core/pyrowave"]
|
pyrowave = ["pf-client-core/pyrowave"]
|
||||||
|
|||||||
@@ -251,6 +251,9 @@ pf-driver-proto = { path = "../pf-driver-proto" }
|
|||||||
bytemuck = { version = "1.19", features = ["derive"] }
|
bytemuck = { version = "1.19", features = ["derive"] }
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
|
# PyroWave ships in every default build (the codec stays strictly opt-in per session — a client
|
||||||
|
# must explicitly prefer CODEC_PYROWAVE; nothing changes for normal HEVC/AV1 sessions).
|
||||||
|
default = ["pyrowave"]
|
||||||
# NVENC hardware encode (Windows). OFF by default (it pulls the NVENC SDK crate); nothing is
|
# NVENC hardware encode (Windows). OFF by default (it pulls the NVENC SDK crate); nothing is
|
||||||
# needed at link time — the entry points are resolved at RUNTIME from the driver's
|
# needed at link time — the entry points are resolved at RUNTIME from the driver's
|
||||||
# nvEncodeAPI64.dll (encode/windows/nvenc.rs `load_api`), so the same binary starts fine on
|
# nvEncodeAPI64.dll (encode/windows/nvenc.rs `load_api`), so the same binary starts fine on
|
||||||
@@ -269,9 +272,9 @@ amf-qsv = ["dep:ffmpeg-next"]
|
|||||||
# PUNKTFUNK_VULKAN_ENCODE (opt-in for now). Build the AMD/Intel RFI host with `--features vulkan-encode`.
|
# PUNKTFUNK_VULKAN_ENCODE (opt-in for now). Build the AMD/Intel RFI host with `--features vulkan-encode`.
|
||||||
vulkan-encode = []
|
vulkan-encode = []
|
||||||
# PyroWave — the opt-in wired-LAN intra-only wavelet codec (design/pyrowave-codec-plan.md).
|
# PyroWave — the opt-in wired-LAN intra-only wavelet codec (design/pyrowave-codec-plan.md).
|
||||||
# Builds the vendored codec from source (crates/pyrowave-sys, CMake + bindgen; Linux/Windows).
|
# Builds the vendored codec from source (crates/pyrowave-sys, CMake + bindgen; Linux/Windows —
|
||||||
# OFF by default; runtime-gated further behind an explicit PUNKTFUNK_ENCODER=pyrowave.
|
# the encoder backend itself is Linux-only, the Windows host just carries the library). ON by
|
||||||
# EXPERIMENTAL until CODEC_PYROWAVE negotiation lands (plan Phase 2).
|
# default (see `default` above); sessions reach it only through explicit client opt-in.
|
||||||
pyrowave = ["dep:pyrowave-sys"]
|
pyrowave = ["dep:pyrowave-sys"]
|
||||||
|
|
||||||
# Build-time icon/version-info embedding (build.rs; Windows dev/CI hosts only — Linux packaging
|
# Build-time icon/version-info embedding (build.rs; Windows dev/CI hosts only — Linux packaging
|
||||||
|
|||||||
@@ -108,19 +108,16 @@ impl Codec {
|
|||||||
/// [`punktfunk_core::quic::resolve_codec`] against the client's advertised codecs.
|
/// [`punktfunk_core::quic::resolve_codec`] against the client's advertised codecs.
|
||||||
pub fn host_wire_caps() -> u8 {
|
pub fn host_wire_caps() -> u8 {
|
||||||
// PyroWave rides ON TOP of whatever H.26x set resolves below: feature-gated, Linux-only
|
// PyroWave rides ON TOP of whatever H.26x set resolves below: feature-gated, Linux-only
|
||||||
// for now (the Windows host leg is blocked on the .173 D3D11 interop debt), and inert in
|
// for now (the Windows host encoder is future work), and inert in negotiation unless the
|
||||||
// negotiation unless the client explicitly prefers it (resolve_codec ignores the bit in
|
// client explicitly prefers it (resolve_codec ignores the bit in its ladder). Advertised
|
||||||
// its ladder). Advertised only when the capture side would actually deliver frames the
|
// whenever the backend could open: AMD/Intel capture hands raw dmabufs it imports
|
||||||
// backend ingests (raw-dmabuf passthrough / CPU RGB): `linux_zero_copy_is_vaapi()` —
|
// directly, and an NVIDIA-auto host's PyroWave sessions flip capture to CPU RGB
|
||||||
// true on AMD/Intel auto and under an explicit PUNKTFUNK_ENCODER=pyrowave. On an NVIDIA
|
// per-session instead ([`crate::session_plan::SessionPlan::output_format`]) — the EGL→CUDA
|
||||||
// host with `auto`, capture resolves to the EGL→CUDA import the backend can't consume,
|
// frames the `auto` GPU path would deliver are NVENC-only. Only a software/GPU-less pref
|
||||||
// so the bit stays off until the OutputFormat plumbing carries a per-session
|
// keeps the bit off (no Vulkan device to open).
|
||||||
// raw-dmabuf decision (Phase 3); the operator opts in with the env instead (plan §3).
|
|
||||||
#[cfg(all(target_os = "linux", feature = "pyrowave"))]
|
#[cfg(all(target_os = "linux", feature = "pyrowave"))]
|
||||||
let pyro = if linux_zero_copy_is_vaapi()
|
let pyro = if !matches!(
|
||||||
&& !matches!(
|
|
||||||
crate::config::config().encoder_pref.as_str(),
|
crate::config::config().encoder_pref.as_str(),
|
||||||
// A software pref usually means a GPU-less box — no Vulkan device to open.
|
|
||||||
"software" | "sw" | "openh264"
|
"software" | "sw" | "openh264"
|
||||||
) {
|
) {
|
||||||
punktfunk_core::quic::CODEC_PYROWAVE
|
punktfunk_core::quic::CODEC_PYROWAVE
|
||||||
|
|||||||
@@ -153,6 +153,26 @@ impl SessionPlan {
|
|||||||
}
|
}
|
||||||
gpu && !force_cpu_for_nvenc_444
|
gpu && !force_cpu_for_nvenc_444
|
||||||
};
|
};
|
||||||
|
// PyroWave on an NVIDIA-auto host: the `gpu` capture path resolves to the EGL→CUDA
|
||||||
|
// import that only NVENC can consume — the wavelet backend ingests raw dmabufs
|
||||||
|
// (the AMD/Intel path) or CPU RGB. Flip THIS session to CPU RGB capture; the
|
||||||
|
// Phase-2 exit sessions ran exactly this shape at 60 fps (the encode itself stays
|
||||||
|
// sub-ms GPU compute). Per-session raw-dmabuf passthrough on NVIDIA (true
|
||||||
|
// zero-copy without the PUNKTFUNK_ENCODER=pyrowave capture policy) is the
|
||||||
|
// follow-up; the AMD/Intel dmabuf path is untouched.
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
let gpu = {
|
||||||
|
let pyro_needs_cpu = self.codec == crate::encode::Codec::PyroWave
|
||||||
|
&& !crate::encode::linux_zero_copy_is_vaapi();
|
||||||
|
if gpu && pyro_needs_cpu {
|
||||||
|
tracing::info!(
|
||||||
|
"PyroWave session on the NVIDIA capture path: GPU (CUDA) capture disabled \
|
||||||
|
for this session — frames arrive as CPU RGB and upload to the wavelet \
|
||||||
|
encoder (raw-dmabuf zero-copy on NVIDIA is a follow-up)"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
gpu && !pyro_needs_cpu
|
||||||
|
};
|
||||||
crate::capture::OutputFormat {
|
crate::capture::OutputFormat {
|
||||||
gpu,
|
gpu,
|
||||||
hdr: self.hdr,
|
hdr: self.hdr,
|
||||||
|
|||||||
@@ -44,13 +44,13 @@ setting.
|
|||||||
|
|
||||||
## Turning it on
|
## Turning it on
|
||||||
|
|
||||||
1. **Host** (Linux): build/install a host with the `pyrowave` feature. On an NVIDIA host the
|
1. **Host** (Linux): nothing to do — default builds ship the codec and every Linux GPU host
|
||||||
capture path additionally needs `PUNKTFUNK_ENCODER=pyrowave` in `host.env` for the codec to
|
advertises it. AMD/Intel hosts encode from the capture dmabuf zero-copy; on an NVIDIA host
|
||||||
be advertised; AMD/Intel hosts advertise it automatically when the feature is present.
|
a PyroWave session currently captures via CPU RGB (a modest host-side cost that only
|
||||||
|
affects sessions that picked this codec — everything else keeps its zero-copy path).
|
||||||
2. **Client**:
|
2. **Client**:
|
||||||
- Linux session client (with the `pyrowave` feature): set **Settings → Video codec →
|
- Linux session client: set **Settings → Video codec → PyroWave (wired LAN)** in the
|
||||||
PyroWave (wired LAN)** in the gamepad console, or launch with
|
gamepad console, or launch with `PUNKTFUNK_PREFER_PYROWAVE=1`.
|
||||||
`PUNKTFUNK_PREFER_PYROWAVE=1`.
|
|
||||||
- Apple (Mac, Apple TV 4K, iPad — wired networking strongly recommended): set
|
- Apple (Mac, Apple TV 4K, iPad — wired networking strongly recommended): set
|
||||||
**Settings → Codec → PyroWave (wired LAN)**. The option appears only on devices whose
|
**Settings → Codec → PyroWave (wired LAN)**. The option appears only on devices whose
|
||||||
GPU passes the decode probe (Apple Silicon and A13-class or newer); picking it forces
|
GPU passes the decode probe (Apple Silicon and A13-class or newer); picking it forces
|
||||||
|
|||||||
Reference in New Issue
Block a user