enricobuehler
5c05246098
cargo tree -p punktfunk-client-session finds no ffmpeg. The host still does, which is the whole point: pf-encode keeps libavcodec unconditionally and no host workflow, packaging script or licence file was touched. Deleted: crates/pf-ffvk, video_vulkan.rs, video_vaapi.rs, video_libav.rs, the libavcodec half of video_d3d11.rs, the av_log machinery, ffmpeg::codec::Id as the decoder's vocabulary (the quic CODEC_* wire constants now serve, which is why the evidence table was keyed on them), DecodedImage::VkFrame and ::Dmabuf, the presenter's AVVkFrame lane, and the ffmpeg-fallback feature with everything behind it. DrmFrameGuard collapses from an enum to a newtype, which removes an unsafe impl Send. Roughly 25,000 lines. Then the CI, packaging, licensing and docs work the plan's §6 lists: the Windows workflows lose FFMPEG_DIR, PF_FFVK_VULKAN_INCLUDE and their PATH prepend; the MSIX loses its DLL wildcard; the client .deb stops emitting libav sonames on its own because depends come from dpkg-shlibdeps; arch, flatpak and nix drop the dependency; and the README's "FFmpeg 7 or 8" contract narrows to the host. Three defects reached users' machines in the first cut, and none was in the deletion itself. All three desktop Settings UIs offer vulkan, vaapi and d3d11va as stored decoder values, so those strings sit in shipped settings files today. Refusing them by name — which is the correct rule for a stale pin — would have bricked every upgraded client whose owner ever touched that dropdown. They now migrate onto the native rung for the same hardware family, at decoder construction AND at each dialog's lookup, because a legacy value that matches no preset displays as "Automatic" and silently rewrites the user's preference on the next save. M9's evidence filter was deleted on the argument that with no libavcodec twin below, barring an unproven rung removes hardware decode rather than moving down one rung. That is true on Windows and false on Linux for Intel and every unknown vendor id, where prefer_vulkan_first is false and the order is native-vaapi → native-vk: a rung that has decoded nothing anywhere sitting above one that is 250/250 on three drivers. Every Intel Linux desktop would have moved from libavcodec VAAPI, shipping for years, onto pf-vaadec by default — and a rung that constructs and then produces wrong pixels leaves only by the error-streak demotion, which this codebase already documents as not tripping on the B580's strobing. The filter is restored as a narrow, pure, testable rule: an unproven rung yields to a proven one, and to nothing else. Windows deliberately passes no rung below, because that vendor family is the one with a measured wrong-pixel report against Vulkan decode, and trading no evidence for evidence of corruption is the wrong direction. And the notices still said FFmpeg was bundled. The root file is what both desktop clients include_str! and what the MSIX ships, three lines under the new card saying no FFmpeg is bundled; Apple's Acknowledgements said it too, on iOS, tvOS and macOS. The generator now emits four per-client files scoped by transitive closure — 0 FFmpeg mentions in each, verified — while the root file keeps it for the host. That also ends the standing false attribution of ffmpeg-next, GTK4, windows-rs and the NVENC SDK to an iPhone. Windows has no reachable box, so it was compiled instead: a cross clippy at -D warnings on x86_64 and aarch64-pc-windows-msvc with the C toolchain stubbed so build scripts run without linking. That gate immediately caught an include_str! path one directory too deep, which nothing else could have. Gates: container clippy -D warnings, 160 tests, workspace check, both Windows targets clean, client ffmpeg count 0 and host 2. The four decode crates are untouched, so the hardware rungs' 250/250 stands. ⚠ Owed and unrun: no GPU has executed any of this milestone. M8's on-glass software check, M7's D3D11 and VAAPI AV1 hardware legs, and M9's field bake all still want hardware, and the bake window and criteria remain the user's.
57 lines
2.9 KiB
TOML
57 lines
2.9 KiB
TOML
[package]
|
|
name = "punktfunk-client-session"
|
|
description = "punktfunk/1 Vulkan session binary — SDL3 window, ash presenter, terminal stats; the power-user / gamescope stream client"
|
|
version.workspace = true
|
|
edition.workspace = true
|
|
rust-version.workspace = true
|
|
license.workspace = true
|
|
authors.workspace = true
|
|
repository.workspace = true
|
|
|
|
[[bin]]
|
|
name = "punktfunk-session"
|
|
path = "src/main.rs"
|
|
|
|
[features]
|
|
default = ["ui", "pyrowave"]
|
|
# PyroWave client decode (the wired-LAN wavelet codec) — enables the decode backend + the
|
|
# 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 — note that also drops `ui` (the Skia console/OSD),
|
|
# not just pyrowave; hardware video decode itself (D3D11VA / Vulkan Video) is unaffected.
|
|
pyrowave = ["pf-client-core/pyrowave", "pf-presenter/pyrowave"]
|
|
# 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,
|
|
# stats on stdout only.
|
|
ui = ["dep:pf-console-ui", "dep:serde_json"]
|
|
# Same Linux+Windows gating as the rest of the client stack; elsewhere this is a stub
|
|
# binary.
|
|
[target.'cfg(any(target_os = "linux", windows))'.dependencies]
|
|
# `default-features = false` on both: THIS crate's `pyrowave` feature (above) is the single
|
|
# switch that turns the wavelet codec on, and it enables it explicitly on each. Inheriting their
|
|
# defaults instead would make `--no-default-features` a lie — the Windows ARM64 leg builds that
|
|
# way precisely to skip the vendored PyroWave C++, which has no ARM64 SIMD path.
|
|
pf-presenter = { path = "../../crates/pf-presenter", default-features = false }
|
|
pf-console-ui = { path = "../../crates/pf-console-ui", optional = true }
|
|
pf-client-core = { path = "../../crates/pf-client-core", default-features = false }
|
|
punktfunk-core = { path = "../../crates/punktfunk-core", features = ["quic"] }
|
|
# The fake-library dev hook (`PUNKTFUNK_FAKE_LIBRARY`, browse mode) parses GameEntry JSON.
|
|
serde_json = { version = "1", optional = true }
|
|
anyhow = "1"
|
|
tracing = "0.1"
|
|
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
|
|
|
# This crate carries NO toolkit, deliberately: it is the renderer the shells spawn, and the
|
|
# `--no-default-features` build is what a minimal/embedded image installs. GTK4/libadwaita/relm4
|
|
# belong to `clients/linux` (the shell) and must never appear here — a stray copy of the shell's
|
|
# modules landed in src/ once (b0ea1e6b) and dragging its dependencies in behind it is what let
|
|
# the wrong `main.rs` build and ship as `punktfunk-session`.
|
|
|
|
# Embeds the app icon as an exe resource (build.rs) — Windows hosts only (rc.exe from
|
|
# the SDK); same pattern as clients/windows.
|
|
[target.'cfg(windows)'.build-dependencies]
|
|
winresource = "0.1"
|
|
|
|
[lints]
|
|
workspace = true
|