feat: M0 capture→encode pipeline + M2 GameStream host (pairing, RTSP, video)
M0 (lumen-host) — verified on NVIDIA RTX 5070 Ti / Ubuntu 25.10: headless wlroots → xdg ScreenCast portal → PipeWire → NVENC HEVC → playable file, with each access unit round-tripped through a lumen_core host↔client Session (FEC + packetize + reassemble), 0 mismatches. - capture.rs: SyntheticCapturer + portal capture (ashpd 0.13 + pipewire 0.9), format-aware - encode/linux.rs: NVENC via ffmpeg-next 7 (BGRx/RGB → rgb0, no host-side swscale) - m0.rs: capture→encode→file + lumen-core loopback verification M2 P1 (lumen-host gamestream/) — a stock Moonlight client pairs + launches, verified live: - mDNS _nvstream._tcp + nvhttp /serverinfo (HTTP 47989, mutual-TLS HTTPS 47984) - 4-phase pairing: PIN→AES-128-ECB / SHA-256 / RSA-PKCS1v15 / X.509, custom rustls ClientCertVerifier for the mutual-TLS pairchallenge - /applist, /launch (rikey/rikeyid/mode), hand-rolled RTSP (OPTIONS/DESCRIBE/SETUP×3/ ANNOUNCE/PLAY, one-request-per-TCP-connection per moonlight-common-c's read-to-EOF) - video.rs: GameStream RTP + NV_VIDEO_PACKET wire packetizer, data-shards-only (0% FEC, clean-LAN), unit-tested (single/multi-block) Docs: docs/m2-plan.md (phased plan) + docs/research/ (ground-truth protocol spec). Bootstrap/setup updated for the verified path (libnvidia-gl, render/video groups, GPU EGL, pipewire 0.9). Workspace clippy-clean, tests green. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -25,9 +25,10 @@ fi
|
||||
CODENAME="$(. /etc/os-release 2>/dev/null && echo "${VERSION_CODENAME:-unknown}")"
|
||||
case "$CODENAME" in
|
||||
noble) ok "Ubuntu 24.04 (noble) — the recommended target" ;;
|
||||
questing) ok "Ubuntu 25.10 (questing) — newer than the tested 24.04; M0 verified here (Sway 1.10, FFmpeg 7.1)" ;;
|
||||
jammy) warn "Ubuntu 22.04 (jammy): Sway 1.7 / FFmpeg 4.4 are too old for the M0 path. \
|
||||
Strongly prefer 24.04, or build Sway/wlroots + FFmpeg 7.x from source here." ;;
|
||||
*) warn "Unrecognized release '$CODENAME' — proceeding, but package names are tuned for noble." ;;
|
||||
Strongly prefer 24.04+, or build Sway/wlroots + FFmpeg 7.x from source here." ;;
|
||||
*) warn "Unrecognized release '$CODENAME' — proceeding, but package names are tuned for noble/questing." ;;
|
||||
esac
|
||||
SUDO=""; [ "$(id -u)" -ne 0 ] && SUDO="sudo"
|
||||
|
||||
@@ -92,7 +93,50 @@ apt_install "Wayland dev" libwayland-dev wayland-protocols wayland-utils
|
||||
apt_install "DRM/EGL/GBM/VA" libdrm-dev libgbm-dev libgbm1 libegl-dev libegl1 libgles-dev mesa-common-dev libva-dev
|
||||
apt_install "capture + dbus" wf-recorder grim dbus-user-session drm-info mesa-utils
|
||||
apt_try "NVIDIA EGL platform (multiverse)" libnvidia-egl-wayland1 libnvidia-egl-gbm1
|
||||
apt_try "libei (noble only; reis is pure-Rust so optional)" libei-dev
|
||||
apt_try "libei (reis is pure-Rust so optional)" libei-dev
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
log "NVIDIA GL/EGL userspace (headless GPU Wayland needs this — nvidia-utils alone is NOT enough)"
|
||||
# ---------------------------------------------------------------------------
|
||||
# nvidia-utils-NNN ships nvidia-smi + NVENC (libnvidia-encode) but NOT the GL/EGL libs.
|
||||
# Without libnvidia-gl-NNN there is no libEGL_nvidia.so.0 and no GLVND vendor JSON
|
||||
# (/usr/share/glvnd/egl_vendor.d/10_nvidia.json), so libglvnd falls back to Mesa, wlroots
|
||||
# can't init EGL on the NVIDIA GPU, Sway is forced to the pixman software renderer, and the
|
||||
# ScreenCast portal then can't negotiate a dmabuf buffer format (capture fails). Install the
|
||||
# GL package matching the running driver.
|
||||
if have nvidia-smi; then
|
||||
if [ -e /usr/share/glvnd/egl_vendor.d/10_nvidia.json ] && ldconfig -p 2>/dev/null | grep -qi 'libEGL_nvidia'; then
|
||||
ok "NVIDIA GL/EGL userspace present (libEGL_nvidia + 10_nvidia.json)"
|
||||
elif [ -n "${DRV:-}" ]; then
|
||||
apt_try "NVIDIA GL/EGL userspace (libnvidia-gl-$DRV)" "libnvidia-gl-$DRV"
|
||||
[ -e /usr/share/glvnd/egl_vendor.d/10_nvidia.json ] \
|
||||
&& ok "10_nvidia.json now present — GPU EGL should work" \
|
||||
|| warn "10_nvidia.json still missing — install the libnvidia-gl package matching driver $DRV by hand."
|
||||
else
|
||||
warn "Couldn't determine the driver branch; install libnvidia-gl-<NNN> matching 'nvidia-smi' by hand."
|
||||
fi
|
||||
fi
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
log "GPU device group membership (render + video) — required to open /dev/dri/*"
|
||||
# ---------------------------------------------------------------------------
|
||||
# wlroots opens the render node (/dev/dri/renderD128, group 'render') and the DRM card
|
||||
# (/dev/dri/card*, group 'video'); both are 0660. Without membership Sway aborts with
|
||||
# 'Permission denied' on the render node.
|
||||
TARGET_USER="${SUDO_USER:-$USER}"
|
||||
NEED_GROUPS=""
|
||||
for g in render video; do
|
||||
id -nG "$TARGET_USER" 2>/dev/null | tr ' ' '\n' | grep -qx "$g" || NEED_GROUPS="$NEED_GROUPS $g"
|
||||
done
|
||||
if [ -n "$NEED_GROUPS" ]; then
|
||||
warn "$TARGET_USER is not in:$NEED_GROUPS — adding (takes effect on next LOGIN; re-login or reboot):"
|
||||
for g in $NEED_GROUPS; do echo " $SUDO usermod -aG $g $TARGET_USER"; done
|
||||
$SUDO usermod -aG "$(echo "$NEED_GROUPS" | tr ' ' ',' | sed 's/^,//')" "$TARGET_USER" 2>/dev/null \
|
||||
&& ok "added; LOG OUT AND BACK IN (or reboot) for it to apply" \
|
||||
|| warn "could not usermod automatically — run the commands above."
|
||||
else
|
||||
ok "$TARGET_USER already in render + video"
|
||||
fi
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
log "FFmpeg dev headers (gated — must NOT clobber your custom NVENC build)"
|
||||
|
||||
Executable
+49
@@ -0,0 +1,49 @@
|
||||
#!/usr/bin/env bash
|
||||
# Run AFTER headless Sway is up (run-headless-sway.sh), from a second shell on the same
|
||||
# user. It: (1) points this shell at the running Sway, (2) gives HEADLESS-1 a real refresh
|
||||
# clock (an idle/0 mHz output produces no frames), (3) imports the env the ScreenCast portal
|
||||
# needs to find Sway and pick the wlr backend, and (4) writes /tmp/lumen-sway-env.sh so
|
||||
# other shells (e.g. `cargo run -p lumen-host`) can `source` it.
|
||||
#
|
||||
# Usage: bash scripts/headless/prepare-session.sh [WxH@RHz] (default 1920x1080@60Hz)
|
||||
set -euo pipefail
|
||||
|
||||
export XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}"
|
||||
export WAYLAND_DISPLAY="${WAYLAND_DISPLAY:-wayland-1}"
|
||||
export XDG_CURRENT_DESKTOP=sway
|
||||
export DBUS_SESSION_BUS_ADDRESS="${DBUS_SESSION_BUS_ADDRESS:-unix:path=$XDG_RUNTIME_DIR/bus}"
|
||||
SWAYSOCK="$(ls -t "$XDG_RUNTIME_DIR"/sway-ipc.*.sock 2>/dev/null | head -1)"
|
||||
export SWAYSOCK
|
||||
MODE="${1:-1920x1080@60Hz}"
|
||||
|
||||
if ! swaymsg -t get_outputs >/dev/null 2>&1; then
|
||||
echo "Sway IPC not reachable ($SWAYSOCK) — is run-headless-sway.sh running?" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# A real refresh clock so the compositor actually drives frames (and screencopy/PipeWire
|
||||
# get content). Without on-screen motion the screen is static; launch something animated
|
||||
# (e.g. `swaymsg exec foot`) to exercise the encoder.
|
||||
swaymsg output HEADLESS-1 mode "$MODE" >/dev/null
|
||||
echo "HEADLESS-1 set to $MODE"
|
||||
|
||||
# The portal (xdg-desktop-portal-wlr) is D-Bus/systemd activated and must inherit these to
|
||||
# find the compositor and select the wlr ScreenCast backend.
|
||||
systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP SWAYSOCK XDG_RUNTIME_DIR 2>/dev/null || true
|
||||
dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP SWAYSOCK 2>/dev/null || true
|
||||
|
||||
cat > /tmp/lumen-sway-env.sh <<EOF
|
||||
export XDG_RUNTIME_DIR=$XDG_RUNTIME_DIR
|
||||
export WAYLAND_DISPLAY=$WAYLAND_DISPLAY
|
||||
export XDG_CURRENT_DESKTOP=sway
|
||||
export DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS
|
||||
export SWAYSOCK=$SWAYSOCK
|
||||
EOF
|
||||
|
||||
cat <<EOF
|
||||
session ready. From any shell on this user:
|
||||
source /tmp/lumen-sway-env.sh
|
||||
swaymsg exec foot # optional: animated on-screen content
|
||||
cargo run -p lumen-host -- m0 --source portal --seconds 5 --out /tmp/lumen-m0.h265
|
||||
ffprobe /tmp/lumen-m0.h265
|
||||
EOF
|
||||
@@ -1,20 +1,35 @@
|
||||
#!/usr/bin/env bash
|
||||
# Launch headless Sway on the NVIDIA VM with a private D-Bus session so the ScreenCast
|
||||
# portal activates. Prints the WAYLAND_DISPLAY (default wayland-1) to use from other shells.
|
||||
# Launch headless Sway on the NVIDIA box for the lumen M0 capture spike.
|
||||
#
|
||||
# Prereq: scripts/bootstrap-ubuntu.sh has run and nvidia-drm.modeset=Y (reboot if not).
|
||||
# Runs on the user's *shared* session bus (NOT a private dbus-run-session) so that the
|
||||
# ScreenCast portal (xdg-desktop-portal-wlr) and the lumen host share one bus. After this
|
||||
# is up, run `prepare-session.sh` from a second shell to set the mode + portal env.
|
||||
#
|
||||
# Prereqs (see docs/linux-setup.md / scripts/bootstrap-ubuntu.sh):
|
||||
# - nvidia-drm.modeset=Y
|
||||
# - the NVIDIA GL/EGL userspace (libnvidia-gl-NNN) — provides libEGL_nvidia + the GLVND
|
||||
# vendor JSON; without it wlroots can't init EGL on the GPU and falls back to pixman,
|
||||
# which the ScreenCast portal cannot capture.
|
||||
# - membership in the `render` + `video` groups (re-login after `usermod -aG`).
|
||||
set -euo pipefail
|
||||
|
||||
HERE="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
# shellcheck disable=SC1091
|
||||
source "$HERE/env.sh"
|
||||
export DBUS_SESSION_BUS_ADDRESS="${DBUS_SESSION_BUS_ADDRESS:-unix:path=$XDG_RUNTIME_DIR/bus}"
|
||||
mkdir -p "$XDG_RUNTIME_DIR" 2>/dev/null || true
|
||||
chmod 700 "$XDG_RUNTIME_DIR" 2>/dev/null || true
|
||||
|
||||
echo "starting headless Sway (renderer=$WLR_RENDERER). From another shell on this user:"
|
||||
echo " export XDG_RUNTIME_DIR=$XDG_RUNTIME_DIR WAYLAND_DISPLAY=wayland-1"
|
||||
echo " swaymsg -t get_outputs # expect HEADLESS-1"
|
||||
echo "starting headless Sway (renderer=$WLR_RENDERER) on bus $DBUS_SESSION_BUS_ADDRESS"
|
||||
echo "from another shell on this user: bash $HERE/prepare-session.sh"
|
||||
echo
|
||||
|
||||
# --unsupported-gpu is mandatory on Sway 1.9 with the proprietary NVIDIA driver.
|
||||
exec dbus-run-session -- sway --unsupported-gpu
|
||||
# wlroots opens the render node (/dev/dri/renderD128, group 'render'); NVIDIA's EGL uses it.
|
||||
# If this login predates `usermod -aG render,video` (groups not yet active), bridge with
|
||||
# `sg render` for this launch. The clean fix is to re-login so the groups apply natively.
|
||||
if id -nG | tr ' ' '\n' | grep -qx render; then
|
||||
exec sway --unsupported-gpu
|
||||
else
|
||||
echo "note: 'render' group not active in this login — bridging via 'sg render' (re-login to avoid)"
|
||||
exec sg render -c 'sway --unsupported-gpu'
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user