mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-16 16:50:41 +01:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9906dd4767 | ||
|
|
9e2198b03d | ||
|
|
21c01d2e18 | ||
|
|
059a3b1bb8 | ||
|
|
76941459cc | ||
|
|
1fa346fd1f | ||
|
|
e09778cc94 | ||
|
|
b1da297e42 | ||
|
|
c739036301 | ||
|
|
25893cd4ab | ||
|
|
5089c0343c | ||
|
|
5fdb98b0f5 | ||
|
|
89abae2369 | ||
|
|
0afc602e66 | ||
|
|
762cfccc44 | ||
|
|
9520b69730 | ||
|
|
c45e4749b5 | ||
|
|
c1b8bfe1b3 | ||
|
|
03d2311649 | ||
|
|
5949314e55 | ||
|
|
8389fc4eed |
No files matched your search
@@ -35,6 +35,14 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
cargo build --locked --features wayland,portal,engine-plugins --bin uuremote-server
|
cargo build --locked --features wayland,portal,engine-plugins --bin uuremote-server
|
||||||
test -f target/debug/libuu-wayland.so
|
test -f target/debug/libuu-wayland.so
|
||||||
|
- name: Debian package installs
|
||||||
|
run: |
|
||||||
|
packaging/deb/build-deb.sh 0.0.0~ci target/debug /tmp/deb
|
||||||
|
dpkg-deb -I /tmp/deb/*.deb | grep -E 'Depends|Recommends'
|
||||||
|
sudo apt-get install -y /tmp/deb/*.deb
|
||||||
|
uuremote-server --help | head -1
|
||||||
|
test -f /usr/lib/uu-remote-linux/libuu-wayland.so
|
||||||
|
systemd-analyze verify /usr/lib/systemd/user/uuremote-native.service
|
||||||
|
|
||||||
test-viewer:
|
test-viewer:
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
@@ -86,12 +94,12 @@ jobs:
|
|||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- name: Install build dependencies (X11 + FFmpeg 6 for the inproc-av feature)
|
- name: Install build dependencies (X11; inproc-av vendors the NVENC headers; the VAAPI/DRI3 engines need libva/gbm/xcb-dri3 headers, libva itself is dlopen'ed at runtime)
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y build-essential pkg-config \
|
sudo apt-get install -y build-essential pkg-config \
|
||||||
libx11-dev libxext-dev libxtst-dev libxfixes-dev libgtk-3-dev \
|
libx11-dev libxext-dev libxtst-dev libxfixes-dev libgtk-3-dev \
|
||||||
libavcodec-dev libavformat-dev libavdevice-dev libswscale-dev libclang-dev
|
libva-dev libgbm-dev libx11-xcb-dev libxcb-dri3-dev libxcb-damage0-dev
|
||||||
- uses: dtolnay/rust-toolchain@stable
|
- uses: dtolnay/rust-toolchain@stable
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
- run: cargo test --locked --features inproc-av
|
- run: cargo test --locked --features inproc-av
|
||||||
|
|||||||
@@ -69,10 +69,20 @@ jobs:
|
|||||||
cp -r contrib "$name/"
|
cp -r contrib "$name/"
|
||||||
tar czf "$name.tar.gz" "$name"
|
tar czf "$name.tar.gz" "$name"
|
||||||
sha256sum "$name.tar.gz" > "$name.tar.gz.sha256"
|
sha256sum "$name.tar.gz" > "$name.tar.gz.sha256"
|
||||||
|
- name: Debian package
|
||||||
|
run: |
|
||||||
|
packaging/deb/build-deb.sh "${GITHUB_REF_NAME#v}" target/release .
|
||||||
|
deb=$(ls uu-remote-linux_*.deb)
|
||||||
|
sha256sum "$deb" > "$deb.sha256"
|
||||||
|
sudo apt-get install -y "./$deb"
|
||||||
|
uuremote-server --help | head -1
|
||||||
|
systemd-analyze verify /usr/lib/systemd/user/uuremote-native.service
|
||||||
- uses: actions/upload-artifact@v4
|
- uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: package-${{ matrix.arch }}
|
name: package-${{ matrix.arch }}
|
||||||
path: uu-remote-linux-*.tar.gz*
|
path: |
|
||||||
|
uu-remote-linux-*.tar.gz*
|
||||||
|
uu-remote-linux_*.deb*
|
||||||
|
|
||||||
# One publisher, so the matrix legs never race to create the release.
|
# One publisher, so the matrix legs never race to create the release.
|
||||||
release:
|
release:
|
||||||
@@ -90,6 +100,8 @@ jobs:
|
|||||||
files: |
|
files: |
|
||||||
uu-remote-linux-*.tar.gz
|
uu-remote-linux-*.tar.gz
|
||||||
uu-remote-linux-*.tar.gz.sha256
|
uu-remote-linux-*.tar.gz.sha256
|
||||||
|
uu-remote-linux_*.deb
|
||||||
|
uu-remote-linux_*.deb.sha256
|
||||||
|
|
||||||
# Headless NAS image (docker/), built from the release tarball published by the job above.
|
# Headless NAS image (docker/), built from the release tarball published by the job above.
|
||||||
docker:
|
docker:
|
||||||
|
|||||||
@@ -38,8 +38,13 @@ Dependencies (Ubuntu/Debian):
|
|||||||
```sh
|
```sh
|
||||||
sudo apt install build-essential pkg-config \
|
sudo apt install build-essential pkg-config \
|
||||||
libx11-dev libxext-dev libxtst-dev libxfixes-dev libavcodec-dev libavformat-dev libavdevice-dev libswscale-dev libclang-dev libgtk-3-dev ffmpeg
|
libx11-dev libxext-dev libxtst-dev libxfixes-dev libavcodec-dev libavformat-dev libavdevice-dev libswscale-dev libclang-dev libgtk-3-dev ffmpeg
|
||||||
# --features inproc-av: libavcodec-dev libavformat-dev libavdevice-dev libswscale-dev libclang-dev
|
# --features inproc-av: X11 in-process capture + native NVENC/VAAPI. NVENC headers are vendored and
|
||||||
# (FFmpeg 6.x; in-process capture/encoding, Ubuntu 24.04 ships it)
|
# libcuda/libnvidia-encode dlopen'ed at runtime (NVENC API 12.1, driver >= 530).
|
||||||
|
# The VAAPI/DRI3 engines compile against
|
||||||
|
# libva-dev libgbm-dev libx11-xcb-dev libxcb-dri3-dev libxcb-damage-dev;
|
||||||
|
# libva/libva-drm themselves are dlopen'ed at runtime (no hard libva dependency)
|
||||||
|
# --features viewer-ffmpeg: libavcodec-dev libavformat-dev libavdevice-dev libswscale-dev libclang-dev
|
||||||
|
# (FFmpeg 6.x only. FFmpeg >= 7 fails in ffmpeg-sys-next with "avfft.h file not found")
|
||||||
# --features wayland: libwayland-dev libxkbcommon-dev wl-clipboard
|
# --features wayland: libwayland-dev libxkbcommon-dev wl-clipboard
|
||||||
# --features wayland,portal: + libglib2.0-dev libpipewire-0.3-dev libei-dev (libei >= 1.1)
|
# --features wayland,portal: + libglib2.0-dev libpipewire-0.3-dev libei-dev (libei >= 1.1)
|
||||||
```
|
```
|
||||||
@@ -78,17 +83,21 @@ cargo build --release --features native-viewer,viewer-sdl --bin uuremote-viewer
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=UU Remote Linux host (unofficial)
|
Description=UU Remote Linux host (unofficial)
|
||||||
After=graphical-session.target
|
After=graphical-session.target
|
||||||
|
PartOf=graphical-session.target
|
||||||
[Service]
|
[Service]
|
||||||
Environment=RUST_LOG=info
|
Environment=RUST_LOG=info
|
||||||
Environment=DISPLAY=:0
|
|
||||||
# GNOME on Xorg usually needs: Environment=XAUTHORITY=/run/user/<uid>/gdm/Xauthority
|
|
||||||
ExecStart=%h/.local/bin/uuremote-server
|
ExecStart=%h/.local/bin/uuremote-server
|
||||||
Restart=always
|
Restart=always
|
||||||
RestartSec=5
|
RestartSec=5
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=default.target
|
WantedBy=graphical-session.target
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Same as packaging/deb. GNOME/KDE import DISPLAY / WAYLAND_DISPLAY and start graphical-session.target; do not hard-code
|
||||||
|
DISPLAY there (it overrides the session's real one, XWayland is often :1); under default.target the unit can
|
||||||
|
start before WAYLAND_DISPLAY is imported and fall back to X11. Desktops without that target (Xfce, i3) and the Xvfb
|
||||||
|
virtual desktop need `WantedBy=default.target` plus an explicit `Environment=DISPLAY=...`; headless
|
||||||
|
(`UU_DESKTOP_BACKEND=none` + linger) needs `WantedBy=default.target` only (GNOME on Xorg outside the session: `XAUTHORITY=/run/user/<uid>/gdm/Xauthority`).
|
||||||
Find the real display/Xauthority with `loginctl show-session <id> -p Display` / `ps -o args -C Xorg`.
|
Find the real display/Xauthority with `loginctl show-session <id> -p Display` / `ps -o args -C Xorg`.
|
||||||
5. `systemctl --user daemon-reload && systemctl --user enable --now uuremote-native.service`
|
5. `systemctl --user daemon-reload && systemctl --user enable --now uuremote-native.service`
|
||||||
6. Verify: `journalctl --user -u uuremote-native.service -f` must show
|
6. Verify: `journalctl --user -u uuremote-native.service -f` must show
|
||||||
@@ -117,6 +126,7 @@ viewer does not reconnect them automatically.
|
|||||||
| `UU_AUDIO=0`, `UU_AUDIO_SOURCE` | disable sound / choose the Pulse source (default `@DEFAULT_MONITOR@`) |
|
| `UU_AUDIO=0`, `UU_AUDIO_SOURCE` | disable sound / choose the Pulse source (default `@DEFAULT_MONITOR@`) |
|
||||||
| `UU_LOGIN_WINDOW=0` | don't auto-open the login window |
|
| `UU_LOGIN_WINDOW=0` | don't auto-open the login window |
|
||||||
| `UU_ENGINE_DIR` | directory holding `libuu-wayland.so` / `libuu-portal.so` (`--features engine-plugins`, used by release packages: engines are dlopen'ed only on Wayland sessions; also searched next to the binary, `../lib/uu-remote-linux`, `~/.local/lib/uu-remote-linux`, `/usr/lib/uu-remote-linux`) |
|
| `UU_ENGINE_DIR` | directory holding `libuu-wayland.so` / `libuu-portal.so` (`--features engine-plugins`, used by release packages: engines are dlopen'ed only on Wayland sessions; also searched next to the binary, `../lib/uu-remote-linux`, `~/.local/lib/uu-remote-linux`, `/usr/lib/uu-remote-linux`) |
|
||||||
|
| `UU_WOL_HELPER=1` | experimental: report LAN info (`api-ipv4…/api/v1/device/wake_on_lan/info` {mac, ip, subnet_mask}) after sign-in and answer `wake_on_lan` pushes (`target_device` {mac, ip, subnet_mask}) with a magic packet, like the official Windows host (field names from its log strings; not verified end to end). `wake_on_lan` push key names are always logged |
|
||||||
| `UU_USE_PROXY=1` | honor HTTP/SOCKS proxy env vars; cloud API clients bypass env proxies by default |
|
| `UU_USE_PROXY=1` | honor HTTP/SOCKS proxy env vars; cloud API clients bypass env proxies by default |
|
||||||
| `UU_REMOTE_ASSIST=0`, `UU_ASSIST_ALLOW=1`, `UU_ASSIST_UI=tty`, `UU_ASSIST_DEBUG=1` | disable assistance / allow at start / terminal UI for `assist` / include the server's short error message in assist errors |
|
| `UU_REMOTE_ASSIST=0`, `UU_ASSIST_ALLOW=1`, `UU_ASSIST_UI=tty`, `UU_ASSIST_DEBUG=1` | disable assistance / allow at start / terminal UI for `assist` / include the server's short error message in assist errors |
|
||||||
|
|
||||||
@@ -154,7 +164,7 @@ every 60 s.
|
|||||||
|
|
||||||
Diagnostic subcommands: `doctor` (paste-safe report: session, selected backend, engine plugins, uinput, encoders,
|
Diagnostic subcommands: `doctor` (paste-safe report: session, selected backend, engine plugins, uinput, encoders,
|
||||||
default codec, sign-in/service state; booleans and names only), `login [--no-gui]`, `unlock-check` (password on stdin, prints only accepted/rejected),
|
default codec, sign-in/service state; booleans and names only), `login [--no-gui]`, `unlock-check` (password on stdin, prints only accepted/rejected),
|
||||||
`desktop-probe [new.png]`, `desktop-video-probe` (`UU_PROBE_FPS`, `UU_PROBE_FRAMES`, `UU_PROBE_QUALITY` 1-5 = viewer bitrate preset, 5 auto; `UU_PROBE_INPUT` fixed video/image sequence, `UU_PROBE_LOOP=1` repeats), `wayland-input-probe`, `clipboard-acceptance`,
|
`desktop-probe [new.png]`, `desktop-video-probe` (`UU_PROBE_FPS`, `UU_PROBE_FRAMES`, `UU_PROBE_QUALITY` 1-5 = viewer bitrate preset, 5 auto; `UU_PROBE_CHROMA=444` 真彩; `UU_PROBE_INPUT` fixed video/image sequence, `UU_PROBE_LOOP=1` repeats), `wayland-input-probe`, `clipboard-acceptance`,
|
||||||
`portal-acceptance`, `help`. Unknown arguments exit with code 2. Builds up to v0.1.0 did **not** reject them and
|
`portal-acceptance`, `help`. Unknown arguments exit with code 2. Builds up to v0.1.0 did **not** reject them and
|
||||||
started a second full host server instead, so check that a subcommand exists in the binary you run.
|
started a second full host server instead, so check that a subcommand exists in the binary you run.
|
||||||
|
|
||||||
@@ -177,7 +187,7 @@ started a second full host server instead, so check that a subcommand exists in
|
|||||||
5 Auto, 6 Custom. Resolution: 16/17 pixel size or 5/6, 10 resolution_type (3 = follow remote).
|
5 Auto, 6 Custom. Resolution: 16/17 pixel size or 5/6, 10 resolution_type (3 = follow remote).
|
||||||
Field 7 `chorma_format` (ChromaFormat 1 = 4:2:0, 3 = 4:4:4) is sent when 真彩 is toggled; ff_capture_setting versions
|
Field 7 `chorma_format` (ChromaFormat 1 = 4:2:0, 3 = 4:4:4) is sent when 真彩 is toggled; ff_capture_setting versions
|
||||||
are cumulative (3 CHROMA_SAMPLING, 4 CUSTOM_BITRATE, 5 DPI_SCALE, 6 HDR). 4:4:4 = NVENC `high444p` / x264 `high444`
|
are cumulative (3 CHROMA_SAMPLING, 4 CUSTOM_BITRATE, 5 DPI_SCALE, 6 HDR). 4:4:4 = NVENC `high444p` / x264 `high444`
|
||||||
with `yuv444p`; VAAPI and inproc stay 4:2:0.
|
with `yuv444p`; the in-process NVENC engine uses High 4:4:4 / HEVC FRExt (AQ off); VAAPI stays 4:2:0.
|
||||||
Reply `RpcResponse{2 CaptureSettingResponse{}}` (no errors = applied) and send Message 25 CaptureSettingSync
|
Reply `RpcResponse{2 CaptureSettingResponse{}}` (no errors = applied) and send Message 25 CaptureSettingSync
|
||||||
(field 3 = the chroma actually encoded).
|
(field 3 = the chroma actually encoded).
|
||||||
- ConnectOptions field 4 `decoder_cap_list` = DecoderCap {1 fps, 2 codec_type (1 H264, 2 H265), 3 width, 4 height,
|
- ConnectOptions field 4 `decoder_cap_list` = DecoderCap {1 fps, 2 codec_type (1 H264, 2 H265), 3 width, 4 height,
|
||||||
@@ -269,12 +279,19 @@ started a second full host server instead, so check that a subcommand exists in
|
|||||||
|
|
||||||
`UU_VIDEO_ENCODER=vaapi` selects Intel/AMD H.264 VAAPI; `UU_VAAPI_DEVICE` defaults to
|
`UU_VIDEO_ENCODER=vaapi` selects Intel/AMD H.264 VAAPI; `UU_VAAPI_DEVICE` defaults to
|
||||||
`/dev/dri/renderD128` (render-node permissions required). No automatic VAAPI selection.
|
`/dev/dri/renderD128` (render-node permissions required). No automatic VAAPI selection.
|
||||||
Both FFmpeg process and `--features inproc-av` upload NV12 frames to a VAAPI frame pool.
|
The FFmpeg process pipeline uploads NV12 frames to a VAAPI frame pool. With `--features inproc-av` on X11, VAAPI
|
||||||
|
H.264/HEVC Main runs in process: a DRI3 DMA-BUF of the root (XShm upload without DRI3) goes through VPP to NV12
|
||||||
|
and VCN, with SPS/PPS(/VPS) and slice headers packed by the host as radeonsi (Mesa 26) needs; parameters follow
|
||||||
|
FFmpeg's hevc_vaapi/h264_vaapi on that driver. Accepted on AMD HawkPoint1 (Mesa 26.2.3) and Cezanne
|
||||||
|
(Mesa 26.2.5; XShm-upload and DRI3 zero-copy probes plus a full HEVC Mac-viewer session) with the official
|
||||||
|
Mac viewer (presets, fps, scaling); Intel iHD is not verified. Measured on Cezanne + RTX 3050 Ti
|
||||||
|
(1920x1200, desktop-video-probe, 300 frames): in-process VAAPI ~1.5 ms CPU/frame vs in-process NVENC
|
||||||
|
~7.1 ms vs libx264 process pipeline ~19 ms.
|
||||||
VBR uses the viewer bitrate preset and CQ-derived minimum QP, no B-frames, async depth 1,
|
VBR uses the viewer bitrate preset and CQ-derived minimum QP, no B-frames, async depth 1,
|
||||||
AUD and the existing GOP/VFR timing. Unsupported device/driver/initialization falls back to libx264
|
AUD and the existing GOP/VFR timing. Unsupported device/driver/initialization falls back to libx264
|
||||||
with a warning. Accepted on Intel UHD 770 (iHD) with the default FFmpeg process pipeline and the official Mac
|
with a warning. Accepted on Intel UHD 770 (iHD) with the default FFmpeg process pipeline and the official Mac
|
||||||
viewer (presets, fps, scaling, reconnect; no fallback, ~40% less CPU than libx264). AMD and the `inproc-av`
|
viewer (presets, fps, scaling, reconnect; no fallback, ~40% less CPU than libx264). The process pipeline on
|
||||||
VAAPI path are not hardware-verified.
|
AMD is not separately verified (AMD acceptance is the in-process engine above).
|
||||||
|
|
||||||
### Virtual audio / 虚拟声卡
|
### Virtual audio / 虚拟声卡
|
||||||
|
|
||||||
@@ -315,8 +332,8 @@ This permission can inject into the whole seat, including lock/greeter screens.
|
|||||||
Optional VAAPI: `intel-media-driver` (modern Intel) or `libva-mesa-driver` (AMD), `libva-utils`
|
Optional VAAPI: `intel-media-driver` (modern Intel) or `libva-mesa-driver` (AMD), `libva-utils`
|
||||||
for `vainfo`. Optional KMS: `libdrm`. Virtual Xfce: `xorg-server-xvfb xorg-xauth xorg-xdpyinfo
|
for `vainfo`. Optional KMS: `libdrm`. Virtual Xfce: `xorg-server-xvfb xorg-xauth xorg-xdpyinfo
|
||||||
xfce4-session xfce4-panel xfdesktop xfwm4 gnome-terminal`.
|
xfce4-session xfce4-panel xfdesktop xfwm4 gnome-terminal`.
|
||||||
Rolling Arch FFmpeg may be newer than supported `inproc-av` (FFmpeg 6.x); use the default process
|
Rolling Arch FFmpeg may be newer than supported `viewer-ffmpeg` (FFmpeg 6.x); build it against a separate
|
||||||
pipeline or build against a separate FFmpeg 6 prefix. Do not downgrade the system FFmpeg.
|
FFmpeg 6 prefix. Do not downgrade the system FFmpeg. The host's `inproc-av` does not link FFmpeg.
|
||||||
User-bus headless setup and the official Mac checklist: [virtual desktop acceptance](contrib/virtual-desktop/ACCEPTANCE.md).
|
User-bus headless setup and the official Mac checklist: [virtual desktop acceptance](contrib/virtual-desktop/ACCEPTANCE.md).
|
||||||
|
|
||||||
### Experimental KMS / 实验后端
|
### Experimental KMS / 实验后端
|
||||||
|
|||||||
Generated
+1
-1
@@ -2741,7 +2741,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "uu-remote-linux"
|
name = "uu-remote-linux"
|
||||||
version = "0.2.17"
|
version = "0.2.22"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
|
|||||||
+9
-4
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "uu-remote-linux"
|
name = "uu-remote-linux"
|
||||||
version = "0.2.17"
|
version = "0.2.22"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
default-run = "uuremote-server"
|
default-run = "uuremote-server"
|
||||||
authors = ["uu-remote-linux contributors"]
|
authors = ["uu-remote-linux contributors"]
|
||||||
@@ -30,9 +30,9 @@ kms = []
|
|||||||
portal = []
|
portal = []
|
||||||
# Build the wayland/portal engines as runtime-loaded libuu-wayland.so / libuu-portal.so (release packages).
|
# Build the wayland/portal engines as runtime-loaded libuu-wayland.so / libuu-portal.so (release packages).
|
||||||
engine-plugins = []
|
engine-plugins = []
|
||||||
# In-process capture and encoding through FFmpeg 6 libraries (libavcodec/libavdevice dev packages).
|
# In-process X11 capture and NVENC encoding: vendored NVENC headers, NVIDIA driver libraries loaded at runtime.
|
||||||
# Off by default so release binaries do not link the build machine's libav.
|
# Other encoders keep the FFmpeg process pipeline. Off by default.
|
||||||
inproc-av = ["dep:ffmpeg-next", "dep:x11rb"]
|
inproc-av = ["dep:x11rb"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
tokio = { version = "1", features = ["full"] }
|
tokio = { version = "1", features = ["full"] }
|
||||||
@@ -67,3 +67,8 @@ cc = "1.0"
|
|||||||
webrtc-dtls = { path = "vendor/webrtc-dtls" }
|
webrtc-dtls = { path = "vendor/webrtc-dtls" }
|
||||||
# Larger data-channel receive buffer (see vendor/webrtc/src/data_channel/mod.rs).
|
# Larger data-channel receive buffer (see vendor/webrtc/src/data_channel/mod.rs).
|
||||||
webrtc = { path = "vendor/webrtc" }
|
webrtc = { path = "vendor/webrtc" }
|
||||||
|
|
||||||
|
[[bench]]
|
||||||
|
name = "nvenc_pipeline_bench"
|
||||||
|
harness = false
|
||||||
|
required-features = ["inproc-av"]
|
||||||
+43
-11
@@ -117,7 +117,7 @@ Switching reuses one video track and pauses input until the new source sends a f
|
|||||||
| Feature | Status |
|
| Feature | Status |
|
||||||
|---|---|
|
|---|---|
|
||||||
| Switching between multiple monitors | Experimental on native Hyprland Wayland; see above |
|
| Switching between multiple monitors | Experimental on native Hyprland Wayland; see above |
|
||||||
| True color (4:4:4) | Supported (v0.1.15): the default FFmpeg pipeline with NVENC / libx264 encodes H.264 High 4:4:4; VAAPI and `inproc-av` stay 4:2:0 and report that to the client |
|
| True color (4:4:4) | Supported (v0.1.15): the default FFmpeg pipeline with NVENC / libx264 encodes H.264 High 4:4:4; `inproc-av` native NVENC encodes H.264 High 4:4:4 / HEVC FRExt; VAAPI stays 4:2:0 and reports that to the client |
|
||||||
| HDR | Not implemented |
|
| HDR | Not implemented |
|
||||||
| Super screen / virtual display | Not implemented |
|
| Super screen / virtual display | Not implemented |
|
||||||
| Privacy screen on the host | Not implemented |
|
| Privacy screen on the host | Not implemented |
|
||||||
@@ -131,7 +131,18 @@ Switching reuses one video track and pauses input until the new source sends a f
|
|||||||
|
|
||||||
### 0. Prebuilt release package (recommended, x86_64 / aarch64)
|
### 0. Prebuilt release package (recommended, x86_64 / aarch64)
|
||||||
|
|
||||||
Download `uu-remote-linux-<version>-x86_64-linux.tar.gz` (ARM64: `aarch64-linux`) from [Releases](../../releases/latest), extract it, then:
|
**Ubuntu / Debian (v0.2.18+)**: download `uu-remote-linux_<version>_amd64.deb` (ARM64: `arm64`), then:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
sudo apt install ./uu-remote-linux_<version>_amd64.deb
|
||||||
|
uuremote-server login # scan the QR code with the UU Remote app
|
||||||
|
systemctl --user enable --now uuremote-native.service # start with the graphical session
|
||||||
|
```
|
||||||
|
|
||||||
|
The deb installs the binaries, plugins, a systemd user unit and menu entries; uinput access stays opt-in (step 5).
|
||||||
|
GNOME and KDE pass the display environment to the unit; on desktops that don't (e.g. Xfce) add `DISPLAY` as in step 4.
|
||||||
|
|
||||||
|
**Other distributions**: download `uu-remote-linux-<version>-x86_64-linux.tar.gz` (ARM64: `aarch64-linux`) from [Releases](../../releases/latest), extract it, then:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
install -Dm755 uuremote-server ~/.local/bin/uuremote-server
|
install -Dm755 uuremote-server ~/.local/bin/uuremote-server
|
||||||
@@ -161,6 +172,8 @@ sudo apt install build-essential pkg-config \
|
|||||||
sudo apt install libwayland-dev libxkbcommon-dev wl-clipboard
|
sudo apt install libwayland-dev libxkbcommon-dev wl-clipboard
|
||||||
# optional: GNOME/KDE portal backend
|
# optional: GNOME/KDE portal backend
|
||||||
sudo apt install libglib2.0-dev libpipewire-0.3-dev libei-dev
|
sudo apt install libglib2.0-dev libpipewire-0.3-dev libei-dev
|
||||||
|
# optional: headers for the inproc-av VAAPI/DRI3 engines (libva itself is loaded at runtime)
|
||||||
|
sudo apt install libva-dev libgbm-dev libx11-xcb-dev libxcb-dri3-dev libxcb-damage0-dev
|
||||||
```
|
```
|
||||||
|
|
||||||
- A Rust toolchain is required (<https://rustup.rs>).
|
- A Rust toolchain is required (<https://rustup.rs>).
|
||||||
@@ -176,6 +189,9 @@ cargo build --release --features wayland # + Hyprland
|
|||||||
cargo build --release --features wayland,portal # + GNOME/KDE on Wayland
|
cargo build --release --features wayland,portal # + GNOME/KDE on Wayland
|
||||||
```
|
```
|
||||||
|
|
||||||
|
The viewer's `viewer-ffmpeg` feature supports **FFmpeg 6.x only** (`pkg-config --modversion libavcodec` = 60.x); FFmpeg 7+ fails inside `ffmpeg-sys-next` with `avfft.h file not found` (#63).
|
||||||
|
The host's optional `--features inproc-av` encodes with hardware inside the process on X11. It does not link FFmpeg development libraries; it loads the NVIDIA driver libraries (`libcuda.so.1`, `libnvidia-encode.so.1`) at runtime for NVENC (needs a driver with NVENC API 12.1, 530 or newer) and `libva.so.2`/`libva-drm.so.2` for VAAPI. When the capture and encoder sizes match, NVENC reads the XShm buffer directly, saving one host-to-device copy; VAAPI runs in process under the same feature (DRI3 DMA-BUF zero copy, or XShm upload without DRI3, then VPP to NV12 and VCN; H.264/HEVC). CPU encoding and `UU_CAPTURE=grab` keep the FFmpeg process; if the in-process hardware session fails it falls back to the matching FFmpeg process pipeline, then to the CPU. The default build and the release packages need neither feature.
|
||||||
|
|
||||||
### 3. Log in
|
### 3. Log in
|
||||||
|
|
||||||
Run inside your graphical session:
|
Run inside your graphical session:
|
||||||
@@ -195,17 +211,17 @@ machine, in `~/.config/uuremote/config.json` (mode 0600).
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=UU Remote Linux host (unofficial)
|
Description=UU Remote Linux host (unofficial)
|
||||||
After=graphical-session.target
|
After=graphical-session.target
|
||||||
|
PartOf=graphical-session.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Environment=RUST_LOG=info
|
Environment=RUST_LOG=info
|
||||||
# X11 desktops need the display; on GNOME, XAUTHORITY is usually /run/user/<uid>/gdm/Xauthority
|
# GNOME/KDE import DISPLAY / WAYLAND_DISPLAY into the user manager and start graphical-session.target
|
||||||
Environment=DISPLAY=:0
|
|
||||||
ExecStart=%h/.local/bin/uuremote-server
|
ExecStart=%h/.local/bin/uuremote-server
|
||||||
Restart=always
|
Restart=always
|
||||||
RestartSec=5
|
RestartSec=5
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=default.target
|
WantedBy=graphical-session.target
|
||||||
```
|
```
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
@@ -217,6 +233,10 @@ journalctl --user -u uuremote-native.service -f # online once you see availabi
|
|||||||
|
|
||||||
If you have not logged in yet, the service opens the QR login window on your desktop.
|
If you have not logged in yet, the service opens the QR login window on your desktop.
|
||||||
|
|
||||||
|
Desktops that never start `graphical-session.target` (e.g. Xfce, i3) will not autostart this unit: change `[Install]` to
|
||||||
|
`WantedBy=default.target`, add `Environment=DISPLAY=:0` (your actual display) and `enable` again. Headless mode and the
|
||||||
|
virtual desktop below also need `default.target`.
|
||||||
|
|
||||||
### 5. uinput virtual keyboard/mouse on Wayland (recommended)
|
### 5. uinput virtual keyboard/mouse on Wayland (recommended)
|
||||||
|
|
||||||
On Wayland (especially GNOME/KDE via the portal) the default input path needs portal consent and some keyboard layouts
|
On Wayland (especially GNOME/KDE via the portal) the default input path needs portal consent and some keyboard layouts
|
||||||
@@ -267,7 +287,7 @@ the same account cannot assist each other, an official restriction).
|
|||||||
## Servers without a monitor
|
## Servers without a monitor
|
||||||
|
|
||||||
**Headless mode** (terminal, file transfer and port mapping only): add `Environment=UU_DESKTOP_BACKEND=none` to the
|
**Headless mode** (terminal, file transfer and port mapping only): add `Environment=UU_DESKTOP_BACKEND=none` to the
|
||||||
service and run `loginctl enable-linger $USER`, so the systemd user manager (with `XDG_RUNTIME_DIR` and the user D-Bus)
|
service, change `[Install]` to `WantedBy=default.target` (`graphical-session.target` never starts without a login), and run `loginctl enable-linger $USER`, so the systemd user manager (with `XDG_RUNTIME_DIR` and the user D-Bus)
|
||||||
starts at boot without a login. The viewer's remote desktop keeps showing "connecting" in this mode; that is expected.
|
starts at boot without a login. The viewer's remote desktop keeps showing "connecting" in this mode; that is expected.
|
||||||
Log in once with `uuremote-server login --no-gui` (QR in the terminal).
|
Log in once with `uuremote-server login --no-gui` (QR in the terminal).
|
||||||
|
|
||||||
@@ -312,6 +332,7 @@ Common environment variables:
|
|||||||
| `UU_DESKTOP_BACKEND` | `auto` / `x11` / `wayland` / `portal` / `kms` (experimental feature) / `none` (headless) |
|
| `UU_DESKTOP_BACKEND` | `auto` / `x11` / `wayland` / `portal` / `kms` (experimental feature) / `none` (headless) |
|
||||||
| `UU_WAYLAND_MULTISCREEN=1` | Enable Hyprland physical monitor switching (off by default) |
|
| `UU_WAYLAND_MULTISCREEN=1` | Enable Hyprland physical monitor switching (off by default) |
|
||||||
| `UU_WAYLAND_OUTPUT` | Initial native Wayland output name, e.g. `HDMI-A-1` |
|
| `UU_WAYLAND_OUTPUT` | Initial native Wayland output name, e.g. `HDMI-A-1` |
|
||||||
|
| `UU_WAYLAND_NO_VIRTUAL_KEYBOARD=1` | Native Wayland skips the virtual keyboard (e.g. Denial reserves it for its input method); keys go through uinput. Without wlr-virtual-pointer the pointer also uses uinput (#72) |
|
||||||
| `UU_INPUT_BACKEND` | `auto` (default: uinput on Wayland when accessible) / `uinput` / `native` |
|
| `UU_INPUT_BACKEND` | `auto` (default: uinput on Wayland when accessible) / `uinput` / `native` |
|
||||||
| `UU_TERMINAL_SHORTCUTS=0` | Disable the Ctrl+V paste rewrite in terminal windows |
|
| `UU_TERMINAL_SHORTCUTS=0` | Disable the Ctrl+V paste rewrite in terminal windows |
|
||||||
| `UU_VIDEO_ENCODER` | `cpu`: libx264; `vaapi`: opt-in Intel/AMD; `nvenc`: force NVENC; unset: NVENC only when an NVIDIA driver is loaded, else CPU |
|
| `UU_VIDEO_ENCODER` | `cpu`: libx264; `vaapi`: opt-in Intel/AMD; `nvenc`: force NVENC; unset: NVENC only when an NVIDIA driver is loaded, else CPU |
|
||||||
@@ -322,11 +343,14 @@ Common environment variables:
|
|||||||
| `UU_ASSIST_ALLOW=1` | Allow remote assistance at start (overrides the saved switch) |
|
| `UU_ASSIST_ALLOW=1` | Allow remote assistance at start (overrides the saved switch) |
|
||||||
| `UU_LOGIN_WINDOW=0` | Do not open the login window automatically when credentials are missing |
|
| `UU_LOGIN_WINDOW=0` | Do not open the login window automatically when credentials are missing |
|
||||||
| `UU_PORT_MAPPING=0` | Disable port mapping (the official host's controlled-side switch) |
|
| `UU_PORT_MAPPING=0` | Disable port mapping (the official host's controlled-side switch) |
|
||||||
|
| `UU_WOL_HELPER=1` | Experimental: act as a remote-boot helper like the official Windows host — report this host's LAN info after sign-in and send a magic packet to the LAN when the cloud asks to wake a PC (not verified end to end) |
|
||||||
| `UU_USE_PROXY=1` | Honor HTTP/SOCKS proxy environment variables; by default proxies are ignored and NetEase servers are reached directly |
|
| `UU_USE_PROXY=1` | Honor HTTP/SOCKS proxy environment variables; by default proxies are ignored and NetEase servers are reached directly |
|
||||||
|
|
||||||
Host settings such as "lock after remote session" and "mute host" are stored in
|
Host settings such as "lock after remote session" and "mute host" are stored in
|
||||||
`~/.config/uuremote/host_settings.json`.
|
`~/.config/uuremote/host_settings.json`.
|
||||||
|
|
||||||
|
Custom bitrate follows the Mbps value selected in the client; for example, 1 Mbps sets an encoder cap of 1000 kbit/s.
|
||||||
|
|
||||||
With external FFmpeg CPU encoding, the bitrate presets (Original / Ultra / HD / custom) use average bitrate (ABR) to avoid gray keyframes at 4K and low bitrates; Auto keeps constant rate factor (CRF).
|
With external FFmpeg CPU encoding, the bitrate presets (Original / Ultra / HD / custom) use average bitrate (ABR) to avoid gray keyframes at 4K and low bitrates; Auto keeps constant rate factor (CRF).
|
||||||
|
|
||||||
## Let an AI agent install or develop it
|
## Let an AI agent install or develop it
|
||||||
@@ -405,12 +429,21 @@ sends about 12 kbit/s. `UU_VIDEO_CODEC=h265` selects H.265 explicitly for A/B di
|
|||||||
|
|
||||||
`UU_VIDEO_ENCODER=vaapi` selects Intel/AMD H.264 VAAPI; `UU_VAAPI_DEVICE` defaults to
|
`UU_VIDEO_ENCODER=vaapi` selects Intel/AMD H.264 VAAPI; `UU_VAAPI_DEVICE` defaults to
|
||||||
`/dev/dri/renderD128` (render-node permissions required). No automatic VAAPI selection.
|
`/dev/dri/renderD128` (render-node permissions required). No automatic VAAPI selection.
|
||||||
Both FFmpeg process and `--features inproc-av` upload NV12 frames to a VAAPI frame pool.
|
The FFmpeg process uploads NV12 frames to a VAAPI frame pool; a self-built `--features inproc-av`
|
||||||
|
binary instead runs VAAPI in process on X11 (a DRI3 DMA-BUF of the root window zero-copy, or XShm
|
||||||
|
upload without DRI3, then VPP to NV12 and VCN; H.264/HEVC).
|
||||||
VBR uses the viewer bitrate preset and CQ-derived minimum QP, no B-frames, async depth 1,
|
VBR uses the viewer bitrate preset and CQ-derived minimum QP, no B-frames, async depth 1,
|
||||||
AUD and the existing GOP/VFR timing. Unsupported device/driver/initialization falls back to libx264
|
AUD and the existing GOP/VFR timing. Unsupported device/driver/initialization falls back to libx264
|
||||||
with a warning. Accepted on Intel UHD 770 (iHD) with the default FFmpeg process pipeline and the official Mac
|
with a warning. Accepted on Intel UHD 770 (iHD) with the default FFmpeg process pipeline and the official Mac
|
||||||
viewer (presets, fps, scaling, reconnect; no fallback, ~40% less CPU than libx264). AMD and the `inproc-av`
|
viewer (presets, fps, scaling, reconnect; no fallback, ~40% less CPU than libx264 — a figure from the
|
||||||
VAAPI path are not hardware-verified.
|
FFmpeg-process-pipeline era). AMD iGPUs are verified on
|
||||||
|
the **in-process engine** (`--features inproc-av`): end-to-end sessions with the official Mac viewer passed
|
||||||
|
acceptance on HawkPoint (Mesa 26.2.3) and Cezanne (Mesa 26.2.5) — HEVC, presets, fps, scaling; on Cezanne,
|
||||||
|
H.264 and both capture paths were additionally probe-verified: the XShm upload (decodable bitstream, correct
|
||||||
|
picture) and the DRI3 zero-copy import. Measured on one machine (1920x1200@60, Cezanne iGPU + RTX 3050 Ti):
|
||||||
|
in-process VAAPI costs about **1/12** of the per-frame encode CPU of libx264 (FFmpeg pipeline, superfast)
|
||||||
|
and about **1/5** of in-process NVENC. The FFmpeg process pipeline (what the release packages use) is not
|
||||||
|
separately verified on AMD.
|
||||||
|
|
||||||
The default VAAPI VBV buffer (100-500 kbit) squeezes keyframes hard at high resolution: on a 2560x1440
|
The default VAAPI VBV buffer (100-500 kbit) squeezes keyframes hard at high resolution: on a 2560x1440
|
||||||
H.264 VAAPI stream capped at 30 Mbit/s the first IDR measured 59,910 bytes and the picture blurred at
|
H.264 VAAPI stream capped at 30 Mbit/s the first IDR measured 59,910 bytes and the picture blurred at
|
||||||
@@ -466,8 +499,7 @@ Keep the unit name `uuremote-native.service` (not a template `[email protected]
|
|||||||
Optional VAAPI: `intel-media-driver` (modern Intel) or `libva-mesa-driver` (AMD), `libva-utils`
|
Optional VAAPI: `intel-media-driver` (modern Intel) or `libva-mesa-driver` (AMD), `libva-utils`
|
||||||
for `vainfo`. Optional KMS: `libdrm`. Virtual Xfce: `xorg-server-xvfb xorg-xauth xorg-xdpyinfo
|
for `vainfo`. Optional KMS: `libdrm`. Virtual Xfce: `xorg-server-xvfb xorg-xauth xorg-xdpyinfo
|
||||||
xfce4-session xfce4-panel xfdesktop xfwm4 gnome-terminal`.
|
xfce4-session xfce4-panel xfdesktop xfwm4 gnome-terminal`.
|
||||||
Rolling Arch FFmpeg may be newer than supported `inproc-av` (FFmpeg 6.x); use the default process
|
If building `viewer-ffmpeg`, rolling Arch FFmpeg may be newer than supported 6.x; use a separate FFmpeg 6 prefix rather than downgrading system FFmpeg (`inproc-av` native NVENC on the host does not depend on FFmpeg).
|
||||||
pipeline or build against a separate FFmpeg 6 prefix. Do not downgrade the system FFmpeg.
|
|
||||||
User-bus headless setup and the official Mac checklist: [virtual desktop acceptance](contrib/virtual-desktop/ACCEPTANCE.md).
|
User-bus headless setup and the official Mac checklist: [virtual desktop acceptance](contrib/virtual-desktop/ACCEPTANCE.md).
|
||||||
|
|
||||||
### Experimental KMS / 实验后端
|
### Experimental KMS / 实验后端
|
||||||
|
|||||||
@@ -103,7 +103,7 @@ GNOME Portal 的控制通道不再等待授权窗口或第一帧画面:先通
|
|||||||
| 功能 | 状态 |
|
| 功能 | 状态 |
|
||||||
|---|---|
|
|---|---|
|
||||||
| 多显示器切换 | Hyprland 原生 Wayland 后端实验性支持,见上文 |
|
| 多显示器切换 | Hyprland 原生 Wayland 后端实验性支持,见上文 |
|
||||||
| 真彩(4:4:4) | 支持(v0.1.15):NVENC / libx264 的默认 FFmpeg 管线输出 H.264 High 4:4:4;VAAPI 和 `inproc-av` 管线仍为 4:2:0,并如实回报给客户端 |
|
| 真彩(4:4:4) | 支持(v0.1.15):NVENC / libx264 的默认 FFmpeg 管线输出 H.264 High 4:4:4;`inproc-av` 原生 NVENC 输出 H.264 High 4:4:4 / HEVC FRExt;VAAPI 管线仍为 4:2:0,并如实回报给客户端 |
|
||||||
| HDR | 未实现 |
|
| HDR | 未实现 |
|
||||||
| 超级屏 / 虚拟显示器 | 未实现 |
|
| 超级屏 / 虚拟显示器 | 未实现 |
|
||||||
| 被控端防窥模式 | 未实现 |
|
| 被控端防窥模式 | 未实现 |
|
||||||
@@ -117,7 +117,18 @@ GNOME Portal 的控制通道不再等待授权窗口或第一帧画面:先通
|
|||||||
|
|
||||||
### 0. 直接用 Release 预编译包(推荐,x86_64 / aarch64)
|
### 0. 直接用 Release 预编译包(推荐,x86_64 / aarch64)
|
||||||
|
|
||||||
从 [Releases](../../releases/latest) 下载 `uu-remote-linux-<版本>-x86_64-linux.tar.gz`(ARM64 选 `aarch64-linux`),解压后:
|
**Ubuntu / Debian(v0.2.18 起)**:下载 `uu-remote-linux_<版本>_amd64.deb`(ARM64 选 `arm64`)后:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
sudo apt install ./uu-remote-linux_<版本>_amd64.deb
|
||||||
|
uuremote-server login # 用 UU 远程 App 扫码
|
||||||
|
systemctl --user enable --now uuremote-native.service # 随图形会话启动
|
||||||
|
```
|
||||||
|
|
||||||
|
deb 会安装程序、插件、用户级 systemd 服务和应用菜单图标;uinput 权限不会自动开启(见第 5 步)。
|
||||||
|
GNOME / KDE 会把显示环境自动传给服务;Xfce 等不传的桌面需按第 4 步补 `DISPLAY`。
|
||||||
|
|
||||||
|
**其他发行版**:从 [Releases](../../releases/latest) 下载 `uu-remote-linux-<版本>-x86_64-linux.tar.gz`(ARM64 选 `aarch64-linux`),解压后:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
install -Dm755 uuremote-server ~/.local/bin/uuremote-server
|
install -Dm755 uuremote-server ~/.local/bin/uuremote-server
|
||||||
@@ -146,6 +157,8 @@ sudo apt install build-essential pkg-config \
|
|||||||
sudo apt install libwayland-dev libxkbcommon-dev wl-clipboard
|
sudo apt install libwayland-dev libxkbcommon-dev wl-clipboard
|
||||||
# 可选:GNOME/KDE portal 后端
|
# 可选:GNOME/KDE portal 后端
|
||||||
sudo apt install libglib2.0-dev libpipewire-0.3-dev libei-dev
|
sudo apt install libglib2.0-dev libpipewire-0.3-dev libei-dev
|
||||||
|
# 可选:inproc-av 的 VAAPI/DRI3 引擎编译所需(libva 本体运行时加载)
|
||||||
|
sudo apt install libva-dev libgbm-dev libx11-xcb-dev libxcb-dri3-dev libxcb-damage0-dev
|
||||||
```
|
```
|
||||||
|
|
||||||
- 需要 Rust 工具链(<https://rustup.rs>)。
|
- 需要 Rust 工具链(<https://rustup.rs>)。
|
||||||
@@ -160,6 +173,9 @@ cargo build --release --features wayland # + Hyprland
|
|||||||
cargo build --release --features wayland,portal # + GNOME/KDE Wayland
|
cargo build --release --features wayland,portal # + GNOME/KDE Wayland
|
||||||
```
|
```
|
||||||
|
|
||||||
|
控制端的 `viewer-ffmpeg` 只支持 **FFmpeg 6.x**(`pkg-config --modversion libavcodec` 为 60.x);FFmpeg 7 及以上会在依赖 `ffmpeg-sys-next` 里报 `avfft.h file not found`(#63)。
|
||||||
|
服务端可选的 `--features inproc-av` 是 X11 下的进程内硬件编码:不链接 FFmpeg 开发库,NVENC 运行时加载 NVIDIA 驱动库(`libcuda.so.1`、`libnvidia-encode.so.1`,需要支持 NVENC API 12.1 的驱动,530 及以上),VAAPI 运行时加载 `libva.so.2`/`libva-drm.so.2`。截屏与编码尺寸一致时 NVENC 直接读取 XShm 缓冲,省去一次主机到显存的拷贝;VAAPI 在同一特性下也进程内运行(DRI3 DMA-BUF 零拷贝,无 DRI3 时 XShm 上传,VPP 转 NV12 后送 VCN,支持 H.264/H.265)。CPU 编码或 `UU_CAPTURE=grab` 仍走外部 FFmpeg 进程;进程内硬件编码启动失败时先回退到对应的 FFmpeg 进程管线,再回退到 CPU。默认构建和预编译包都不需要该特性。
|
||||||
|
|
||||||
### 3. 登录
|
### 3. 登录
|
||||||
|
|
||||||
在图形桌面里运行:
|
在图形桌面里运行:
|
||||||
@@ -179,17 +195,17 @@ cargo build --release --features wayland,portal # + GNOME/KDE Wayland
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=UU Remote Linux host (unofficial)
|
Description=UU Remote Linux host (unofficial)
|
||||||
After=graphical-session.target
|
After=graphical-session.target
|
||||||
|
PartOf=graphical-session.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Environment=RUST_LOG=info
|
Environment=RUST_LOG=info
|
||||||
# X11 桌面需要指明显示器;GNOME 的 XAUTHORITY 一般在 /run/user/<uid>/gdm/Xauthority
|
# GNOME/KDE 等桌面会把 DISPLAY / WAYLAND_DISPLAY 导入用户管理器,并启动 graphical-session.target
|
||||||
Environment=DISPLAY=:0
|
|
||||||
ExecStart=%h/.local/bin/uuremote-server
|
ExecStart=%h/.local/bin/uuremote-server
|
||||||
Restart=always
|
Restart=always
|
||||||
RestartSec=5
|
RestartSec=5
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=default.target
|
WantedBy=graphical-session.target
|
||||||
```
|
```
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
@@ -201,6 +217,9 @@ journalctl --user -u uuremote-native.service -f # 看到 availability=Some("re
|
|||||||
|
|
||||||
如果还没有登录,服务会自动在桌面上弹出扫码窗口。
|
如果还没有登录,服务会自动在桌面上弹出扫码窗口。
|
||||||
|
|
||||||
|
Xfce、i3 等不启动 `graphical-session.target` 的桌面,按上面的写法开机不会自启:把 `[Install]` 改成 `WantedBy=default.target`,
|
||||||
|
并加上 `Environment=DISPLAY=:0`(按实际显示器填写),再重新 `enable`。下文的无头模式、虚拟桌面也要用 `default.target`。
|
||||||
|
|
||||||
### 5. Wayland 下使用 uinput 虚拟键鼠(推荐)
|
### 5. Wayland 下使用 uinput 虚拟键鼠(推荐)
|
||||||
|
|
||||||
Wayland(尤其是 GNOME/KDE portal)下,默认的键鼠注入要经过 portal 授权,部分键盘布局下还会丢符号(比如下划线)。
|
Wayland(尤其是 GNOME/KDE portal)下,默认的键鼠注入要经过 portal 授权,部分键盘布局下还会丢符号(比如下划线)。
|
||||||
@@ -240,7 +259,7 @@ install -Dm644 contrib/desktop/uu-remote-linux-viewer.desktop ~/.local/share/app
|
|||||||
## 没有显示器的服务器
|
## 没有显示器的服务器
|
||||||
|
|
||||||
**无头模式**:只要终端、文件传输和端口映射,不需要图形界面。在服务里加 `Environment=UU_DESKTOP_BACKEND=none`,
|
**无头模式**:只要终端、文件传输和端口映射,不需要图形界面。在服务里加 `Environment=UU_DESKTOP_BACKEND=none`,
|
||||||
再执行 `loginctl enable-linger $USER`,这样开机后不用登录,systemd 用户服务(以及 `XDG_RUNTIME_DIR`、用户 D-Bus)也会自动启动。
|
把 `[Install]` 改成 `WantedBy=default.target`(无人登录时 `graphical-session.target` 不会启动),再执行 `loginctl enable-linger $USER`,这样开机后不用登录,systemd 用户服务(以及 `XDG_RUNTIME_DIR`、用户 D-Bus)也会自动启动。
|
||||||
无头模式下控制端点「远程桌面」会一直显示正在连接,这是正常的。首次登录用 `uuremote-server login --no-gui` 在终端里扫码。
|
无头模式下控制端点「远程桌面」会一直显示正在连接,这是正常的。首次登录用 `uuremote-server login --no-gui` 在终端里扫码。
|
||||||
|
|
||||||
**群晖 / NAS(Docker)**:没有桌面的 NAS 可以用容器运行无头模式(文件传输、终端、端口映射)。
|
**群晖 / NAS(Docker)**:没有桌面的 NAS 可以用容器运行无头模式(文件传输、终端、端口映射)。
|
||||||
@@ -282,6 +301,7 @@ systemctl --user restart uuremote-native.service
|
|||||||
| `UU_DESKTOP_BACKEND` | `auto` / `x11` / `wayland` / `portal` / `kms`(实验性特性) / `none`(无头模式) |
|
| `UU_DESKTOP_BACKEND` | `auto` / `x11` / `wayland` / `portal` / `kms`(实验性特性) / `none`(无头模式) |
|
||||||
| `UU_WAYLAND_MULTISCREEN=1` | 启用 Hyprland 物理显示器切换(默认关闭) |
|
| `UU_WAYLAND_MULTISCREEN=1` | 启用 Hyprland 物理显示器切换(默认关闭) |
|
||||||
| `UU_WAYLAND_OUTPUT` | 原生 Wayland 默认采集输出名称,例如 `HDMI-A-1` |
|
| `UU_WAYLAND_OUTPUT` | 原生 Wayland 默认采集输出名称,例如 `HDMI-A-1` |
|
||||||
|
| `UU_WAYLAND_NO_VIRTUAL_KEYBOARD=1` | 原生 Wayland 不创建虚拟键盘(如 Denial 只把它给自己的输入法),键盘改走 uinput。合成器没有 wlr-virtual-pointer 时鼠标也自动改走 uinput(#72) |
|
||||||
| `UU_INPUT_BACKEND` | `auto`(默认,Wayland 下可用时用 uinput)/ `uinput` / `native` |
|
| `UU_INPUT_BACKEND` | `auto`(默认,Wayland 下可用时用 uinput)/ `uinput` / `native` |
|
||||||
| `UU_TERMINAL_SHORTCUTS=0` | 关闭终端窗口里的 Ctrl+V 粘贴转换 |
|
| `UU_TERMINAL_SHORTCUTS=0` | 关闭终端窗口里的 Ctrl+V 粘贴转换 |
|
||||||
| `UU_VIDEO_ENCODER` | `cpu` 强制 CPU;`vaapi` 显式启用 Intel/AMD 硬编;`nvenc` 强制 NVENC;未设置时检测到 NVIDIA 驱动才用 NVENC,否则用 CPU |
|
| `UU_VIDEO_ENCODER` | `cpu` 强制 CPU;`vaapi` 显式启用 Intel/AMD 硬编;`nvenc` 强制 NVENC;未设置时检测到 NVIDIA 驱动才用 NVENC,否则用 CPU |
|
||||||
@@ -292,10 +312,13 @@ systemctl --user restart uuremote-native.service
|
|||||||
| `UU_REMOTE_ASSIST=0` | 关闭远程协助(未登录时也不再以访客身份提供协助) |
|
| `UU_REMOTE_ASSIST=0` | 关闭远程协助(未登录时也不再以访客身份提供协助) |
|
||||||
| `UU_ASSIST_ALLOW=1` | 启动时就允许他人远程协助(覆盖窗口里保存的开关状态) |
|
| `UU_ASSIST_ALLOW=1` | 启动时就允许他人远程协助(覆盖窗口里保存的开关状态) |
|
||||||
| `UU_PORT_MAPPING=0` | 关闭端口映射(对应官方被控端的开关) |
|
| `UU_PORT_MAPPING=0` | 关闭端口映射(对应官方被控端的开关) |
|
||||||
|
| `UU_WOL_HELPER=1` | 实验性:让这台主机像官方 Windows 被控端一样充当「远程开机」辅助设备——登录后向网易上报本机局域网信息,收到云端唤醒请求时向同一局域网发送唤醒包(未经端到端验证) |
|
||||||
| `UU_USE_PROXY=1` | 使用环境变量里的 HTTP/SOCKS 代理;默认忽略代理、直连网易服务器 |
|
| `UU_USE_PROXY=1` | 使用环境变量里的 HTTP/SOCKS 代理;默认忽略代理、直连网易服务器 |
|
||||||
|
|
||||||
「远程结束后自动锁屏」「静音运行」等设置保存在 `~/.config/uuremote/host_settings.json`。
|
「远程结束后自动锁屏」「静音运行」等设置保存在 `~/.config/uuremote/host_settings.json`。
|
||||||
|
|
||||||
|
自定义码率按客户端选择的 Mbps 生效,例如 1 Mbps 对应 1000 kbit/s 的编码上限。
|
||||||
|
|
||||||
选择码率档(原画 / 超清 / 高清 / 自定义)时,外部 FFmpeg 的 CPU 编码以平均码率(ABR)为目标,避免 4K 低码率下关键帧发灰;「自动」档仍使用恒定质量(CRF)。
|
选择码率档(原画 / 超清 / 高清 / 自定义)时,外部 FFmpeg 的 CPU 编码以平均码率(ABR)为目标,避免 4K 低码率下关键帧发灰;「自动」档仍使用恒定质量(CRF)。
|
||||||
|
|
||||||
本地编码诊断 `desktop-video-probe [output.h264]` 可设置 `UU_PROBE_FPS`、`UU_PROBE_FRAMES`(默认 5)和 `UU_PROBE_QUALITY`(1–5);设置 `UU_PROBE_INPUT=clip.y4m`(也支持 `.mp4`、`frames/%05d.png`)可绕过桌面采集,以相同的生产 FFmpeg 编码参数测量固定输入并打印分辨率和编码统计,`UU_PROBE_LOOP=1` 循环到指定帧数,输入无法打开或帧数不足时以非零状态退出(固定输入始终使用外部 FFmpeg 管线)。
|
本地编码诊断 `desktop-video-probe [output.h264]` 可设置 `UU_PROBE_FPS`、`UU_PROBE_FRAMES`(默认 5)和 `UU_PROBE_QUALITY`(1–5);设置 `UU_PROBE_INPUT=clip.y4m`(也支持 `.mp4`、`frames/%05d.png`)可绕过桌面采集,以相同的生产 FFmpeg 编码参数测量固定输入并打印分辨率和编码统计,`UU_PROBE_LOOP=1` 循环到指定帧数,输入无法打开或帧数不足时以非零状态退出(固定输入始终使用外部 FFmpeg 管线)。
|
||||||
@@ -362,9 +385,9 @@ HEVC 的访问单元按 RFC 7798 的图片边界切分,不依赖 AUD:`hevc_v
|
|||||||
|
|
||||||
设置 `UU_VIDEO_ENCODER=vaapi` 使用 Intel/AMD H.264 VAAPI;`UU_VAAPI_DEVICE` 默认
|
设置 `UU_VIDEO_ENCODER=vaapi` 使用 Intel/AMD H.264 VAAPI;`UU_VAAPI_DEVICE` 默认
|
||||||
`/dev/dri/renderD128`,运行用户需要 render 节点权限。不会自动选择 VAAPI;设备或驱动初始化
|
`/dev/dri/renderD128`,运行用户需要 render 节点权限。不会自动选择 VAAPI;设备或驱动初始化
|
||||||
失败会明确警告并回退 libx264。外部 FFmpeg 和 `--features inproc-av` 均先转 NV12 再上传硬件帧。
|
失败会明确警告并回退 libx264。外部 FFmpeg 先转 NV12 再上传硬件帧。
|
||||||
VBR 使用控制端码率预设及 CQ 对应的最小 QP,无 B 帧、async depth=1,并保留现有 GOP/VFR 规则。
|
VBR 使用控制端码率预设及 CQ 对应的最小 QP,无 B 帧、async depth=1,并保留现有 GOP/VFR 规则。
|
||||||
Intel 核显(UHD 770,iHD 驱动)已实机验收:默认的外部 FFmpeg 管线用官方 Mac 控制端测试了各档画质、帧率、缩放和重连,全程硬件编码、无回退,CPU 占用比 libx264 低约 40%。**AMD 显卡和 `--features inproc-av` 管线的 VAAPI 尚未实机验证。**
|
Intel 核显(UHD 770,iHD 驱动)已实机验收:默认的外部 FFmpeg 管线用官方 Mac 控制端测试了各档画质、帧率、缩放和重连,全程硬件编码、无回退,CPU 占用比 libx264 低约 40%(该数字为 FFmpeg 进程管线时代的测量)。AMD 核显已在**进程内原生引擎**上实机验收(`--features inproc-av`):官方 Mac 客户端的端到端会话在 HawkPoint(Mesa 26.2.3)与 Cezanne(Mesa 26.2.5)上通过验收(HEVC,含画质档、帧率、缩放);Cezanne 上另以探测验证了 H.264 与两条采集路径——XShm 上传(码流可解码、画面正确)与 DRI3 DMA-BUF 零拷贝导入。同机实测(1920×1200@60,Cezanne iGPU + RTX 3050 Ti 双显卡):进程内 VAAPI 每帧编码 CPU 约为 libx264(FFmpeg 管线 superfast)的 **1/12**、进程内 NVENC 的 **1/5**;外部 FFmpeg 进程管线(预编译包使用)在 AMD 上未单独验证。
|
||||||
|
|
||||||
高分辨率下 VAAPI 的默认 VBV 缓冲(100–500 kbit)会把关键帧压得过狠:2560×1440 H.264 VAAPI、30M
|
高分辨率下 VAAPI 的默认 VBV 缓冲(100–500 kbit)会把关键帧压得过狠:2560×1440 H.264 VAAPI、30M
|
||||||
上限、静止画面上实测首个 IDR 只有 59,910 字节,画面每隔一个 GOP 糊一下再慢慢恢复。设
|
上限、静止画面上实测首个 IDR 只有 59,910 字节,画面每隔一个 GOP 糊一下再慢慢恢复。设
|
||||||
@@ -429,8 +452,7 @@ WantedBy=graphical-session.target
|
|||||||
VAAPI 可选包:Intel 新显卡用 `intel-media-driver`,AMD 用 `libva-mesa-driver`,`libva-utils` 提供
|
VAAPI 可选包:Intel 新显卡用 `intel-media-driver`,AMD 用 `libva-mesa-driver`,`libva-utils` 提供
|
||||||
`vainfo`。KMS 依赖 `libdrm`。虚拟 Xfce 依赖 `xorg-server-xvfb xorg-xauth xorg-xdpyinfo
|
`vainfo`。KMS 依赖 `libdrm`。虚拟 Xfce 依赖 `xorg-server-xvfb xorg-xauth xorg-xdpyinfo
|
||||||
xfce4-session xfce4-panel xfdesktop xfwm4 gnome-terminal`。
|
xfce4-session xfce4-panel xfdesktop xfwm4 gnome-terminal`。
|
||||||
滚动 Arch 的 FFmpeg 可能超出 `inproc-av` 支持的 6.x;请使用默认进程方案或独立的 FFmpeg 6 前缀,
|
若编译包含 `viewer-ffmpeg`,滚动 Arch 的 FFmpeg 可能超出其支持的 6.x;请使用独立的 FFmpeg 6 前缀,不要降级系统 FFmpeg(服务端的 `--features inproc-av` 原生 NVENC 不依赖 FFmpeg)。
|
||||||
不要降级系统 FFmpeg。
|
|
||||||
|
|
||||||
### 实验性 KMS 截屏
|
### 实验性 KMS 截屏
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,133 @@
|
|||||||
|
//! Standalone benchmark tool measuring:
|
||||||
|
//! 1. Host Memory Copy Bandwidth & CPU Cost (What FFmpeg/Sway CPU swizzling does)
|
||||||
|
//! 2. NVENC H.265 Hardware Throughput & Latency (1920x1200 @ ultra-low-latency)
|
||||||
|
//! 3. NVENC reading a registered (pinned) host buffer
|
||||||
|
|
||||||
|
use std::time::Instant;
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
println!("=========================================================");
|
||||||
|
println!(" UU Remote Linux: Encoder Pipeline Benchmark Suite ");
|
||||||
|
println!("=========================================================");
|
||||||
|
println!();
|
||||||
|
|
||||||
|
let width: u32 = 1920;
|
||||||
|
let height: u32 = 1200;
|
||||||
|
let frames: usize = 300; // 5 seconds of 60fps video
|
||||||
|
let frame_bytes: usize = (width * height * 4) as usize;
|
||||||
|
|
||||||
|
println!("Test Configuration:");
|
||||||
|
println!(" Resolution : {}x{}", width, height);
|
||||||
|
println!(" Frame Size : {:.2} MB (ARGB32)", frame_bytes as f64 / 1024.0 / 1024.0);
|
||||||
|
println!(" Iterations : {} frames (Equivalent to 5.0s @ 60 FPS)", frames);
|
||||||
|
println!();
|
||||||
|
|
||||||
|
// Simulating XShm framebuffer
|
||||||
|
let mut host_pixels = vec![0x55u8; frame_bytes];
|
||||||
|
|
||||||
|
// Benchmark 1: CPU Memcpy (External FFmpeg stdin / Sway wlr-screencopy CPU copy baseline)
|
||||||
|
println!("[1] Baseline: CPU Frame Memcpy Overhead (IPC / Process Pipe Cost)");
|
||||||
|
let mut sink = vec![0u8; frame_bytes];
|
||||||
|
let start_memcpy = Instant::now();
|
||||||
|
for _ in 0..frames {
|
||||||
|
sink.copy_from_slice(&host_pixels);
|
||||||
|
std::hint::black_box(&sink);
|
||||||
|
}
|
||||||
|
let duration_memcpy = start_memcpy.elapsed();
|
||||||
|
let memcpy_per_frame = duration_memcpy.as_secs_f64() * 1000.0 / frames as f64;
|
||||||
|
let memcpy_gbps = (frame_bytes * frames) as f64 / duration_memcpy.as_secs_f64() / 1e9;
|
||||||
|
let cpu_load_60fps = (memcpy_per_frame / (1000.0 / 60.0)) * 100.0;
|
||||||
|
println!(" -> Total CPU copy time : {:.2?}", duration_memcpy);
|
||||||
|
println!(" -> Per-frame copy time : {:.3} ms", memcpy_per_frame);
|
||||||
|
println!(" -> Memory Bus Bandwidth : {:.2} GB/s", memcpy_gbps);
|
||||||
|
println!(" -> CPU Core Saturation : {:.1}% of 1 core consumed solely by memcpy at 60 FPS", cpu_load_60fps);
|
||||||
|
println!();
|
||||||
|
|
||||||
|
// Benchmark 2: in-process NVENC reading a registered host buffer (device copy when registration fails)
|
||||||
|
#[cfg(feature = "inproc-av")]
|
||||||
|
{
|
||||||
|
extern "C" {
|
||||||
|
fn nvenc_create(config: *const NvencConfigFFI) -> *mut std::ffi::c_void;
|
||||||
|
fn nvenc_register_host_buffer(
|
||||||
|
engine: *mut std::ffi::c_void,
|
||||||
|
host_ptr: *mut std::ffi::c_void,
|
||||||
|
size: usize,
|
||||||
|
) -> i32;
|
||||||
|
fn nvenc_encode_frame(
|
||||||
|
engine: *mut std::ffi::c_void,
|
||||||
|
input_argb: *const u8,
|
||||||
|
pitch: u32,
|
||||||
|
force_idr: i32,
|
||||||
|
out_data: *mut *const u8,
|
||||||
|
out_len: *mut u32,
|
||||||
|
) -> i32;
|
||||||
|
fn nvenc_destroy(engine: *mut std::ffi::c_void);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Must match NvencConfig in c_engine/nvenc_engine.h.
|
||||||
|
#[repr(C)]
|
||||||
|
struct NvencConfigFFI {
|
||||||
|
width: u32,
|
||||||
|
height: u32,
|
||||||
|
fps: u32,
|
||||||
|
gop: u32,
|
||||||
|
cq: u32,
|
||||||
|
target_bps: i64,
|
||||||
|
max_bps: i64,
|
||||||
|
buffer_bits: i64,
|
||||||
|
is_hevc: i32,
|
||||||
|
chroma_444: i32,
|
||||||
|
}
|
||||||
|
|
||||||
|
let cfg = NvencConfigFFI {
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
fps: 60,
|
||||||
|
gop: 120,
|
||||||
|
cq: 18,
|
||||||
|
target_bps: 16_000_000,
|
||||||
|
max_bps: 30_000_000,
|
||||||
|
buffer_bits: 500_000,
|
||||||
|
is_hevc: 1, // H.265 / HEVC
|
||||||
|
chroma_444: i32::from(std::env::var("UU_BENCH_CHROMA").as_deref() == Ok("444")),
|
||||||
|
};
|
||||||
|
|
||||||
|
println!("[2] In-process NVENC H.265 encoding");
|
||||||
|
unsafe {
|
||||||
|
let engine = nvenc_create(&cfg);
|
||||||
|
if engine.is_null() {
|
||||||
|
println!(" [SKIP] NVENC driver not available on this system.");
|
||||||
|
} else {
|
||||||
|
let registered = nvenc_register_host_buffer(engine, host_pixels.as_mut_ptr() as *mut _, frame_bytes) == 0;
|
||||||
|
println!(" -> Input path : {}", if registered { "registered host buffer (DMA)" } else { "cuMemcpyHtoD copy" });
|
||||||
|
let input = if registered { std::ptr::null() } else { host_pixels.as_ptr() };
|
||||||
|
let mut out_data: *const u8 = std::ptr::null();
|
||||||
|
let mut out_len: u32 = 0;
|
||||||
|
// Warmup
|
||||||
|
let _ = nvenc_encode_frame(engine, input, width * 4, 1, &mut out_data, &mut out_len);
|
||||||
|
|
||||||
|
let start = Instant::now();
|
||||||
|
let (mut encoded_bytes, mut encoded_frames) = (0u64, 0usize);
|
||||||
|
for i in 0..frames {
|
||||||
|
if nvenc_encode_frame(engine, input, width * 4, i32::from(i == 0), &mut out_data, &mut out_len) == 0 {
|
||||||
|
encoded_bytes += u64::from(out_len);
|
||||||
|
encoded_frames += 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let elapsed = start.elapsed();
|
||||||
|
if encoded_frames == 0 {
|
||||||
|
println!(" [FAIL] no frame was encoded");
|
||||||
|
} else {
|
||||||
|
let per_frame = elapsed.as_secs_f64() * 1000.0 / encoded_frames as f64;
|
||||||
|
println!(" -> Encoded frames : {encoded_frames}/{frames} in {elapsed:.2?}");
|
||||||
|
println!(" -> Per-frame latency : {per_frame:.3} ms ({:.1} FPS max)", 1000.0 / per_frame);
|
||||||
|
println!(" -> Output bitrate : {:.2} Mbps average", encoded_bytes as f64 * 8.0 / elapsed.as_secs_f64() / 1e6);
|
||||||
|
if registered {
|
||||||
|
println!(" -> Host-to-device copy : none ({:.0} MB/s at 60 fps avoided)", frame_bytes as f64 * 60.0 / 1024.0 / 1024.0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
nvenc_destroy(engine);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,10 @@
|
|||||||
fn main() {
|
fn main() {
|
||||||
println!("cargo:rerun-if-changed=c_engine/portal_clipboard.inc");
|
println!("cargo:rerun-if-changed=c_engine/portal_clipboard.inc");
|
||||||
println!("cargo:rerun-if-changed=c_engine/x11_engine.c");
|
println!("cargo:rerun-if-changed=c_engine/x11_engine.c");
|
||||||
|
println!("cargo:rerun-if-changed=c_engine/nvenc_engine.c");
|
||||||
|
println!("cargo:rerun-if-changed=c_engine/nvenc_engine.h");
|
||||||
|
println!("cargo:rerun-if-changed=vendor/ffnvcodec/ffnvcodec/dynlink_cuda.h");
|
||||||
|
println!("cargo:rerun-if-changed=vendor/ffnvcodec/ffnvcodec/nvEncodeAPI.h");
|
||||||
println!("cargo:rerun-if-changed=c_engine/clipboard.c");
|
println!("cargo:rerun-if-changed=c_engine/clipboard.c");
|
||||||
println!("cargo:rerun-if-changed=c_engine/assist_window.c");
|
println!("cargo:rerun-if-changed=c_engine/assist_window.c");
|
||||||
println!("cargo:rerun-if-changed=c_engine/viewer_window.c");
|
println!("cargo:rerun-if-changed=c_engine/viewer_window.c");
|
||||||
@@ -21,11 +25,27 @@ fn main() {
|
|||||||
build.compile("uu_kms_engine");
|
build.compile("uu_kms_engine");
|
||||||
println!("cargo:rustc-link-lib=drm");
|
println!("cargo:rustc-link-lib=drm");
|
||||||
}
|
}
|
||||||
cc::Build::new()
|
let mut x11_build = cc::Build::new();
|
||||||
.file("c_engine/x11_engine.c")
|
x11_build.file("c_engine/x11_engine.c")
|
||||||
.file("c_engine/clipboard.c")
|
.file("c_engine/clipboard.c")
|
||||||
.file("c_engine/pam_check.c")
|
.file("c_engine/pam_check.c");
|
||||||
.compile("x11_engine");
|
if std::env::var_os("CARGO_FEATURE_INPROC_AV").is_some() {
|
||||||
|
x11_build.file("c_engine/nvenc_engine.c");
|
||||||
|
x11_build.file("c_engine/vaapi_engine.c");
|
||||||
|
x11_build.file("c_engine/dri3_capture.c");
|
||||||
|
for f in ["c_engine/vaapi_engine.c", "c_engine/vaapi_engine.h", "c_engine/dri3_capture.c", "c_engine/dri3_capture.h"] {
|
||||||
|
println!("cargo:rerun-if-changed={f}");
|
||||||
|
}
|
||||||
|
x11_build.include("vendor/ffnvcodec");
|
||||||
|
// libva/libva-drm are dlopen'ed at runtime (like NVENC's libcuda); these are
|
||||||
|
// link-time-only deps of the DRI3/VAAPI engines and must stay out of default builds.
|
||||||
|
println!("cargo:rustc-link-lib=gbm");
|
||||||
|
println!("cargo:rustc-link-lib=X11-xcb");
|
||||||
|
println!("cargo:rustc-link-lib=xcb");
|
||||||
|
println!("cargo:rustc-link-lib=xcb-dri3");
|
||||||
|
println!("cargo:rustc-link-lib=xcb-damage");
|
||||||
|
}
|
||||||
|
x11_build.compile("x11_engine");
|
||||||
|
|
||||||
println!("cargo:rustc-link-lib=X11");
|
println!("cargo:rustc-link-lib=X11");
|
||||||
println!("cargo:rustc-link-lib=Xext");
|
println!("cargo:rustc-link-lib=Xext");
|
||||||
|
|||||||
@@ -46,7 +46,10 @@ static pthread_cond_t init_cond = PTHREAD_COND_INITIALIZER;
|
|||||||
static GtkWidget *window, *allow_switch, *id_label, *code_label, *eye_button, *share_button, *hint_label, *verify_combo, *note_label;
|
static GtkWidget *window, *allow_switch, *id_label, *code_label, *eye_button, *share_button, *hint_label, *verify_combo, *note_label;
|
||||||
static GtkWidget *refresh_items[5], *footer_label;
|
static GtkWidget *refresh_items[5], *footer_label;
|
||||||
// Account card: QR login before sign-in, user info (+ logout) after.
|
// Account card: QR login before sign-in, user info (+ logout) after.
|
||||||
static GtkWidget *assist_card, *account_card, *account_stack, *qr_stack, *qr_image, *login_status, *user_label;
|
static GtkWidget *assist_card, *account_card, *account_stack, *qr_stack, *qr_image, *login_status, *user_label, *qr_refresh;
|
||||||
|
/* Like the official client, a failed or timed-out QR stays until the user asks for a new one. */
|
||||||
|
static atomic_int qr_refresh_requested;
|
||||||
|
static void on_qr_refresh(GtkButton *b, gpointer d) { (void)b; (void)d; atomic_store(&qr_refresh_requested, 1); gtk_widget_hide(qr_refresh); }
|
||||||
static int show_assist = 1, show_account;
|
static int show_assist = 1, show_account;
|
||||||
// Tray (host service only): AppIndicator via dlopen (no build dependency), else GtkStatusIcon.
|
// Tray (host service only): AppIndicator via dlopen (no build dependency), else GtkStatusIcon.
|
||||||
static GtkWidget *tray_menu, *tray_allow;
|
static GtkWidget *tray_menu, *tray_allow;
|
||||||
@@ -250,6 +253,11 @@ static GtkWidget *build_account_card(void) {
|
|||||||
login_status = label("", "status");
|
login_status = label("", "status");
|
||||||
gtk_label_set_line_wrap(GTK_LABEL(login_status), TRUE);
|
gtk_label_set_line_wrap(GTK_LABEL(login_status), TRUE);
|
||||||
gtk_box_pack_start(GTK_BOX(qr_text), login_status, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(qr_text), login_status, FALSE, FALSE, 0);
|
||||||
|
qr_refresh = gtk_button_new_with_label("刷新二维码");
|
||||||
|
gtk_widget_set_halign(qr_refresh, GTK_ALIGN_START);
|
||||||
|
gtk_widget_set_no_show_all(qr_refresh, TRUE);
|
||||||
|
g_signal_connect(qr_refresh, "clicked", G_CALLBACK(on_qr_refresh), NULL);
|
||||||
|
gtk_box_pack_start(GTK_BOX(qr_text), qr_refresh, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(qr_page), qr_text, TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(qr_page), qr_text, TRUE, TRUE, 0);
|
||||||
gtk_stack_add_named(GTK_STACK(account_stack), qr_page, "qr");
|
gtk_stack_add_named(GTK_STACK(account_stack), qr_page, "qr");
|
||||||
|
|
||||||
@@ -641,6 +649,16 @@ void uu_ui_set_user(const char *name) {
|
|||||||
if (!ui_started || init_state != 1) return;
|
if (!ui_started || init_state != 1) return;
|
||||||
g_idle_add(apply_user, g_strdup(name ? name : ""));
|
g_idle_add(apply_user, g_strdup(name ? name : ""));
|
||||||
}
|
}
|
||||||
|
static gboolean apply_qr_refresh(gpointer data) {
|
||||||
|
if (window && qr_refresh) { if (GPOINTER_TO_INT(data)) gtk_widget_show(qr_refresh); else gtk_widget_hide(qr_refresh); }
|
||||||
|
return G_SOURCE_REMOVE;
|
||||||
|
}
|
||||||
|
void uu_login_ui_offer_refresh(int visible) {
|
||||||
|
if (!ui_started || init_state != 1 || atomic_load(&closed)) return;
|
||||||
|
atomic_store(&qr_refresh_requested, 0);
|
||||||
|
g_idle_add(apply_qr_refresh, GINT_TO_POINTER(visible != 0));
|
||||||
|
}
|
||||||
|
int uu_login_ui_take_refresh(void) { return atomic_exchange(&qr_refresh_requested, 0); }
|
||||||
void uu_login_ui_set_done(const char *text) { uu_ui_set_user(text); }
|
void uu_login_ui_set_done(const char *text) { uu_ui_set_user(text); }
|
||||||
int uu_login_ui_closed(void) { return atomic_load(&closed); }
|
int uu_login_ui_closed(void) { return atomic_load(&closed); }
|
||||||
void uu_login_ui_close(void) { uu_assist_ui_close(); }
|
void uu_login_ui_close(void) { uu_assist_ui_close(); }
|
||||||
@@ -0,0 +1,242 @@
|
|||||||
|
#include "dri3_capture.h"
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <poll.h>
|
||||||
|
#include <X11/Xlib.h>
|
||||||
|
#include <X11/Xlib-xcb.h>
|
||||||
|
#include <xcb/xcb.h>
|
||||||
|
#include <xcb/dri3.h>
|
||||||
|
#include <xcb/damage.h>
|
||||||
|
#include <gbm.h>
|
||||||
|
|
||||||
|
struct Dri3Capture {
|
||||||
|
Display *dpy;
|
||||||
|
xcb_connection_t *conn;
|
||||||
|
xcb_screen_t *screen;
|
||||||
|
uint32_t width;
|
||||||
|
uint32_t height;
|
||||||
|
|
||||||
|
int drm_fd;
|
||||||
|
struct gbm_device *gbm;
|
||||||
|
struct gbm_bo *bo;
|
||||||
|
int bo_fd;
|
||||||
|
uint32_t stride;
|
||||||
|
|
||||||
|
xcb_pixmap_t pix;
|
||||||
|
xcb_gcontext_t gc;
|
||||||
|
xcb_damage_damage_t damage;
|
||||||
|
uint8_t damage_event_code;
|
||||||
|
};
|
||||||
|
|
||||||
|
Dri3Capture* dri3_capture_create(const char* display_name, uint32_t width, uint32_t height) {
|
||||||
|
Display *dpy = XOpenDisplay(display_name);
|
||||||
|
if (!dpy) {
|
||||||
|
fprintf(stderr, "[dri3_capture] failed to open display %s\n", display_name ? display_name : "default");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Events are read with xcb_poll_for_event below, so XCB, not Xlib, must own the queue
|
||||||
|
XSetEventQueueOwner(dpy, XCBOwnsEventQueue);
|
||||||
|
xcb_connection_t *conn = XGetXCBConnection(dpy);
|
||||||
|
const xcb_setup_t *setup = xcb_get_setup(conn);
|
||||||
|
xcb_screen_t *screen = xcb_setup_roots_iterator(setup).data;
|
||||||
|
if (!screen) {
|
||||||
|
XCloseDisplay(dpy);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check the extension first: a DRI3 request on a server without it breaks the connection,
|
||||||
|
// and the Xlib cleanup below then exits the process.
|
||||||
|
const xcb_query_extension_reply_t *dri3_ext = xcb_get_extension_data(conn, &xcb_dri3_id);
|
||||||
|
if (!dri3_ext || !dri3_ext->present) {
|
||||||
|
fprintf(stderr, "[dri3_capture] DRI3 extension not supported on display\n");
|
||||||
|
XCloseDisplay(dpy);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
// Query DRI3
|
||||||
|
xcb_dri3_query_version_cookie_t qvc = xcb_dri3_query_version(conn, 1, 2);
|
||||||
|
xcb_dri3_query_version_reply_t *qvr = xcb_dri3_query_version_reply(conn, qvc, NULL);
|
||||||
|
if (!qvr) {
|
||||||
|
fprintf(stderr, "[dri3_capture] DRI3 extension not supported on display\n");
|
||||||
|
XCloseDisplay(dpy);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
free(qvr);
|
||||||
|
|
||||||
|
// Open DRM device via DRI3
|
||||||
|
xcb_dri3_open_cookie_t oc = xcb_dri3_open(conn, screen->root, 0);
|
||||||
|
xcb_dri3_open_reply_t *or = xcb_dri3_open_reply(conn, oc, NULL);
|
||||||
|
if (!or) {
|
||||||
|
fprintf(stderr, "[dri3_capture] xcb_dri3_open failed\n");
|
||||||
|
XCloseDisplay(dpy);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
int drm_fd = xcb_dri3_open_reply_fds(conn, or)[0];
|
||||||
|
free(or);
|
||||||
|
|
||||||
|
uint32_t w = width > 0 ? width : screen->width_in_pixels;
|
||||||
|
uint32_t h = height > 0 ? height : screen->height_in_pixels;
|
||||||
|
|
||||||
|
struct gbm_device *gbm = gbm_create_device(drm_fd);
|
||||||
|
if (!gbm) {
|
||||||
|
fprintf(stderr, "[dri3_capture] gbm_create_device failed\n");
|
||||||
|
close(drm_fd);
|
||||||
|
XCloseDisplay(dpy);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct gbm_bo *bo = gbm_bo_create(gbm, w, h, GBM_FORMAT_XRGB8888, GBM_BO_USE_RENDERING | GBM_BO_USE_LINEAR);
|
||||||
|
if (!bo) {
|
||||||
|
fprintf(stderr, "[dri3_capture] gbm_bo_create failed\n");
|
||||||
|
gbm_device_destroy(gbm);
|
||||||
|
close(drm_fd);
|
||||||
|
XCloseDisplay(dpy);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
int bo_fd = gbm_bo_get_fd(bo);
|
||||||
|
uint32_t stride = gbm_bo_get_stride(bo);
|
||||||
|
|
||||||
|
xcb_pixmap_t pix = xcb_generate_id(conn);
|
||||||
|
xcb_generic_error_t *err = NULL;
|
||||||
|
// XCB takes ownership of the fd it sends and closes it after transmission; only a
|
||||||
|
// duplicate goes to X11, bo_fd stays ours for the VAAPI import and teardown.
|
||||||
|
int send_fd = fcntl(bo_fd, F_DUPFD_CLOEXEC, 3);
|
||||||
|
if (send_fd < 0) {
|
||||||
|
close(bo_fd);
|
||||||
|
gbm_bo_destroy(bo);
|
||||||
|
gbm_device_destroy(gbm);
|
||||||
|
close(drm_fd);
|
||||||
|
XCloseDisplay(dpy);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
xcb_void_cookie_t pc = xcb_dri3_pixmap_from_buffer_checked(
|
||||||
|
conn, pix, screen->root, stride * h, w, h, stride, screen->root_depth, 32, send_fd
|
||||||
|
);
|
||||||
|
err = xcb_request_check(conn, pc);
|
||||||
|
if (err) {
|
||||||
|
fprintf(stderr, "[dri3_capture] xcb_dri3_pixmap_from_buffer failed: %d\n", err->error_code);
|
||||||
|
free(err);
|
||||||
|
close(bo_fd);
|
||||||
|
gbm_bo_destroy(bo);
|
||||||
|
gbm_device_destroy(gbm);
|
||||||
|
close(drm_fd);
|
||||||
|
XCloseDisplay(dpy);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
xcb_gcontext_t gc = xcb_generate_id(conn);
|
||||||
|
// The default ClipByChildren copies only the root background (solid black); XShmGetImage on the root
|
||||||
|
// includes child windows, so the blit must too.
|
||||||
|
uint32_t gc_mode = XCB_SUBWINDOW_MODE_INCLUDE_INFERIORS;
|
||||||
|
xcb_create_gc(conn, gc, pix, XCB_GC_SUBWINDOW_MODE, &gc_mode);
|
||||||
|
|
||||||
|
// Setup XDamage on root window
|
||||||
|
const xcb_query_extension_reply_t *ext = xcb_get_extension_data(conn, &xcb_damage_id);
|
||||||
|
uint8_t damage_event_code = 0;
|
||||||
|
xcb_damage_damage_t damage = 0;
|
||||||
|
if (ext && ext->present) {
|
||||||
|
damage_event_code = ext->first_event;
|
||||||
|
xcb_damage_query_version(conn, 1, 1);
|
||||||
|
damage = xcb_generate_id(conn);
|
||||||
|
xcb_damage_create(conn, damage, screen->root, XCB_DAMAGE_REPORT_LEVEL_NON_EMPTY);
|
||||||
|
}
|
||||||
|
|
||||||
|
Dri3Capture* cap = (Dri3Capture*)calloc(1, sizeof(Dri3Capture));
|
||||||
|
cap->dpy = dpy;
|
||||||
|
cap->conn = conn;
|
||||||
|
cap->screen = screen;
|
||||||
|
cap->width = w;
|
||||||
|
cap->height = h;
|
||||||
|
cap->drm_fd = drm_fd;
|
||||||
|
cap->gbm = gbm;
|
||||||
|
cap->bo = bo;
|
||||||
|
cap->bo_fd = bo_fd;
|
||||||
|
cap->stride = stride;
|
||||||
|
cap->pix = pix;
|
||||||
|
cap->gc = gc;
|
||||||
|
cap->damage = damage;
|
||||||
|
cap->damage_event_code = damage_event_code;
|
||||||
|
|
||||||
|
fprintf(stderr, "[dri3_capture] Initialized: %ux%u (stride: %u, dma_fd: %d) Pure GPU Blit ready!\n",
|
||||||
|
w, h, stride, bo_fd);
|
||||||
|
return cap;
|
||||||
|
}
|
||||||
|
|
||||||
|
int dri3_capture_blit(Dri3Capture* cap) {
|
||||||
|
if (!cap) return -1;
|
||||||
|
xcb_copy_area(cap->conn, cap->screen->root, cap->pix, cap->gc, 0, 0, 0, 0, cap->width, cap->height);
|
||||||
|
// Round trip: the server has executed (and flushed to the GPU) the copy before VAAPI reads the BO;
|
||||||
|
// xcb_flush alone only sends the request.
|
||||||
|
xcb_get_input_focus_reply_t *r = xcb_get_input_focus_reply(cap->conn, xcb_get_input_focus(cap->conn), NULL);
|
||||||
|
if (!r) return -1;
|
||||||
|
free(r);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int dri3_capture_wait_damage(Dri3Capture* cap, int timeout_ms) {
|
||||||
|
if (!cap) return -1;
|
||||||
|
|
||||||
|
// Check queued events
|
||||||
|
xcb_generic_event_t *ev = NULL;
|
||||||
|
int damaged = 0;
|
||||||
|
while ((ev = xcb_poll_for_event(cap->conn)) != NULL) {
|
||||||
|
if ((ev->response_type & 0x7f) == (cap->damage_event_code + XCB_DAMAGE_NOTIFY)) {
|
||||||
|
damaged = 1;
|
||||||
|
}
|
||||||
|
free(ev);
|
||||||
|
}
|
||||||
|
if (damaged) {
|
||||||
|
xcb_damage_subtract(cap->conn, cap->damage, XCB_NONE, XCB_NONE);
|
||||||
|
xcb_flush(cap->conn);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
int fd = xcb_get_file_descriptor(cap->conn);
|
||||||
|
struct pollfd pfd = { .fd = fd, .events = POLLIN, .revents = 0 };
|
||||||
|
int ret = poll(&pfd, 1, timeout_ms);
|
||||||
|
if (ret > 0 && (pfd.revents & POLLIN)) {
|
||||||
|
// Readable but not yet a whole event: polling again would return at once and spin a core
|
||||||
|
ev = xcb_poll_for_event(cap->conn);
|
||||||
|
if (!ev) ev = xcb_wait_for_event(cap->conn);
|
||||||
|
if (!ev) return -1;
|
||||||
|
do {
|
||||||
|
if ((ev->response_type & 0x7f) == (cap->damage_event_code + XCB_DAMAGE_NOTIFY)) {
|
||||||
|
damaged = 1;
|
||||||
|
}
|
||||||
|
free(ev);
|
||||||
|
} while ((ev = xcb_poll_for_event(cap->conn)) != NULL);
|
||||||
|
if (damaged) {
|
||||||
|
xcb_damage_subtract(cap->conn, cap->damage, XCB_NONE, XCB_NONE);
|
||||||
|
xcb_flush(cap->conn);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ret < 0 ? -1 : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int dri3_capture_get_dma_fd(Dri3Capture* cap) {
|
||||||
|
return cap ? cap->bo_fd : -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t dri3_capture_get_stride(Dri3Capture* cap) {
|
||||||
|
return cap ? cap->stride : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void dri3_capture_destroy(Dri3Capture* cap) {
|
||||||
|
if (!cap) return;
|
||||||
|
|
||||||
|
if (cap->damage) xcb_damage_destroy(cap->conn, cap->damage);
|
||||||
|
if (cap->gc) xcb_free_gc(cap->conn, cap->gc);
|
||||||
|
if (cap->pix) xcb_free_pixmap(cap->conn, cap->pix);
|
||||||
|
if (cap->bo_fd >= 0) close(cap->bo_fd);
|
||||||
|
if (cap->bo) gbm_bo_destroy(cap->bo);
|
||||||
|
if (cap->gbm) gbm_device_destroy(cap->gbm);
|
||||||
|
if (cap->drm_fd >= 0) close(cap->drm_fd);
|
||||||
|
if (cap->dpy) XCloseDisplay(cap->dpy);
|
||||||
|
|
||||||
|
free(cap);
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
#ifndef UU_DRI3_CAPTURE_H
|
||||||
|
#define UU_DRI3_CAPTURE_H
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stddef.h>
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
typedef struct Dri3Capture Dri3Capture;
|
||||||
|
|
||||||
|
Dri3Capture* dri3_capture_create(const char* display_name, uint32_t width, uint32_t height);
|
||||||
|
|
||||||
|
// Trigger GPU blit from Root Window to the DRI3 DMA-BUF Pixmap.
|
||||||
|
// Returns 0 on success, negative on error.
|
||||||
|
int dri3_capture_blit(Dri3Capture* cap);
|
||||||
|
|
||||||
|
// Wait for next XDamage event or timeout (ms).
|
||||||
|
// Returns 1 if damaged, 0 if timeout, negative on error.
|
||||||
|
int dri3_capture_wait_damage(Dri3Capture* cap, int timeout_ms);
|
||||||
|
|
||||||
|
// Get the exported DMA-BUF file descriptor and stride
|
||||||
|
int dri3_capture_get_dma_fd(Dri3Capture* cap);
|
||||||
|
uint32_t dri3_capture_get_stride(Dri3Capture* cap);
|
||||||
|
|
||||||
|
void dri3_capture_destroy(Dri3Capture* cap);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif // UU_DRI3_CAPTURE_H
|
||||||
@@ -0,0 +1,580 @@
|
|||||||
|
#include "nvenc_engine.h"
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <dlfcn.h>
|
||||||
|
#include <ffnvcodec/dynlink_cuda.h>
|
||||||
|
#include <ffnvcodec/nvEncodeAPI.h>
|
||||||
|
|
||||||
|
// Struct revisions come from the vendored nvEncodeAPI.h (*_VER macros), so the session must be
|
||||||
|
// opened with that header's NVENCAPI_VERSION; older drivers are rejected in nvenc_create.
|
||||||
|
#define CU_MEMHOSTREGISTER_DEVICEMAP 0x02
|
||||||
|
|
||||||
|
typedef CUresult CUDAAPI (*tcuMemHostRegister)(void *p, size_t bytesize, unsigned int Flags);
|
||||||
|
typedef CUresult CUDAAPI (*tcuMemHostGetDevicePointer)(CUdeviceptr *pdptr, void *p, unsigned int Flags);
|
||||||
|
typedef CUresult CUDAAPI (*tcuMemHostUnregister)(void *p);
|
||||||
|
typedef NVENCSTATUS NVENCAPI (*tNvEncodeAPICreateInstance)(NV_ENCODE_API_FUNCTION_LIST *functionList);
|
||||||
|
typedef NVENCSTATUS NVENCAPI (*tNvEncodeAPIGetMaxSupportedVersion)(uint32_t *version);
|
||||||
|
|
||||||
|
struct NvencEngine {
|
||||||
|
void *cuda_lib;
|
||||||
|
void *nvenc_lib;
|
||||||
|
|
||||||
|
tcuInit *cuInit;
|
||||||
|
tcuDeviceGet *cuDeviceGet;
|
||||||
|
tcuDevicePrimaryCtxRetain *cuDevicePrimaryCtxRetain;
|
||||||
|
tcuDevicePrimaryCtxRelease *cuDevicePrimaryCtxRelease;
|
||||||
|
tcuCtxCreate_v2 *cuCtxCreate;
|
||||||
|
tcuCtxDestroy_v2 *cuCtxDestroy;
|
||||||
|
tcuCtxPushCurrent_v2 *cuCtxPushCurrent;
|
||||||
|
tcuCtxPopCurrent_v2 *cuCtxPopCurrent;
|
||||||
|
tcuMemAlloc_v2 *cuMemAlloc;
|
||||||
|
tcuMemFree_v2 *cuMemFree;
|
||||||
|
tcuMemcpyHtoD_v2 *cuMemcpyHtoD;
|
||||||
|
tcuMemHostRegister cuMemHostRegister;
|
||||||
|
tcuMemHostGetDevicePointer cuMemHostGetDevicePointer;
|
||||||
|
tcuMemHostUnregister cuMemHostUnregister;
|
||||||
|
|
||||||
|
CUdevice dev;
|
||||||
|
CUcontext cu_ctx;
|
||||||
|
int is_standalone_ctx; // cuCtxCreate fallback (primary context unavailable, seen on GB10)
|
||||||
|
CUdeviceptr cu_dptr;
|
||||||
|
size_t frame_bytes;
|
||||||
|
|
||||||
|
// Pinned XShm buffer registered for direct DMA reads
|
||||||
|
void *registered_host_ptr;
|
||||||
|
int is_zero_copy;
|
||||||
|
|
||||||
|
NV_ENCODE_API_FUNCTION_LIST fn;
|
||||||
|
void *encoder;
|
||||||
|
|
||||||
|
NV_ENC_REGISTER_RESOURCE reg_res;
|
||||||
|
NV_ENC_OUTPUT_PTR bitstream_buf;
|
||||||
|
|
||||||
|
uint32_t width;
|
||||||
|
uint32_t height;
|
||||||
|
int is_hevc;
|
||||||
|
|
||||||
|
uint8_t *output_staging;
|
||||||
|
size_t output_staging_cap;
|
||||||
|
};
|
||||||
|
|
||||||
|
// Returns 1 when the context was pushed; pop only in that case.
|
||||||
|
static int ctx_push(NvencEngine *engine) {
|
||||||
|
return engine->cuCtxPushCurrent && engine->cu_ctx && engine->cuCtxPushCurrent(engine->cu_ctx) == CUDA_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void ctx_pop(NvencEngine *engine, int pushed) {
|
||||||
|
if (pushed && engine->cuCtxPopCurrent) {
|
||||||
|
CUcontext dummy = NULL;
|
||||||
|
engine->cuCtxPopCurrent(&dummy);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
NvencEngine* nvenc_create(const NvencConfig* config) {
|
||||||
|
if (!config || config->width == 0 || config->height == 0) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
NvencEngine *engine = (NvencEngine*)calloc(1, sizeof(NvencEngine));
|
||||||
|
if (!engine) return NULL;
|
||||||
|
|
||||||
|
engine->width = config->width;
|
||||||
|
engine->height = config->height;
|
||||||
|
engine->is_hevc = config->is_hevc;
|
||||||
|
|
||||||
|
// 1. Load CUDA driver
|
||||||
|
engine->cuda_lib = dlopen("libcuda.so.1", RTLD_NOW);
|
||||||
|
if (!engine->cuda_lib) {
|
||||||
|
fprintf(stderr, "[nvenc] dlopen libcuda.so.1 failed\n");
|
||||||
|
free(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
engine->cuInit = (tcuInit*)dlsym(engine->cuda_lib, "cuInit");
|
||||||
|
engine->cuDeviceGet = (tcuDeviceGet*)dlsym(engine->cuda_lib, "cuDeviceGet");
|
||||||
|
engine->cuDevicePrimaryCtxRetain = (tcuDevicePrimaryCtxRetain*)dlsym(engine->cuda_lib, "cuDevicePrimaryCtxRetain");
|
||||||
|
engine->cuDevicePrimaryCtxRelease = (tcuDevicePrimaryCtxRelease*)dlsym(engine->cuda_lib, "cuDevicePrimaryCtxRelease_v2");
|
||||||
|
if (!engine->cuDevicePrimaryCtxRelease)
|
||||||
|
engine->cuDevicePrimaryCtxRelease = (tcuDevicePrimaryCtxRelease*)dlsym(engine->cuda_lib, "cuDevicePrimaryCtxRelease");
|
||||||
|
engine->cuCtxCreate = (tcuCtxCreate_v2*)dlsym(engine->cuda_lib, "cuCtxCreate_v2");
|
||||||
|
engine->cuCtxDestroy = (tcuCtxDestroy_v2*)dlsym(engine->cuda_lib, "cuCtxDestroy_v2");
|
||||||
|
engine->cuCtxPushCurrent = (tcuCtxPushCurrent_v2*)dlsym(engine->cuda_lib, "cuCtxPushCurrent_v2");
|
||||||
|
engine->cuCtxPopCurrent = (tcuCtxPopCurrent_v2*)dlsym(engine->cuda_lib, "cuCtxPopCurrent_v2");
|
||||||
|
engine->cuMemAlloc = (tcuMemAlloc_v2*)dlsym(engine->cuda_lib, "cuMemAlloc_v2");
|
||||||
|
engine->cuMemFree = (tcuMemFree_v2*)dlsym(engine->cuda_lib, "cuMemFree_v2");
|
||||||
|
engine->cuMemcpyHtoD = (tcuMemcpyHtoD_v2*)dlsym(engine->cuda_lib, "cuMemcpyHtoD_v2");
|
||||||
|
engine->cuMemHostRegister = (tcuMemHostRegister)dlsym(engine->cuda_lib, "cuMemHostRegister_v2");
|
||||||
|
engine->cuMemHostGetDevicePointer = (tcuMemHostGetDevicePointer)dlsym(engine->cuda_lib, "cuMemHostGetDevicePointer_v2");
|
||||||
|
engine->cuMemHostUnregister = (tcuMemHostUnregister)dlsym(engine->cuda_lib, "cuMemHostUnregister");
|
||||||
|
|
||||||
|
if (!engine->cuInit || !engine->cuDeviceGet || !engine->cuDevicePrimaryCtxRetain ||
|
||||||
|
!engine->cuDevicePrimaryCtxRelease || !engine->cuCtxPushCurrent || !engine->cuCtxPopCurrent ||
|
||||||
|
!engine->cuMemAlloc || !engine->cuMemFree || !engine->cuMemcpyHtoD) {
|
||||||
|
fprintf(stderr, "[nvenc] Missing CUDA driver symbols\n");
|
||||||
|
nvenc_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
CUresult cures = engine->cuInit(0);
|
||||||
|
if (cures != CUDA_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] cuInit failed: %d\n", cures);
|
||||||
|
nvenc_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
cures = engine->cuDeviceGet(&engine->dev, 0);
|
||||||
|
if (cures != CUDA_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] cuDeviceGet failed: %d\n", cures);
|
||||||
|
nvenc_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
cures = engine->cuDevicePrimaryCtxRetain(&engine->cu_ctx, engine->dev);
|
||||||
|
if ((cures != CUDA_SUCCESS || !engine->cu_ctx) && engine->cuCtxCreate && engine->cuCtxDestroy) {
|
||||||
|
engine->cu_ctx = NULL;
|
||||||
|
// cuCtxCreate makes the new context current; the push below makes it current again
|
||||||
|
cures = engine->cuCtxCreate(&engine->cu_ctx, 0, engine->dev);
|
||||||
|
if (cures == CUDA_SUCCESS && engine->cu_ctx) {
|
||||||
|
CUcontext dummy = NULL;
|
||||||
|
engine->cuCtxPopCurrent(&dummy);
|
||||||
|
engine->is_standalone_ctx = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (cures != CUDA_SUCCESS || !engine->cu_ctx) {
|
||||||
|
fprintf(stderr, "[nvenc] CUDA context creation failed: %d\n", cures);
|
||||||
|
engine->cu_ctx = NULL;
|
||||||
|
nvenc_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
int pushed = ctx_push(engine);
|
||||||
|
if (!pushed) {
|
||||||
|
fprintf(stderr, "[nvenc] cuCtxPushCurrent failed\n");
|
||||||
|
nvenc_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Load NVENC
|
||||||
|
engine->nvenc_lib = dlopen("libnvidia-encode.so.1", RTLD_NOW);
|
||||||
|
if (!engine->nvenc_lib) {
|
||||||
|
fprintf(stderr, "[nvenc] dlopen libnvidia-encode.so.1 failed\n");
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Like FFmpeg: the driver must support the header's API version, otherwise fall back.
|
||||||
|
tNvEncodeAPIGetMaxSupportedVersion get_max_ver = (tNvEncodeAPIGetMaxSupportedVersion)dlsym(
|
||||||
|
engine->nvenc_lib, "NvEncodeAPIGetMaxSupportedVersion");
|
||||||
|
uint32_t max_supported_ver = 0;
|
||||||
|
if (!get_max_ver || get_max_ver(&max_supported_ver) != NV_ENC_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] NvEncodeAPIGetMaxSupportedVersion failed\n");
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
if (max_supported_ver < ((NVENCAPI_MAJOR_VERSION << 4) | NVENCAPI_MINOR_VERSION)) {
|
||||||
|
fprintf(stderr, "[nvenc] Driver NVENC API %u.%u is older than required %d.%d; update the NVIDIA driver\n",
|
||||||
|
max_supported_ver >> 4, max_supported_ver & 0xf, NVENCAPI_MAJOR_VERSION, NVENCAPI_MINOR_VERSION);
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
tNvEncodeAPICreateInstance create_inst = (tNvEncodeAPICreateInstance)dlsym(engine->nvenc_lib, "NvEncodeAPICreateInstance");
|
||||||
|
if (!create_inst) {
|
||||||
|
fprintf(stderr, "[nvenc] dlsym NvEncodeAPICreateInstance failed\n");
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
memset(&engine->fn, 0, sizeof(engine->fn));
|
||||||
|
engine->fn.version = NV_ENCODE_API_FUNCTION_LIST_VER;
|
||||||
|
NVENCSTATUS nvres = create_inst(&engine->fn);
|
||||||
|
if (nvres != NV_ENC_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] NvEncodeAPICreateInstance failed: %d\n", nvres);
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Open Encode Session
|
||||||
|
NV_ENC_OPEN_ENCODE_SESSION_EX_PARAMS open_params;
|
||||||
|
memset(&open_params, 0, sizeof(open_params));
|
||||||
|
open_params.version = NV_ENC_OPEN_ENCODE_SESSION_EX_PARAMS_VER;
|
||||||
|
open_params.deviceType = NV_ENC_DEVICE_TYPE_CUDA;
|
||||||
|
open_params.device = engine->cu_ctx;
|
||||||
|
open_params.apiVersion = NVENCAPI_VERSION;
|
||||||
|
|
||||||
|
nvres = engine->fn.nvEncOpenEncodeSessionEx(&open_params, &engine->encoder);
|
||||||
|
if (nvres != NV_ENC_SUCCESS || !engine->encoder) {
|
||||||
|
fprintf(stderr, "[nvenc] nvEncOpenEncodeSessionEx failed: %d\n", nvres);
|
||||||
|
engine->encoder = NULL;
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 4. Query Preset Config
|
||||||
|
GUID codec_guid = engine->is_hevc ? NV_ENC_CODEC_HEVC_GUID : NV_ENC_CODEC_H264_GUID;
|
||||||
|
NV_ENC_PRESET_CONFIG preset_cfg;
|
||||||
|
memset(&preset_cfg, 0, sizeof(preset_cfg));
|
||||||
|
preset_cfg.version = NV_ENC_PRESET_CONFIG_VER;
|
||||||
|
preset_cfg.presetCfg.version = NV_ENC_CONFIG_VER;
|
||||||
|
|
||||||
|
nvres = engine->fn.nvEncGetEncodePresetConfigEx(
|
||||||
|
engine->encoder,
|
||||||
|
codec_guid,
|
||||||
|
NV_ENC_PRESET_P4_GUID,
|
||||||
|
NV_ENC_TUNING_INFO_ULTRA_LOW_LATENCY,
|
||||||
|
&preset_cfg
|
||||||
|
);
|
||||||
|
if (nvres != NV_ENC_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] nvEncGetEncodePresetConfigEx failed: %d\n", nvres);
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
NV_ENC_CONFIG enc_cfg;
|
||||||
|
memcpy(&enc_cfg, &preset_cfg.presetCfg, sizeof(NV_ENC_CONFIG));
|
||||||
|
|
||||||
|
enc_cfg.gopLength = config->gop > 0 ? config->gop : NVENC_INFINITE_GOPLENGTH;
|
||||||
|
enc_cfg.frameIntervalP = 1; // Strict low-latency: zero B-frames
|
||||||
|
enc_cfg.rcParams.rateControlMode = NV_ENC_PARAMS_RC_VBR;
|
||||||
|
enc_cfg.rcParams.averageBitRate = (uint32_t)(config->target_bps > 0 ? config->target_bps : 10000000);
|
||||||
|
enc_cfg.rcParams.maxBitRate = (uint32_t)(config->max_bps > 0 ? config->max_bps : 15000000);
|
||||||
|
enc_cfg.rcParams.vbvBufferSize = (uint32_t)(config->buffer_bits > 0 ? config->buffer_bits : (config->max_bps > 0 ? config->max_bps / 10 : 1500000));
|
||||||
|
enc_cfg.rcParams.targetQuality = (uint8_t)(config->cq > 0 ? config->cq : 28);
|
||||||
|
NV_ENC_CAPS_PARAM caps_param;
|
||||||
|
memset(&caps_param, 0, sizeof(caps_param));
|
||||||
|
caps_param.version = NV_ENC_CAPS_PARAM_VER;
|
||||||
|
int caps_val = 0;
|
||||||
|
if (config->chroma_444) {
|
||||||
|
// GPUs without 4:4:4 encode fail here; the caller falls back to FFmpeg/libx264, which keep 4:4:4.
|
||||||
|
caps_param.capsToQuery = NV_ENC_CAPS_SUPPORT_YUV444_ENCODE;
|
||||||
|
if (engine->fn.nvEncGetEncodeCaps(engine->encoder, codec_guid, &caps_param, &caps_val) != NV_ENC_SUCCESS || caps_val <= 0) {
|
||||||
|
fprintf(stderr, "[nvenc] 4:4:4 encoding not supported for this codec\n");
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
// NVENC rejects AQ / temporal AQ in 4:4:4 mode.
|
||||||
|
enc_cfg.rcParams.enableAQ = 0;
|
||||||
|
enc_cfg.rcParams.enableTemporalAQ = 0;
|
||||||
|
} else {
|
||||||
|
enc_cfg.rcParams.enableAQ = 1;
|
||||||
|
// Temporal AQ only where the hardware/codec reports it
|
||||||
|
caps_param.capsToQuery = NV_ENC_CAPS_SUPPORT_TEMPORAL_AQ;
|
||||||
|
caps_val = 0;
|
||||||
|
enc_cfg.rcParams.enableTemporalAQ =
|
||||||
|
engine->fn.nvEncGetEncodeCaps(engine->encoder, codec_guid, &caps_param, &caps_val) == NV_ENC_SUCCESS && caps_val > 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (engine->is_hevc) {
|
||||||
|
enc_cfg.profileGUID = config->chroma_444 ? NV_ENC_HEVC_PROFILE_FREXT_GUID : NV_ENC_HEVC_PROFILE_MAIN_GUID;
|
||||||
|
enc_cfg.encodeCodecConfig.hevcConfig.chromaFormatIDC = config->chroma_444 ? 3 : 1;
|
||||||
|
enc_cfg.encodeCodecConfig.hevcConfig.idrPeriod = enc_cfg.gopLength;
|
||||||
|
enc_cfg.encodeCodecConfig.hevcConfig.repeatSPSPPS = 1;
|
||||||
|
enc_cfg.encodeCodecConfig.hevcConfig.outputAUD = 1;
|
||||||
|
} else {
|
||||||
|
enc_cfg.profileGUID = config->chroma_444 ? NV_ENC_H264_PROFILE_HIGH_444_GUID : NV_ENC_H264_PROFILE_BASELINE_GUID;
|
||||||
|
enc_cfg.encodeCodecConfig.h264Config.chromaFormatIDC = config->chroma_444 ? 3 : 1;
|
||||||
|
enc_cfg.encodeCodecConfig.h264Config.idrPeriod = enc_cfg.gopLength;
|
||||||
|
enc_cfg.encodeCodecConfig.h264Config.repeatSPSPPS = 1;
|
||||||
|
enc_cfg.encodeCodecConfig.h264Config.outputAUD = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 5. Initialize Encoder
|
||||||
|
NV_ENC_INITIALIZE_PARAMS init_params;
|
||||||
|
memset(&init_params, 0, sizeof(init_params));
|
||||||
|
init_params.version = NV_ENC_INITIALIZE_PARAMS_VER;
|
||||||
|
init_params.encodeGUID = codec_guid;
|
||||||
|
init_params.presetGUID = NV_ENC_PRESET_P4_GUID;
|
||||||
|
init_params.encodeWidth = engine->width;
|
||||||
|
init_params.encodeHeight = engine->height;
|
||||||
|
init_params.darWidth = engine->width;
|
||||||
|
init_params.darHeight = engine->height;
|
||||||
|
init_params.frameRateNum = config->fps > 0 ? config->fps : 60;
|
||||||
|
init_params.frameRateDen = 1;
|
||||||
|
init_params.enablePTD = 1;
|
||||||
|
init_params.tuningInfo = NV_ENC_TUNING_INFO_ULTRA_LOW_LATENCY;
|
||||||
|
init_params.encodeConfig = &enc_cfg;
|
||||||
|
|
||||||
|
nvres = engine->fn.nvEncInitializeEncoder(engine->encoder, &init_params);
|
||||||
|
if (nvres != NV_ENC_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] nvEncInitializeEncoder failed: %d\n", nvres);
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 6. Device input buffer (ARGB32), used until a host buffer is registered
|
||||||
|
engine->frame_bytes = (size_t)engine->width * engine->height * 4;
|
||||||
|
cures = engine->cuMemAlloc(&engine->cu_dptr, engine->frame_bytes);
|
||||||
|
if (cures != CUDA_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] cuMemAlloc failed: %d\n", cures);
|
||||||
|
engine->cu_dptr = 0;
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
memset(&engine->reg_res, 0, sizeof(engine->reg_res));
|
||||||
|
engine->reg_res.version = NV_ENC_REGISTER_RESOURCE_VER;
|
||||||
|
engine->reg_res.resourceType = NV_ENC_INPUT_RESOURCE_TYPE_CUDADEVICEPTR;
|
||||||
|
engine->reg_res.width = engine->width;
|
||||||
|
engine->reg_res.height = engine->height;
|
||||||
|
engine->reg_res.pitch = engine->width * 4;
|
||||||
|
engine->reg_res.resourceToRegister = (void*)engine->cu_dptr;
|
||||||
|
engine->reg_res.bufferFormat = NV_ENC_BUFFER_FORMAT_ARGB;
|
||||||
|
|
||||||
|
nvres = engine->fn.nvEncRegisterResource(engine->encoder, &engine->reg_res);
|
||||||
|
if (nvres != NV_ENC_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] nvEncRegisterResource failed: %d\n", nvres);
|
||||||
|
engine->reg_res.registeredResource = NULL;
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 7. Create bitstream output buffer
|
||||||
|
NV_ENC_CREATE_BITSTREAM_BUFFER bs_buf;
|
||||||
|
memset(&bs_buf, 0, sizeof(bs_buf));
|
||||||
|
bs_buf.version = NV_ENC_CREATE_BITSTREAM_BUFFER_VER;
|
||||||
|
nvres = engine->fn.nvEncCreateBitstreamBuffer(engine->encoder, &bs_buf);
|
||||||
|
if (nvres != NV_ENC_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] nvEncCreateBitstreamBuffer failed: %d\n", nvres);
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
engine->bitstream_buf = bs_buf.bitstreamBuffer;
|
||||||
|
|
||||||
|
engine->output_staging_cap = 2 * 1024 * 1024;
|
||||||
|
engine->output_staging = (uint8_t*)malloc(engine->output_staging_cap);
|
||||||
|
if (!engine->output_staging) {
|
||||||
|
fprintf(stderr, "[nvenc] output buffer allocation failed\n");
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
return engine;
|
||||||
|
|
||||||
|
fail:
|
||||||
|
// Pop the creation push first; nvenc_destroy pushes and pops on its own.
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
nvenc_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
int nvenc_register_host_buffer(NvencEngine* engine, void* host_ptr, size_t size) {
|
||||||
|
if (!engine || !host_ptr || size < engine->frame_bytes) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
if (!engine->cuMemHostRegister || !engine->cuMemHostGetDevicePointer || !engine->cuMemHostUnregister) {
|
||||||
|
return -2;
|
||||||
|
}
|
||||||
|
|
||||||
|
int pushed = ctx_push(engine);
|
||||||
|
if (!pushed) return -2;
|
||||||
|
|
||||||
|
// If already registered, unregister first
|
||||||
|
nvenc_unregister_host_buffer(engine);
|
||||||
|
|
||||||
|
CUresult cures = engine->cuMemHostRegister(host_ptr, size, CU_MEMHOSTREGISTER_DEVICEMAP);
|
||||||
|
if (cures != CUDA_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] cuMemHostRegister failed: %d\n", cures);
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
return -3;
|
||||||
|
}
|
||||||
|
|
||||||
|
CUdeviceptr dev_ptr = 0;
|
||||||
|
cures = engine->cuMemHostGetDevicePointer(&dev_ptr, host_ptr, 0);
|
||||||
|
if (cures != CUDA_SUCCESS || dev_ptr == 0) {
|
||||||
|
fprintf(stderr, "[nvenc] cuMemHostGetDevicePointer failed: %d\n", cures);
|
||||||
|
engine->cuMemHostUnregister(host_ptr);
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
return -4;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Register the pinned buffer before releasing the device buffer, so a failure keeps the copy path working
|
||||||
|
NV_ENC_REGISTER_RESOURCE new_reg;
|
||||||
|
memset(&new_reg, 0, sizeof(new_reg));
|
||||||
|
new_reg.version = NV_ENC_REGISTER_RESOURCE_VER;
|
||||||
|
new_reg.resourceType = NV_ENC_INPUT_RESOURCE_TYPE_CUDADEVICEPTR;
|
||||||
|
new_reg.width = engine->width;
|
||||||
|
new_reg.height = engine->height;
|
||||||
|
new_reg.pitch = engine->width * 4;
|
||||||
|
new_reg.resourceToRegister = (void*)dev_ptr;
|
||||||
|
new_reg.bufferFormat = NV_ENC_BUFFER_FORMAT_ARGB;
|
||||||
|
|
||||||
|
NVENCSTATUS nvres = engine->fn.nvEncRegisterResource(engine->encoder, &new_reg);
|
||||||
|
if (nvres != NV_ENC_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] nvEncRegisterResource (pinned host) failed: %d\n", nvres);
|
||||||
|
engine->cuMemHostUnregister(host_ptr);
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
return -5;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (engine->reg_res.registeredResource) {
|
||||||
|
engine->fn.nvEncUnregisterResource(engine->encoder, engine->reg_res.registeredResource);
|
||||||
|
}
|
||||||
|
if (engine->cu_dptr) {
|
||||||
|
engine->cuMemFree(engine->cu_dptr);
|
||||||
|
engine->cu_dptr = 0;
|
||||||
|
}
|
||||||
|
engine->reg_res = new_reg;
|
||||||
|
engine->registered_host_ptr = host_ptr;
|
||||||
|
engine->is_zero_copy = 1;
|
||||||
|
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Caller has the context current.
|
||||||
|
void nvenc_unregister_host_buffer(NvencEngine* engine) {
|
||||||
|
if (!engine || !engine->is_zero_copy) return;
|
||||||
|
|
||||||
|
if (engine->reg_res.registeredResource && engine->encoder) {
|
||||||
|
engine->fn.nvEncUnregisterResource(engine->encoder, engine->reg_res.registeredResource);
|
||||||
|
memset(&engine->reg_res, 0, sizeof(engine->reg_res));
|
||||||
|
}
|
||||||
|
if (engine->registered_host_ptr && engine->cuMemHostUnregister) {
|
||||||
|
engine->cuMemHostUnregister(engine->registered_host_ptr);
|
||||||
|
engine->registered_host_ptr = NULL;
|
||||||
|
}
|
||||||
|
engine->is_zero_copy = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int nvenc_encode_frame(
|
||||||
|
NvencEngine* engine,
|
||||||
|
const uint8_t* input_argb,
|
||||||
|
uint32_t pitch,
|
||||||
|
int force_idr,
|
||||||
|
const uint8_t** out_data,
|
||||||
|
uint32_t* out_len
|
||||||
|
) {
|
||||||
|
if (!engine || !out_data || !out_len || !engine->reg_res.registeredResource) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
*out_data = NULL;
|
||||||
|
*out_len = 0;
|
||||||
|
|
||||||
|
int pushed = ctx_push(engine);
|
||||||
|
if (!pushed) return -1;
|
||||||
|
|
||||||
|
// Without a registered host buffer, copy the frame into the device buffer
|
||||||
|
if (!engine->is_zero_copy) {
|
||||||
|
if (!input_argb) {
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
CUresult cures = CUDA_SUCCESS;
|
||||||
|
if (pitch == engine->width * 4) {
|
||||||
|
cures = engine->cuMemcpyHtoD(engine->cu_dptr, input_argb, engine->frame_bytes);
|
||||||
|
} else {
|
||||||
|
for (uint32_t y = 0; y < engine->height && cures == CUDA_SUCCESS; y++) {
|
||||||
|
cures = engine->cuMemcpyHtoD(
|
||||||
|
engine->cu_dptr + (size_t)y * engine->width * 4,
|
||||||
|
input_argb + (size_t)y * pitch,
|
||||||
|
engine->width * 4
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (cures != CUDA_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] cuMemcpyHtoD failed: %d\n", cures);
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
return -2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
NV_ENC_MAP_INPUT_RESOURCE map_res;
|
||||||
|
memset(&map_res, 0, sizeof(map_res));
|
||||||
|
map_res.version = NV_ENC_MAP_INPUT_RESOURCE_VER;
|
||||||
|
map_res.registeredResource = engine->reg_res.registeredResource;
|
||||||
|
NVENCSTATUS nvres = engine->fn.nvEncMapInputResource(engine->encoder, &map_res);
|
||||||
|
if (nvres != NV_ENC_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] nvEncMapInputResource failed: %d\n", nvres);
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
return -3;
|
||||||
|
}
|
||||||
|
|
||||||
|
NV_ENC_PIC_PARAMS pic_params;
|
||||||
|
memset(&pic_params, 0, sizeof(pic_params));
|
||||||
|
pic_params.version = NV_ENC_PIC_PARAMS_VER;
|
||||||
|
pic_params.inputWidth = engine->width;
|
||||||
|
pic_params.inputHeight = engine->height;
|
||||||
|
pic_params.inputPitch = engine->width * 4;
|
||||||
|
pic_params.inputBuffer = map_res.mappedResource;
|
||||||
|
pic_params.outputBitstream = engine->bitstream_buf;
|
||||||
|
pic_params.bufferFmt = NV_ENC_BUFFER_FORMAT_ARGB;
|
||||||
|
pic_params.pictureStruct = NV_ENC_PIC_STRUCT_FRAME;
|
||||||
|
if (force_idr) {
|
||||||
|
pic_params.encodePicFlags = NV_ENC_PIC_FLAG_FORCEIDR;
|
||||||
|
}
|
||||||
|
|
||||||
|
nvres = engine->fn.nvEncEncodePicture(engine->encoder, &pic_params);
|
||||||
|
if (nvres != NV_ENC_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] nvEncEncodePicture failed: %d\n", nvres);
|
||||||
|
engine->fn.nvEncUnmapInputResource(engine->encoder, map_res.mappedResource);
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
return -4;
|
||||||
|
}
|
||||||
|
|
||||||
|
NV_ENC_LOCK_BITSTREAM lock_bs;
|
||||||
|
memset(&lock_bs, 0, sizeof(lock_bs));
|
||||||
|
lock_bs.version = NV_ENC_LOCK_BITSTREAM_VER;
|
||||||
|
lock_bs.outputBitstream = engine->bitstream_buf;
|
||||||
|
lock_bs.doNotWait = 0;
|
||||||
|
|
||||||
|
nvres = engine->fn.nvEncLockBitstream(engine->encoder, &lock_bs);
|
||||||
|
if (nvres != NV_ENC_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] nvEncLockBitstream failed: %d\n", nvres);
|
||||||
|
engine->fn.nvEncUnmapInputResource(engine->encoder, map_res.mappedResource);
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
return -5;
|
||||||
|
}
|
||||||
|
|
||||||
|
int rc = 0;
|
||||||
|
uint32_t size = lock_bs.bitstreamSizeInBytes;
|
||||||
|
if (size > engine->output_staging_cap) {
|
||||||
|
size_t cap = (size_t)size + 64 * 1024;
|
||||||
|
uint8_t *grown = (uint8_t*)realloc(engine->output_staging, cap);
|
||||||
|
if (grown) {
|
||||||
|
engine->output_staging = grown;
|
||||||
|
engine->output_staging_cap = cap;
|
||||||
|
} else {
|
||||||
|
fprintf(stderr, "[nvenc] output buffer allocation failed: %u bytes\n", size);
|
||||||
|
rc = -6;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (rc == 0 && size > 0 && lock_bs.bitstreamBufferPtr) {
|
||||||
|
memcpy(engine->output_staging, lock_bs.bitstreamBufferPtr, size);
|
||||||
|
*out_data = engine->output_staging;
|
||||||
|
*out_len = size;
|
||||||
|
}
|
||||||
|
|
||||||
|
engine->fn.nvEncUnlockBitstream(engine->encoder, engine->bitstream_buf);
|
||||||
|
// The SDK allows unmapping only after the bitstream lock returned for this picture
|
||||||
|
engine->fn.nvEncUnmapInputResource(engine->encoder, map_res.mappedResource);
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
|
||||||
|
void nvenc_destroy(NvencEngine* engine) {
|
||||||
|
if (!engine) return;
|
||||||
|
|
||||||
|
int pushed = ctx_push(engine);
|
||||||
|
// Without a current context the NVENC/CUDA objects cannot be released safely; leak them.
|
||||||
|
if (pushed) {
|
||||||
|
if (engine->bitstream_buf && engine->encoder) {
|
||||||
|
engine->fn.nvEncDestroyBitstreamBuffer(engine->encoder, engine->bitstream_buf);
|
||||||
|
engine->bitstream_buf = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
nvenc_unregister_host_buffer(engine);
|
||||||
|
|
||||||
|
if (engine->reg_res.registeredResource && engine->encoder) {
|
||||||
|
engine->fn.nvEncUnregisterResource(engine->encoder, engine->reg_res.registeredResource);
|
||||||
|
memset(&engine->reg_res, 0, sizeof(engine->reg_res));
|
||||||
|
}
|
||||||
|
if (engine->cu_dptr) {
|
||||||
|
engine->cuMemFree(engine->cu_dptr);
|
||||||
|
engine->cu_dptr = 0;
|
||||||
|
}
|
||||||
|
if (engine->encoder) {
|
||||||
|
engine->fn.nvEncDestroyEncoder(engine->encoder);
|
||||||
|
engine->encoder = NULL;
|
||||||
|
}
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (engine->cu_ctx) {
|
||||||
|
if (engine->is_standalone_ctx) engine->cuCtxDestroy(engine->cu_ctx);
|
||||||
|
else engine->cuDevicePrimaryCtxRelease(engine->dev);
|
||||||
|
engine->cu_ctx = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
free(engine->output_staging);
|
||||||
|
// libcuda/libnvidia-encode stay loaded: their driver threads outlive the session, and
|
||||||
|
// dlclose crashed them on the next encoder start (SEGV_MAPERR in libnvcuvid).
|
||||||
|
free(engine);
|
||||||
|
}
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
#ifndef UU_NVENC_ENGINE_H
|
||||||
|
#define UU_NVENC_ENGINE_H
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stddef.h>
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
typedef struct NvencEngine NvencEngine;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
uint32_t width;
|
||||||
|
uint32_t height;
|
||||||
|
uint32_t fps;
|
||||||
|
uint32_t gop;
|
||||||
|
uint32_t cq;
|
||||||
|
int64_t target_bps;
|
||||||
|
int64_t max_bps;
|
||||||
|
int64_t buffer_bits;
|
||||||
|
int is_hevc; // 1 = H.265, 0 = H.264
|
||||||
|
int chroma_444; // 1 = 4:4:4 (H.264 High 4:4:4 / HEVC FRExt), 0 = 4:2:0
|
||||||
|
} NvencConfig;
|
||||||
|
|
||||||
|
// Initialize and open an NVENC encoding session. Returns NULL on error.
|
||||||
|
NvencEngine* nvenc_create(const NvencConfig* config);
|
||||||
|
|
||||||
|
// Register host shared memory (XShm buffer) as CUDA pinned memory that NVENC reads by DMA.
|
||||||
|
// Returns 0 on success, negative value on error.
|
||||||
|
int nvenc_register_host_buffer(NvencEngine* engine, void* host_ptr, size_t size);
|
||||||
|
|
||||||
|
// Unregister a previously registered host buffer (the CUDA context must be current).
|
||||||
|
void nvenc_unregister_host_buffer(NvencEngine* engine);
|
||||||
|
|
||||||
|
// Encode one frame.
|
||||||
|
// If host buffer was registered via nvenc_register_host_buffer, input_argb can be NULL
|
||||||
|
// and the encoder reads the registered host memory directly (no host-to-device copy).
|
||||||
|
// force_idr: 1 to force keyframe/IDR, 0 otherwise
|
||||||
|
// out_data: pointer to receive the bitstream buffer (valid until next encode call or destroy)
|
||||||
|
// out_len: pointer to receive the bitstream size in bytes
|
||||||
|
// Returns 0 on success, negative value on error.
|
||||||
|
int nvenc_encode_frame(
|
||||||
|
NvencEngine* engine,
|
||||||
|
const uint8_t* input_argb,
|
||||||
|
uint32_t pitch,
|
||||||
|
int force_idr,
|
||||||
|
const uint8_t** out_data,
|
||||||
|
uint32_t* out_len
|
||||||
|
);
|
||||||
|
|
||||||
|
// Destroy the NVENC engine and free all CUDA/NVENC resources.
|
||||||
|
void nvenc_destroy(NvencEngine* engine);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif // UU_NVENC_ENGINE_H
|
||||||
@@ -0,0 +1,835 @@
|
|||||||
|
#include "vaapi_engine.h"
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <dlfcn.h>
|
||||||
|
#include <va/va.h>
|
||||||
|
#include <va/va_drm.h>
|
||||||
|
#include <va/va_drmcommon.h>
|
||||||
|
#include <va/va_vpp.h>
|
||||||
|
#include <va/va_enc_h264.h>
|
||||||
|
|
||||||
|
// Runtime-loaded libva, like the NVENC engine's libcuda/libnvidia-encode: an inproc-av build
|
||||||
|
// must not add a hard DT_NEEDED on libva for users who never touch VAAPI.
|
||||||
|
// Signatures come from the installed headers via __typeof__ so they cannot drift.
|
||||||
|
static struct {
|
||||||
|
void *libva, *libva_drm;
|
||||||
|
__typeof__(vaGetDisplayDRM) *vaGetDisplayDRM;
|
||||||
|
__typeof__(vaInitialize) *vaInitialize;
|
||||||
|
__typeof__(vaTerminate) *vaTerminate;
|
||||||
|
__typeof__(vaErrorStr) *vaErrorStr;
|
||||||
|
__typeof__(vaCreateSurfaces) *vaCreateSurfaces;
|
||||||
|
__typeof__(vaDestroySurfaces) *vaDestroySurfaces;
|
||||||
|
__typeof__(vaCreateConfig) *vaCreateConfig;
|
||||||
|
__typeof__(vaDestroyConfig) *vaDestroyConfig;
|
||||||
|
__typeof__(vaCreateContext) *vaCreateContext;
|
||||||
|
__typeof__(vaDestroyContext) *vaDestroyContext;
|
||||||
|
__typeof__(vaCreateBuffer) *vaCreateBuffer;
|
||||||
|
__typeof__(vaDestroyBuffer) *vaDestroyBuffer;
|
||||||
|
__typeof__(vaMapBuffer) *vaMapBuffer;
|
||||||
|
__typeof__(vaUnmapBuffer) *vaUnmapBuffer;
|
||||||
|
__typeof__(vaCreateImage) *vaCreateImage;
|
||||||
|
__typeof__(vaDestroyImage) *vaDestroyImage;
|
||||||
|
__typeof__(vaPutImage) *vaPutImage;
|
||||||
|
__typeof__(vaBeginPicture) *vaBeginPicture;
|
||||||
|
__typeof__(vaRenderPicture) *vaRenderPicture;
|
||||||
|
__typeof__(vaEndPicture) *vaEndPicture;
|
||||||
|
__typeof__(vaSyncSurface) *vaSyncSurface;
|
||||||
|
} RT;
|
||||||
|
|
||||||
|
static int vaapi_load_runtime(void) {
|
||||||
|
if (RT.libva) return 0;
|
||||||
|
RT.libva = dlopen("libva.so.2", RTLD_NOW | RTLD_GLOBAL);
|
||||||
|
RT.libva_drm = dlopen("libva-drm.so.2", RTLD_NOW);
|
||||||
|
if (!RT.libva || !RT.libva_drm) {
|
||||||
|
fprintf(stderr, "[vaapi] dlopen libva/libva-drm failed\n");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
// libva-drm depends on libva, so one lookup covers both libraries
|
||||||
|
#define VA_LOAD(sym) do { \
|
||||||
|
*(void**)&RT.sym = dlsym(RT.libva_drm, #sym) ? dlsym(RT.libva_drm, #sym) : dlsym(RT.libva, #sym); \
|
||||||
|
if (!RT.sym) { dlclose(RT.libva_drm); dlclose(RT.libva); RT.libva = RT.libva_drm = NULL; return -1; } \
|
||||||
|
} while (0)
|
||||||
|
VA_LOAD(vaGetDisplayDRM);
|
||||||
|
VA_LOAD(vaInitialize);
|
||||||
|
VA_LOAD(vaTerminate);
|
||||||
|
VA_LOAD(vaErrorStr);
|
||||||
|
VA_LOAD(vaCreateSurfaces);
|
||||||
|
VA_LOAD(vaDestroySurfaces);
|
||||||
|
VA_LOAD(vaCreateConfig);
|
||||||
|
VA_LOAD(vaDestroyConfig);
|
||||||
|
VA_LOAD(vaCreateContext);
|
||||||
|
VA_LOAD(vaDestroyContext);
|
||||||
|
VA_LOAD(vaCreateBuffer);
|
||||||
|
VA_LOAD(vaDestroyBuffer);
|
||||||
|
VA_LOAD(vaMapBuffer);
|
||||||
|
VA_LOAD(vaUnmapBuffer);
|
||||||
|
VA_LOAD(vaCreateImage);
|
||||||
|
VA_LOAD(vaDestroyImage);
|
||||||
|
VA_LOAD(vaPutImage);
|
||||||
|
VA_LOAD(vaBeginPicture);
|
||||||
|
VA_LOAD(vaRenderPicture);
|
||||||
|
VA_LOAD(vaEndPicture);
|
||||||
|
VA_LOAD(vaSyncSurface);
|
||||||
|
#undef VA_LOAD
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct VaapiEngine {
|
||||||
|
int drm_fd;
|
||||||
|
VADisplay va_dpy;
|
||||||
|
uint32_t cap_width; // capture (RGB input) size
|
||||||
|
uint32_t cap_height;
|
||||||
|
uint32_t width; // encode (output) size
|
||||||
|
uint32_t height;
|
||||||
|
uint32_t fps;
|
||||||
|
uint32_t gop;
|
||||||
|
int64_t target_bps;
|
||||||
|
int64_t max_bps;
|
||||||
|
int64_t buffer_bits;
|
||||||
|
int is_hevc;
|
||||||
|
uint32_t frame_count;
|
||||||
|
// frames since the last IDR (periodic GOP), the alternating idr_pic_id, and an IDR owed after a lost frame
|
||||||
|
uint32_t since_idr;
|
||||||
|
uint32_t idr_pic_id;
|
||||||
|
int idr_pending;
|
||||||
|
// frame_num / POC bookkeeping since the last IDR; H264 state the driver does not derive itself
|
||||||
|
uint32_t frame_num;
|
||||||
|
uint32_t rc_mode;
|
||||||
|
|
||||||
|
// DMA-BUF backing
|
||||||
|
int dma_fd;
|
||||||
|
uint32_t stride;
|
||||||
|
|
||||||
|
// Surfaces & Contexts
|
||||||
|
VASurfaceID in_rgb_surf;
|
||||||
|
VASurfaceID nv12_surf;
|
||||||
|
VASurfaceID recon_surfs[2];
|
||||||
|
|
||||||
|
VAConfigID vpp_cfg;
|
||||||
|
VAContextID vpp_ctx;
|
||||||
|
VABufferID vpp_buf;
|
||||||
|
VARectangle src_rect, dst_rect;
|
||||||
|
|
||||||
|
VAConfigID enc_cfg;
|
||||||
|
VAContextID enc_ctx;
|
||||||
|
VABufferID coded_buf;
|
||||||
|
|
||||||
|
uint8_t *output_staging;
|
||||||
|
uint32_t output_staging_cap;
|
||||||
|
// Host upload path: a VAImage the CPU writes, then vaPutImage into in_rgb_surf
|
||||||
|
VAImage upload_img;
|
||||||
|
int upload_ready;
|
||||||
|
};
|
||||||
|
|
||||||
|
// The VPP pipeline buffer points at the engine-owned rects, so VPP scales cap -> output
|
||||||
|
static int vaapi_make_vpp_buffer(VaapiEngine* engine) {
|
||||||
|
VAProcPipelineParameterBuffer vpp_param;
|
||||||
|
memset(&vpp_param, 0, sizeof(vpp_param));
|
||||||
|
vpp_param.surface = engine->in_rgb_surf;
|
||||||
|
vpp_param.surface_region = &engine->src_rect;
|
||||||
|
vpp_param.output_region = &engine->dst_rect;
|
||||||
|
return RT.vaCreateBuffer(engine->va_dpy, engine->vpp_ctx, VAProcPipelineParameterBufferType,
|
||||||
|
sizeof(vpp_param), 1, &vpp_param, &engine->vpp_buf) == VA_STATUS_SUCCESS ? 0 : -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
VaapiEngine* vaapi_create(const VaapiConfig* config) {
|
||||||
|
if (!config || config->width == 0 || config->height == 0 || config->cap_width == 0 || config->cap_height == 0) return NULL;
|
||||||
|
|
||||||
|
if (vaapi_load_runtime() != 0) return NULL;
|
||||||
|
|
||||||
|
VaapiEngine* engine = (VaapiEngine*)calloc(1, sizeof(VaapiEngine));
|
||||||
|
if (!engine) return NULL;
|
||||||
|
|
||||||
|
engine->cap_width = config->cap_width;
|
||||||
|
engine->cap_height = config->cap_height;
|
||||||
|
engine->width = config->width;
|
||||||
|
engine->height = config->height;
|
||||||
|
engine->fps = config->fps > 0 ? config->fps : 60;
|
||||||
|
engine->gop = config->gop > 0 ? config->gop : 30;
|
||||||
|
engine->target_bps = config->target_bps > 0 ? config->target_bps : 6000000;
|
||||||
|
engine->max_bps = config->max_bps > engine->target_bps ? config->max_bps : engine->target_bps;
|
||||||
|
engine->buffer_bits = config->buffer_bits > 0 ? config->buffer_bits : engine->max_bps;
|
||||||
|
engine->is_hevc = config->is_hevc;
|
||||||
|
engine->dma_fd = -1;
|
||||||
|
// calloc leaves surface/context IDs at 0, which is a valid VA ID; mark them unset.
|
||||||
|
engine->in_rgb_surf = VA_INVALID_ID;
|
||||||
|
engine->nv12_surf = VA_INVALID_ID;
|
||||||
|
engine->recon_surfs[0] = VA_INVALID_ID;
|
||||||
|
engine->recon_surfs[1] = VA_INVALID_ID;
|
||||||
|
engine->vpp_cfg = VA_INVALID_ID;
|
||||||
|
engine->vpp_ctx = VA_INVALID_ID;
|
||||||
|
engine->vpp_buf = VA_INVALID_ID;
|
||||||
|
engine->enc_cfg = VA_INVALID_ID;
|
||||||
|
engine->enc_ctx = VA_INVALID_ID;
|
||||||
|
engine->coded_buf = VA_INVALID_ID;
|
||||||
|
engine->src_rect.width = config->cap_width;
|
||||||
|
engine->src_rect.height = config->cap_height;
|
||||||
|
engine->dst_rect.width = config->width;
|
||||||
|
engine->dst_rect.height = config->height;
|
||||||
|
|
||||||
|
engine->drm_fd = open(config->device ? config->device : "/dev/dri/renderD128", O_RDWR);
|
||||||
|
if (engine->drm_fd < 0) {
|
||||||
|
fprintf(stderr, "[vaapi] failed to open %s\n", config->device ? config->device : "/dev/dri/renderD128");
|
||||||
|
free(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
engine->va_dpy = RT.vaGetDisplayDRM(engine->drm_fd);
|
||||||
|
if (!engine->va_dpy) {
|
||||||
|
close(engine->drm_fd);
|
||||||
|
free(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
int maj, min;
|
||||||
|
VAStatus st = RT.vaInitialize(engine->va_dpy, &maj, &min);
|
||||||
|
if (st != VA_STATUS_SUCCESS) {
|
||||||
|
fprintf(stderr, "[vaapi] vaInitialize failed: %s\n", RT.vaErrorStr(st));
|
||||||
|
close(engine->drm_fd);
|
||||||
|
free(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 1. NV12 intermediate + two Recon surfaces at the encode size (ping-pong: a P frame must
|
||||||
|
// not reference the surface its own reconstruction is being written into)
|
||||||
|
st = RT.vaCreateSurfaces(engine->va_dpy, VA_RT_FORMAT_YUV420, engine->width, engine->height, &engine->nv12_surf, 1, NULL, 0);
|
||||||
|
if (st != VA_STATUS_SUCCESS) {
|
||||||
|
vaapi_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
st = RT.vaCreateSurfaces(engine->va_dpy, VA_RT_FORMAT_YUV420, engine->width, engine->height, engine->recon_surfs, 2, NULL, 0);
|
||||||
|
if (st != VA_STATUS_SUCCESS) {
|
||||||
|
vaapi_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Setup VPP (Video Processing Pipeline for Hardware RGB->NV12 with scaling)
|
||||||
|
uint32_t vpp_w = engine->cap_width > engine->width ? engine->cap_width : engine->width;
|
||||||
|
uint32_t vpp_h = engine->cap_height > engine->height ? engine->cap_height : engine->height;
|
||||||
|
st = RT.vaCreateConfig(engine->va_dpy, VAProfileNone, VAEntrypointVideoProc, NULL, 0, &engine->vpp_cfg);
|
||||||
|
if (st != VA_STATUS_SUCCESS) {
|
||||||
|
vaapi_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
st = RT.vaCreateContext(engine->va_dpy, engine->vpp_cfg, vpp_w, vpp_h, 0, NULL, 0, &engine->vpp_ctx);
|
||||||
|
if (st != VA_STATUS_SUCCESS) {
|
||||||
|
vaapi_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Setup H.264 / HEVC EncSlice
|
||||||
|
VAProfile profile = engine->is_hevc ? VAProfileHEVCMain : VAProfileH264Main;
|
||||||
|
VAConfigAttrib enc_attrib[3];
|
||||||
|
enc_attrib[0].type = VAConfigAttribRTFormat;
|
||||||
|
enc_attrib[0].value = VA_RT_FORMAT_YUV420;
|
||||||
|
enc_attrib[1].type = VAConfigAttribRateControl;
|
||||||
|
// The engine writes SPS, PPS and slice headers itself (see BitWriter)
|
||||||
|
enc_attrib[2].type = VAConfigAttribEncPackedHeaders;
|
||||||
|
enc_attrib[2].value = VA_ENC_PACKED_HEADER_SEQUENCE | VA_ENC_PACKED_HEADER_SLICE;
|
||||||
|
// VBR like the FFmpeg VAAPI pipeline (target + maxrate), then CBR, then CQP
|
||||||
|
enc_attrib[1].value = VA_RC_VBR;
|
||||||
|
engine->rc_mode = VA_RC_VBR;
|
||||||
|
st = RT.vaCreateConfig(engine->va_dpy, profile, VAEntrypointEncSlice, enc_attrib, 3, &engine->enc_cfg);
|
||||||
|
if (st != VA_STATUS_SUCCESS) {
|
||||||
|
enc_attrib[1].value = VA_RC_CBR;
|
||||||
|
engine->rc_mode = VA_RC_CBR;
|
||||||
|
st = RT.vaCreateConfig(engine->va_dpy, profile, VAEntrypointEncSlice, enc_attrib, 3, &engine->enc_cfg);
|
||||||
|
}
|
||||||
|
if (st != VA_STATUS_SUCCESS) {
|
||||||
|
// Fallback to CQP if CBR unsupported
|
||||||
|
enc_attrib[1].value = VA_RC_CQP;
|
||||||
|
st = RT.vaCreateConfig(engine->va_dpy, profile, VAEntrypointEncSlice, enc_attrib, 3, &engine->enc_cfg);
|
||||||
|
if (st != VA_STATUS_SUCCESS) {
|
||||||
|
fprintf(stderr, "[vaapi] vaCreateConfig EncSlice failed: %s\n", RT.vaErrorStr(st));
|
||||||
|
vaapi_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
engine->rc_mode = VA_RC_CQP;
|
||||||
|
}
|
||||||
|
|
||||||
|
st = RT.vaCreateContext(engine->va_dpy, engine->enc_cfg, engine->width, engine->height, VA_PROGRESSIVE, engine->recon_surfs, 2, &engine->enc_ctx);
|
||||||
|
if (st != VA_STATUS_SUCCESS) {
|
||||||
|
fprintf(stderr, "[vaapi] vaCreateContext EncSlice failed: %s\n", RT.vaErrorStr(st));
|
||||||
|
vaapi_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Coded bitstream buffer: generous, a 20M-preset intra frame can burst past 4MB
|
||||||
|
st = RT.vaCreateBuffer(engine->va_dpy, engine->enc_ctx, VAEncCodedBufferType, 16 * 1024 * 1024, 1, NULL, &engine->coded_buf);
|
||||||
|
if (st != VA_STATUS_SUCCESS) {
|
||||||
|
vaapi_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
return engine;
|
||||||
|
}
|
||||||
|
|
||||||
|
int vaapi_import_dma_buffer(VaapiEngine* engine, int dma_fd, uint32_t stride) {
|
||||||
|
if (!engine || dma_fd < 0) return -1;
|
||||||
|
|
||||||
|
if (engine->in_rgb_surf != VA_INVALID_ID) {
|
||||||
|
RT.vaDestroySurfaces(engine->va_dpy, &engine->in_rgb_surf, 1);
|
||||||
|
engine->in_rgb_surf = VA_INVALID_ID;
|
||||||
|
}
|
||||||
|
if (engine->vpp_buf != VA_INVALID_ID) {
|
||||||
|
RT.vaDestroyBuffer(engine->va_dpy, engine->vpp_buf);
|
||||||
|
engine->vpp_buf = VA_INVALID_ID;
|
||||||
|
}
|
||||||
|
|
||||||
|
engine->dma_fd = dma_fd;
|
||||||
|
engine->stride = stride;
|
||||||
|
|
||||||
|
VADRMPRIMESurfaceDescriptor prime_desc;
|
||||||
|
memset(&prime_desc, 0, sizeof(prime_desc));
|
||||||
|
prime_desc.fourcc = VA_FOURCC_BGRX;
|
||||||
|
prime_desc.width = engine->cap_width;
|
||||||
|
prime_desc.height = engine->cap_height;
|
||||||
|
prime_desc.num_objects = 1;
|
||||||
|
prime_desc.objects[0].fd = dma_fd;
|
||||||
|
prime_desc.objects[0].size = stride * engine->cap_height;
|
||||||
|
prime_desc.objects[0].drm_format_modifier = 0;
|
||||||
|
prime_desc.num_layers = 1;
|
||||||
|
prime_desc.layers[0].drm_format = 0x34325258; // DRM_FORMAT_XRGB8888
|
||||||
|
prime_desc.layers[0].num_planes = 1;
|
||||||
|
prime_desc.layers[0].pitch[0] = stride;
|
||||||
|
|
||||||
|
VASurfaceAttrib attribs[2];
|
||||||
|
attribs[0].type = VASurfaceAttribMemoryType;
|
||||||
|
attribs[0].flags = VA_SURFACE_ATTRIB_SETTABLE;
|
||||||
|
attribs[0].value.type = VAGenericValueTypeInteger;
|
||||||
|
attribs[0].value.value.i = VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2;
|
||||||
|
attribs[1].type = VASurfaceAttribExternalBufferDescriptor;
|
||||||
|
attribs[1].flags = VA_SURFACE_ATTRIB_SETTABLE;
|
||||||
|
attribs[1].value.type = VAGenericValueTypePointer;
|
||||||
|
attribs[1].value.value.p = &prime_desc;
|
||||||
|
|
||||||
|
VAStatus st = RT.vaCreateSurfaces(engine->va_dpy, VA_RT_FORMAT_RGB32, engine->cap_width, engine->cap_height, &engine->in_rgb_surf, 1, attribs, 2);
|
||||||
|
if (st != VA_STATUS_SUCCESS) {
|
||||||
|
fprintf(stderr, "[vaapi] vaCreateSurfaces DRM_PRIME_2 failed: %s\n", RT.vaErrorStr(st));
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (vaapi_make_vpp_buffer(engine) != 0) {
|
||||||
|
fprintf(stderr, "[vaapi] vaCreateBuffer VPP failed\n");
|
||||||
|
return -2;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int vaapi_upload_host_buffer(VaapiEngine* engine, const uint8_t* host_ptr, uint32_t pitch) {
|
||||||
|
if (!engine || !host_ptr) return -1;
|
||||||
|
|
||||||
|
if (engine->in_rgb_surf == VA_INVALID_ID) {
|
||||||
|
VAStatus st = RT.vaCreateSurfaces(engine->va_dpy, VA_RT_FORMAT_RGB32, engine->cap_width, engine->cap_height, &engine->in_rgb_surf, 1, NULL, 0);
|
||||||
|
if (st != VA_STATUS_SUCCESS) return -2;
|
||||||
|
if (vaapi_make_vpp_buffer(engine) != 0) return -3;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!engine->upload_ready) {
|
||||||
|
VAImageFormat fmt;
|
||||||
|
memset(&fmt, 0, sizeof(fmt));
|
||||||
|
fmt.fourcc = VA_FOURCC_BGRX;
|
||||||
|
fmt.byte_order = VA_LSB_FIRST;
|
||||||
|
fmt.bits_per_pixel = 32;
|
||||||
|
fmt.depth = 24;
|
||||||
|
fmt.red_mask = 0x00ff0000;
|
||||||
|
fmt.green_mask = 0x0000ff00;
|
||||||
|
fmt.blue_mask = 0x000000ff;
|
||||||
|
// vaDeriveImage on the RGB32 surface is refused by some drivers
|
||||||
|
VAStatus st = RT.vaCreateImage(engine->va_dpy, &fmt, engine->cap_width, engine->cap_height, &engine->upload_img);
|
||||||
|
if (st != VA_STATUS_SUCCESS) return -4;
|
||||||
|
engine->upload_ready = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
void* p = NULL;
|
||||||
|
VAStatus st = RT.vaMapBuffer(engine->va_dpy, engine->upload_img.buf, &p);
|
||||||
|
if (st != VA_STATUS_SUCCESS || !p) return -5;
|
||||||
|
uint32_t copy_bytes = engine->cap_width * 4;
|
||||||
|
for (uint32_t y = 0; y < engine->cap_height; y++) {
|
||||||
|
memcpy((uint8_t*)p + y * engine->upload_img.pitches[0], host_ptr + y * pitch, copy_bytes);
|
||||||
|
}
|
||||||
|
RT.vaUnmapBuffer(engine->va_dpy, engine->upload_img.buf);
|
||||||
|
|
||||||
|
st = RT.vaPutImage(engine->va_dpy, engine->in_rgb_surf, engine->upload_img.image_id,
|
||||||
|
0, 0, engine->cap_width, engine->cap_height, 0, 0, engine->cap_width, engine->cap_height);
|
||||||
|
if (st != VA_STATUS_SUCCESS) return -6;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sequence-level misc parameter. AMD's Mesa driver feeds the VCN ring message from these;
|
||||||
|
// a CBR config that never gets its rate-control/HRD parameters submits garbage and the
|
||||||
|
// encode job wedges the ring until a GPU reset.
|
||||||
|
// Packed H.264 / HEVC headers. Current radeonsi (Mesa 26) writes neither SPS/PPS nor the NAL/slice header from the
|
||||||
|
// parameter buffers alone (output began 00 00 00 01 00 ..., no SPS), so the host writes them like FFmpeg does.
|
||||||
|
// Every field here must match the sequence/picture/slice parameters submitted with it.
|
||||||
|
typedef struct { uint8_t buf[128]; uint32_t bits; } BitWriter;
|
||||||
|
|
||||||
|
static void bw_put(BitWriter* w, uint32_t value, int n) {
|
||||||
|
for (int i = n - 1; i >= 0; i--, w->bits++) {
|
||||||
|
if (w->bits / 8 >= sizeof(w->buf)) return;
|
||||||
|
if ((value >> i) & 1) w->buf[w->bits / 8] |= 0x80 >> (w->bits % 8);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
static void bw_ue(BitWriter* w, uint32_t value) {
|
||||||
|
int len = 0;
|
||||||
|
for (uint32_t v = value + 1; v > 1; v >>= 1) len++;
|
||||||
|
bw_put(w, 0, len);
|
||||||
|
bw_put(w, value + 1, len + 1);
|
||||||
|
}
|
||||||
|
static void bw_se(BitWriter* w, int32_t value) { bw_ue(w, value > 0 ? 2 * (uint32_t)value - 1 : 2 * (uint32_t)(-value)); }
|
||||||
|
static void bw_trailing(BitWriter* w) { bw_put(w, 1, 1); if (w->bits % 8) bw_put(w, 0, 8 - w->bits % 8); }
|
||||||
|
// Start code + NAL header; the payload follows unescaped, emulation prevention is applied by bw_escape.
|
||||||
|
static void bw_nal(BitWriter* w, int ref_idc, int type) { bw_put(w, 1, 32); bw_put(w, (ref_idc << 5) | type, 8); }
|
||||||
|
|
||||||
|
// Insert emulation prevention bytes after the start code + NAL header (byte 5 on). Returns the byte length.
|
||||||
|
static uint32_t bw_escape(const BitWriter* w, uint8_t* out, uint32_t cap) {
|
||||||
|
uint32_t len = (w->bits + 7) / 8, n = 0, zeros = 0;
|
||||||
|
for (uint32_t i = 0; i < len && n < cap; i++) {
|
||||||
|
if (i >= 5 && zeros >= 2 && w->buf[i] <= 3) { out[n++] = 3; zeros = 0; if (n >= cap) break; }
|
||||||
|
zeros = w->buf[i] == 0 && i >= 5 ? zeros + 1 : 0;
|
||||||
|
out[n++] = w->buf[i];
|
||||||
|
}
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Each NAL is escaped on its own, so the next NAL's start code stays intact.
|
||||||
|
static int vaapi_add_packed(VaapiEngine* engine, VAEncPackedHeaderType type, const BitWriter* nals, int count,
|
||||||
|
VABufferID* ids, int* n) {
|
||||||
|
uint8_t data[320];
|
||||||
|
uint32_t bytes = 0;
|
||||||
|
for (int i = 0; i < count; i++) bytes += bw_escape(&nals[i], data + bytes, sizeof(data) - bytes);
|
||||||
|
VAEncPackedHeaderParameterBuffer param = { .type = type, .bit_length = bytes * 8, .has_emulation_bytes = 1 };
|
||||||
|
if (RT.vaCreateBuffer(engine->va_dpy, engine->enc_ctx, VAEncPackedHeaderParameterBufferType, sizeof(param), 1, ¶m, &ids[*n]) != VA_STATUS_SUCCESS)
|
||||||
|
return -1;
|
||||||
|
(*n)++;
|
||||||
|
if (RT.vaCreateBuffer(engine->va_dpy, engine->enc_ctx, VAEncPackedHeaderDataBufferType, bytes, 1, data, &ids[*n]) != VA_STATUS_SUCCESS)
|
||||||
|
return -1;
|
||||||
|
(*n)++;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static VABufferID vaapi_create_misc_buffer(VaapiEngine* engine, VAEncMiscParameterType type, const void* param, uint32_t param_size) {
|
||||||
|
uint8_t buf[sizeof(VAEncMiscParameterBuffer) + 64];
|
||||||
|
VAEncMiscParameterBuffer* misc = (VAEncMiscParameterBuffer*)buf;
|
||||||
|
misc->type = type;
|
||||||
|
memcpy(misc->data, param, param_size);
|
||||||
|
VABufferID id = VA_INVALID_ID;
|
||||||
|
if (RT.vaCreateBuffer(engine->va_dpy, engine->enc_ctx, VAEncMiscParameterBufferType,
|
||||||
|
sizeof(VAEncMiscParameterBuffer) + param_size, 1, buf, &id) != VA_STATUS_SUCCESS) {
|
||||||
|
return VA_INVALID_ID;
|
||||||
|
}
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Buffers for one encoded picture; every created ID is destroyed after the picture, success or not.
|
||||||
|
typedef struct {
|
||||||
|
VABufferID seq, misc[3], pic, slice, packed[6];
|
||||||
|
int misc_n, packed_n;
|
||||||
|
} EncBuffers;
|
||||||
|
|
||||||
|
static int vaapi_h264_params(VaapiEngine* engine, int is_idr, VASurfaceID curr_recon, VASurfaceID prev_recon, EncBuffers* b) {
|
||||||
|
uint32_t mb_w = (engine->width + 15) / 16;
|
||||||
|
uint32_t mb_h = (engine->height + 15) / 16;
|
||||||
|
uint32_t frame_num = is_idr ? 0 : engine->frame_num;
|
||||||
|
uint32_t crop_right = (mb_w * 16 - engine->width) / 2, crop_bottom = (mb_h * 16 - engine->height) / 2;
|
||||||
|
if (is_idr) {
|
||||||
|
VAEncSequenceParameterBufferH264 seq_p;
|
||||||
|
memset(&seq_p, 0, sizeof(seq_p));
|
||||||
|
seq_p.seq_parameter_set_id = 0;
|
||||||
|
seq_p.level_idc = 51;
|
||||||
|
seq_p.intra_period = engine->gop;
|
||||||
|
seq_p.intra_idr_period = engine->gop;
|
||||||
|
seq_p.ip_period = 1;
|
||||||
|
seq_p.bits_per_second = (uint32_t)engine->max_bps;
|
||||||
|
seq_p.max_num_ref_frames = 1;
|
||||||
|
seq_p.picture_width_in_mbs = mb_w;
|
||||||
|
seq_p.picture_height_in_mbs = mb_h;
|
||||||
|
seq_p.seq_fields.bits.direct_8x8_inference_flag = 1;
|
||||||
|
seq_p.seq_fields.bits.frame_mbs_only_flag = 1;
|
||||||
|
seq_p.seq_fields.bits.pic_order_cnt_type = 0;
|
||||||
|
seq_p.frame_cropping_flag = crop_right || crop_bottom;
|
||||||
|
seq_p.frame_crop_right_offset = crop_right;
|
||||||
|
seq_p.frame_crop_bottom_offset = crop_bottom;
|
||||||
|
// An IDR without its SPS is undecodable: fail rather than submit pic + slice alone
|
||||||
|
if (RT.vaCreateBuffer(engine->va_dpy, engine->enc_ctx, VAEncSequenceParameterBufferType, sizeof(seq_p), 1, &seq_p, &b->seq) != VA_STATUS_SUCCESS)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
// SPS: Main, level 5.1, frame_num and POC lsb 4 bits (both wrap & 15 above), one reference
|
||||||
|
BitWriter sps = {0};
|
||||||
|
bw_nal(&sps, 3, 7);
|
||||||
|
bw_put(&sps, 77, 8); bw_put(&sps, 0x40, 8); bw_put(&sps, 51, 8); // constraint_set1: Main
|
||||||
|
bw_ue(&sps, 0); bw_ue(&sps, 0); bw_ue(&sps, 0); bw_ue(&sps, 0); // sps id, log2_max_frame_num-4, poc type 0, log2_max_poc_lsb-4
|
||||||
|
bw_ue(&sps, 1); bw_put(&sps, 0, 1); // max_num_ref_frames, gaps
|
||||||
|
bw_ue(&sps, mb_w - 1); bw_ue(&sps, mb_h - 1);
|
||||||
|
bw_put(&sps, 1, 1); bw_put(&sps, 1, 1); // frame_mbs_only, direct_8x8_inference
|
||||||
|
bw_put(&sps, seq_p.frame_cropping_flag, 1);
|
||||||
|
if (seq_p.frame_cropping_flag) { bw_ue(&sps, 0); bw_ue(&sps, crop_right); bw_ue(&sps, 0); bw_ue(&sps, crop_bottom); }
|
||||||
|
bw_put(&sps, 0, 1); // no VUI
|
||||||
|
bw_trailing(&sps);
|
||||||
|
// PPS: CABAC, one L0 reference, QP 26, default deblocking
|
||||||
|
BitWriter pps = {0};
|
||||||
|
bw_nal(&pps, 3, 8);
|
||||||
|
bw_ue(&pps, 0); bw_ue(&pps, 0); bw_put(&pps, 1, 1); bw_put(&pps, 0, 1);
|
||||||
|
bw_ue(&pps, 0); bw_ue(&pps, 0); bw_ue(&pps, 0); // slice groups, num_ref_idx l0/l1 - 1
|
||||||
|
bw_put(&pps, 0, 1); bw_put(&pps, 0, 2); // weighted pred / bipred
|
||||||
|
bw_se(&pps, 0); bw_se(&pps, 0); bw_se(&pps, 0); // pic_init_qp-26, qs, chroma offset
|
||||||
|
bw_put(&pps, 0, 1); bw_put(&pps, 0, 1); bw_put(&pps, 0, 1); // deblocking control, constrained intra, redundant
|
||||||
|
bw_trailing(&pps);
|
||||||
|
// SPS and PPS go out as one Sequence header, like FFmpeg
|
||||||
|
BitWriter headers[2] = { sps, pps };
|
||||||
|
if (vaapi_add_packed(engine, VAEncPackedHeaderSequence, headers, 2, b->packed, &b->packed_n) != 0) return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
VAEncPictureParameterBufferH264 pic_p;
|
||||||
|
memset(&pic_p, 0, sizeof(pic_p));
|
||||||
|
pic_p.CurrPic.picture_id = curr_recon;
|
||||||
|
pic_p.CurrPic.flags = VA_PICTURE_H264_SHORT_TERM_REFERENCE;
|
||||||
|
pic_p.CurrPic.frame_idx = frame_num;
|
||||||
|
pic_p.CurrPic.TopFieldOrderCnt = pic_p.CurrPic.BottomFieldOrderCnt = (2 * frame_num) & 15;
|
||||||
|
for (int i = 0; i < 16; i++) pic_p.ReferenceFrames[i].picture_id = VA_INVALID_ID;
|
||||||
|
if (!is_idr) {
|
||||||
|
pic_p.ReferenceFrames[0].picture_id = prev_recon;
|
||||||
|
pic_p.ReferenceFrames[0].flags = VA_PICTURE_H264_SHORT_TERM_REFERENCE;
|
||||||
|
pic_p.ReferenceFrames[0].frame_idx = (frame_num - 1) & 15;
|
||||||
|
pic_p.ReferenceFrames[0].TopFieldOrderCnt = pic_p.ReferenceFrames[0].BottomFieldOrderCnt = (2 * (frame_num - 1)) & 15;
|
||||||
|
}
|
||||||
|
pic_p.coded_buf = engine->coded_buf;
|
||||||
|
pic_p.frame_num = frame_num;
|
||||||
|
pic_p.pic_init_qp = 26;
|
||||||
|
pic_p.seq_parameter_set_id = 0;
|
||||||
|
pic_p.pic_parameter_set_id = 0;
|
||||||
|
pic_p.pic_fields.bits.idr_pic_flag = is_idr ? 1 : 0;
|
||||||
|
pic_p.pic_fields.bits.reference_pic_flag = 1;
|
||||||
|
pic_p.pic_fields.bits.entropy_coding_mode_flag = 1;
|
||||||
|
pic_p.pic_fields.bits.deblocking_filter_control_present_flag = 0;
|
||||||
|
if (RT.vaCreateBuffer(engine->va_dpy, engine->enc_ctx, VAEncPictureParameterBufferType, sizeof(pic_p), 1, &pic_p, &b->pic) != VA_STATUS_SUCCESS)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
VAEncSliceParameterBufferH264 slice_p;
|
||||||
|
memset(&slice_p, 0, sizeof(slice_p));
|
||||||
|
slice_p.macroblock_address = 0;
|
||||||
|
slice_p.num_macroblocks = mb_w * mb_h;
|
||||||
|
slice_p.macroblock_info = VA_INVALID_ID;
|
||||||
|
slice_p.slice_type = is_idr ? 2 : 0; // 2 = I-Slice, 0 = P-Slice
|
||||||
|
slice_p.direct_spatial_mv_pred_flag = 1;
|
||||||
|
// Consecutive IDRs must differ in idr_pic_id (7.4.3); flip it on every IDR
|
||||||
|
if (is_idr) engine->idr_pic_id ^= 1;
|
||||||
|
slice_p.idr_pic_id = engine->idr_pic_id;
|
||||||
|
slice_p.pic_order_cnt_lsb = pic_p.CurrPic.TopFieldOrderCnt;
|
||||||
|
for (int i = 0; i < 32; i++) slice_p.RefPicList0[i].picture_id = VA_INVALID_ID;
|
||||||
|
if (!is_idr) {
|
||||||
|
slice_p.RefPicList0[0].picture_id = prev_recon;
|
||||||
|
slice_p.RefPicList0[0].flags = VA_PICTURE_H264_SHORT_TERM_REFERENCE;
|
||||||
|
slice_p.RefPicList0[0].frame_idx = (frame_num - 1) & 15;
|
||||||
|
}
|
||||||
|
if (RT.vaCreateBuffer(engine->va_dpy, engine->enc_ctx, VAEncSliceParameterBufferType, sizeof(slice_p), 1, &slice_p, &b->slice) != VA_STATUS_SUCCESS)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
// Slice header including cabac_alignment_one_bit, byte aligned and escaped as FFmpeg submits it
|
||||||
|
BitWriter sh = {0};
|
||||||
|
bw_nal(&sh, 3, is_idr ? 5 : 1);
|
||||||
|
bw_ue(&sh, 0); bw_ue(&sh, is_idr ? 7 : 5); bw_ue(&sh, 0); // first_mb, slice_type I/P (all slices), pps id
|
||||||
|
bw_put(&sh, frame_num & 15, 4);
|
||||||
|
if (is_idr) bw_ue(&sh, slice_p.idr_pic_id);
|
||||||
|
bw_put(&sh, slice_p.pic_order_cnt_lsb & 15, 4);
|
||||||
|
if (!is_idr) { bw_put(&sh, 0, 1); bw_put(&sh, 0, 1); } // num_ref_idx override, ref list modification
|
||||||
|
if (is_idr) { bw_put(&sh, 0, 1); bw_put(&sh, 0, 1); } // no_output_of_prior_pics, long_term_reference
|
||||||
|
else bw_put(&sh, 0, 1); // adaptive_ref_pic_marking
|
||||||
|
if (!is_idr) bw_ue(&sh, 0); // cabac_init_idc
|
||||||
|
bw_se(&sh, 0); // slice_qp_delta (no deblocking fields)
|
||||||
|
while (sh.bits % 8) bw_put(&sh, 1, 1);
|
||||||
|
return vaapi_add_packed(engine, VAEncPackedHeaderSlice, &sh, 1, b->packed, &b->packed_n);
|
||||||
|
}
|
||||||
|
|
||||||
|
// HEVC NAL header: forbidden 0, nal_unit_type, nuh_layer_id 0, nuh_temporal_id_plus1 1.
|
||||||
|
static void bw_hevc_nal(BitWriter* w, int type) { bw_put(w, 1, 32); bw_put(w, (type << 9) | 1, 16); }
|
||||||
|
|
||||||
|
// profile_tier_level(1, 0): Main, Main 10 compatible like FFmpeg, progressive frames only.
|
||||||
|
static void bw_hevc_ptl(BitWriter* w, uint32_t level) {
|
||||||
|
bw_put(w, 0, 2); bw_put(w, 0, 1); bw_put(w, 1, 5); // profile space, tier, general_profile_idc Main
|
||||||
|
bw_put(w, 0x60000000, 32); // compatibility flags 1 and 2
|
||||||
|
bw_put(w, 1, 1); bw_put(w, 0, 1); bw_put(w, 1, 1); bw_put(w, 1, 1); // progressive, interlaced, non_packed, frame_only
|
||||||
|
bw_put(w, 0, 32); bw_put(w, 0, 12); // reserved_zero_43bits + inbld_flag
|
||||||
|
bw_put(w, level, 8);
|
||||||
|
}
|
||||||
|
|
||||||
|
// HEVC Main with FFmpeg's hevc_vaapi parameters on radeonsi (LIBVA_TRACE + trace_headers of its output):
|
||||||
|
// 64x64 CTB, 8x8 min CB, 4x4..32x32 TB, AMP and SAO on, one short-term reference, POC lsb 12 bits.
|
||||||
|
// FFmpeg also sends VA max_transform_hierarchy_depth 0 / diff_cu_qp_delta_depth 3 while its SPS/PPS
|
||||||
|
// say 4 / 0; both copies are kept as FFmpeg has them, since that is what decodes on this driver.
|
||||||
|
static int vaapi_hevc_params(VaapiEngine* engine, int is_idr, VASurfaceID curr_recon, VASurfaceID prev_recon, EncBuffers* b) {
|
||||||
|
// pic size must be a multiple of the 8x8 min CB; the conformance window (in chroma units) crops the rest
|
||||||
|
uint32_t w = (engine->width + 7) & ~7u, h = (engine->height + 7) & ~7u;
|
||||||
|
uint32_t crop_right = (w - engine->width) / 2, crop_bottom = (h - engine->height) / 2;
|
||||||
|
uint32_t poc = is_idr ? 0 : engine->since_idr;
|
||||||
|
// Level from luma picture size and sample rate (Table A.8): 4.1, 5.0, 5.1, 5.2
|
||||||
|
uint64_t size = (uint64_t)w * h, rate = size * engine->fps;
|
||||||
|
uint32_t level = rate > 534773760 ? 156 : rate > 267386880 ? 153 : (size > 2228224 || rate > 133693440) ? 150 : 123;
|
||||||
|
if (is_idr) {
|
||||||
|
VAEncSequenceParameterBufferHEVC seq_p;
|
||||||
|
memset(&seq_p, 0, sizeof(seq_p));
|
||||||
|
seq_p.general_profile_idc = 1;
|
||||||
|
seq_p.general_level_idc = level;
|
||||||
|
seq_p.intra_period = engine->gop;
|
||||||
|
seq_p.intra_idr_period = engine->gop;
|
||||||
|
seq_p.ip_period = 1;
|
||||||
|
seq_p.bits_per_second = (uint32_t)engine->max_bps;
|
||||||
|
seq_p.pic_width_in_luma_samples = w;
|
||||||
|
seq_p.pic_height_in_luma_samples = h;
|
||||||
|
seq_p.seq_fields.bits.chroma_format_idc = 1;
|
||||||
|
seq_p.seq_fields.bits.amp_enabled_flag = 1;
|
||||||
|
seq_p.seq_fields.bits.sample_adaptive_offset_enabled_flag = 1;
|
||||||
|
seq_p.log2_diff_max_min_luma_coding_block_size = 3;
|
||||||
|
seq_p.log2_diff_max_min_transform_block_size = 3;
|
||||||
|
if (RT.vaCreateBuffer(engine->va_dpy, engine->enc_ctx, VAEncSequenceParameterBufferType, sizeof(seq_p), 1, &seq_p, &b->seq) != VA_STATUS_SUCCESS)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
BitWriter vps = {0};
|
||||||
|
bw_hevc_nal(&vps, 32);
|
||||||
|
bw_put(&vps, 0, 4); bw_put(&vps, 1, 1); bw_put(&vps, 1, 1); // vps id, base layer internal / available
|
||||||
|
bw_put(&vps, 0, 6); bw_put(&vps, 0, 3); bw_put(&vps, 1, 1); // max layers-1, max sub layers-1, temporal id nesting
|
||||||
|
bw_put(&vps, 0xffff, 16);
|
||||||
|
bw_hevc_ptl(&vps, level);
|
||||||
|
bw_put(&vps, 0, 1); bw_ue(&vps, 1); bw_ue(&vps, 0); bw_ue(&vps, 0); // ordering info: dec buffering-1, reorder, latency
|
||||||
|
bw_put(&vps, 0, 6); bw_ue(&vps, 0); // max layer id, num layer sets-1
|
||||||
|
bw_put(&vps, 0, 1); bw_put(&vps, 0, 1); // no timing info, no extension
|
||||||
|
bw_trailing(&vps);
|
||||||
|
|
||||||
|
BitWriter sps = {0};
|
||||||
|
bw_hevc_nal(&sps, 33);
|
||||||
|
bw_put(&sps, 0, 4); bw_put(&sps, 0, 3); bw_put(&sps, 1, 1); // vps id, max sub layers-1, temporal id nesting
|
||||||
|
bw_hevc_ptl(&sps, level);
|
||||||
|
bw_ue(&sps, 0); bw_ue(&sps, 1); bw_ue(&sps, w); bw_ue(&sps, h); // sps id, 4:2:0, size
|
||||||
|
bw_put(&sps, crop_right || crop_bottom, 1);
|
||||||
|
if (crop_right || crop_bottom) { bw_ue(&sps, 0); bw_ue(&sps, crop_right); bw_ue(&sps, 0); bw_ue(&sps, crop_bottom); }
|
||||||
|
bw_ue(&sps, 0); bw_ue(&sps, 0); bw_ue(&sps, 8); // 8-bit luma/chroma, log2_max_poc_lsb-4
|
||||||
|
bw_put(&sps, 0, 1); bw_ue(&sps, 1); bw_ue(&sps, 0); bw_ue(&sps, 0);
|
||||||
|
bw_ue(&sps, 0); bw_ue(&sps, 3); bw_ue(&sps, 0); bw_ue(&sps, 3); // CB 8..64, TB 4..32
|
||||||
|
bw_ue(&sps, 4); bw_ue(&sps, 4); // max transform hierarchy depth inter/intra
|
||||||
|
bw_put(&sps, 0, 1); bw_put(&sps, 1, 1); bw_put(&sps, 1, 1); bw_put(&sps, 0, 1); // scaling list, AMP, SAO, PCM
|
||||||
|
bw_ue(&sps, 0); bw_put(&sps, 0, 1); // RPS in slice headers, no long-term refs
|
||||||
|
bw_put(&sps, 0, 1); bw_put(&sps, 0, 1); // temporal MVP, strong intra smoothing
|
||||||
|
bw_put(&sps, 0, 1); bw_put(&sps, 0, 1); // no VUI, no extension
|
||||||
|
bw_trailing(&sps);
|
||||||
|
|
||||||
|
BitWriter pps = {0};
|
||||||
|
bw_hevc_nal(&pps, 34);
|
||||||
|
bw_ue(&pps, 0); bw_ue(&pps, 0);
|
||||||
|
bw_put(&pps, 0, 1); bw_put(&pps, 0, 1); bw_put(&pps, 0, 3); // dependent slices, output flag, extra bits
|
||||||
|
bw_put(&pps, 0, 1); bw_put(&pps, 0, 1); // sign data hiding, cabac init present
|
||||||
|
bw_ue(&pps, 0); bw_ue(&pps, 0); bw_se(&pps, 0); // num_ref_idx l0/l1 default-1, init_qp-26
|
||||||
|
bw_put(&pps, 0, 1); bw_put(&pps, 1, 1); bw_put(&pps, 1, 1); // constrained intra, transform skip, cu_qp_delta
|
||||||
|
bw_ue(&pps, 0); bw_se(&pps, 0); bw_se(&pps, 0); // diff_cu_qp_delta_depth, cb/cr offsets
|
||||||
|
bw_put(&pps, 0, 1); bw_put(&pps, 0, 1); bw_put(&pps, 0, 1); // slice chroma offsets, weighted pred/bipred
|
||||||
|
bw_put(&pps, 0, 1); bw_put(&pps, 0, 1); bw_put(&pps, 0, 1); // transquant bypass, tiles, entropy sync
|
||||||
|
bw_put(&pps, 1, 1); bw_put(&pps, 0, 1); bw_put(&pps, 0, 1); // loop filter across slices, deblocking ctl, scaling
|
||||||
|
bw_put(&pps, 0, 1); bw_ue(&pps, 0); bw_put(&pps, 0, 1); bw_put(&pps, 0, 1); // list mod, merge level-2, ext
|
||||||
|
bw_trailing(&pps);
|
||||||
|
|
||||||
|
BitWriter headers[3] = { vps, sps, pps };
|
||||||
|
if (vaapi_add_packed(engine, VAEncPackedHeaderSequence, headers, 3, b->packed, &b->packed_n) != 0) return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
VAEncPictureParameterBufferHEVC pic_p;
|
||||||
|
memset(&pic_p, 0, sizeof(pic_p));
|
||||||
|
pic_p.decoded_curr_pic.picture_id = curr_recon;
|
||||||
|
pic_p.decoded_curr_pic.pic_order_cnt = poc;
|
||||||
|
for (int i = 0; i < 15; i++) {
|
||||||
|
pic_p.reference_frames[i].picture_id = VA_INVALID_ID;
|
||||||
|
pic_p.reference_frames[i].flags = VA_PICTURE_HEVC_INVALID;
|
||||||
|
}
|
||||||
|
if (!is_idr) {
|
||||||
|
pic_p.reference_frames[0].picture_id = prev_recon;
|
||||||
|
pic_p.reference_frames[0].pic_order_cnt = poc - 1;
|
||||||
|
pic_p.reference_frames[0].flags = VA_PICTURE_HEVC_RPS_ST_CURR_BEFORE;
|
||||||
|
}
|
||||||
|
pic_p.coded_buf = engine->coded_buf;
|
||||||
|
pic_p.collocated_ref_pic_index = 0xff;
|
||||||
|
pic_p.pic_init_qp = 30;
|
||||||
|
pic_p.diff_cu_qp_delta_depth = 3;
|
||||||
|
pic_p.nal_unit_type = is_idr ? 19 : 1; // IDR_W_RADL / TRAIL_R
|
||||||
|
pic_p.pic_fields.bits.idr_pic_flag = is_idr;
|
||||||
|
pic_p.pic_fields.bits.coding_type = is_idr ? 1 : 2;
|
||||||
|
pic_p.pic_fields.bits.reference_pic_flag = 1;
|
||||||
|
pic_p.pic_fields.bits.transform_skip_enabled_flag = 1;
|
||||||
|
pic_p.pic_fields.bits.cu_qp_delta_enabled_flag = 1;
|
||||||
|
pic_p.pic_fields.bits.pps_loop_filter_across_slices_enabled_flag = 1;
|
||||||
|
if (RT.vaCreateBuffer(engine->va_dpy, engine->enc_ctx, VAEncPictureParameterBufferType, sizeof(pic_p), 1, &pic_p, &b->pic) != VA_STATUS_SUCCESS)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
VAEncSliceParameterBufferHEVC slice_p;
|
||||||
|
memset(&slice_p, 0, sizeof(slice_p));
|
||||||
|
slice_p.num_ctu_in_slice = ((w + 63) / 64) * ((h + 63) / 64);
|
||||||
|
slice_p.slice_type = is_idr ? 2 : 1; // I / P
|
||||||
|
for (int i = 0; i < 15; i++) {
|
||||||
|
slice_p.ref_pic_list0[i].picture_id = slice_p.ref_pic_list1[i].picture_id = VA_INVALID_ID;
|
||||||
|
slice_p.ref_pic_list0[i].flags = slice_p.ref_pic_list1[i].flags = VA_PICTURE_HEVC_INVALID;
|
||||||
|
}
|
||||||
|
if (!is_idr) slice_p.ref_pic_list0[0] = pic_p.reference_frames[0];
|
||||||
|
slice_p.max_num_merge_cand = 5;
|
||||||
|
slice_p.slice_fields.bits.last_slice_of_pic_flag = 1;
|
||||||
|
slice_p.slice_fields.bits.slice_sao_luma_flag = 1;
|
||||||
|
slice_p.slice_fields.bits.slice_sao_chroma_flag = 1;
|
||||||
|
slice_p.slice_fields.bits.collocated_from_l0_flag = !is_idr;
|
||||||
|
if (RT.vaCreateBuffer(engine->va_dpy, engine->enc_ctx, VAEncSliceParameterBufferType, sizeof(slice_p), 1, &slice_p, &b->slice) != VA_STATUS_SUCCESS)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
BitWriter sh = {0};
|
||||||
|
bw_hevc_nal(&sh, pic_p.nal_unit_type);
|
||||||
|
bw_put(&sh, 1, 1); // first slice segment
|
||||||
|
if (is_idr) bw_put(&sh, 0, 1); // no_output_of_prior_pics
|
||||||
|
bw_ue(&sh, 0); bw_ue(&sh, slice_p.slice_type); // pps id, slice type
|
||||||
|
if (!is_idr) {
|
||||||
|
bw_put(&sh, poc & 0xfff, 12);
|
||||||
|
bw_put(&sh, 0, 1); // RPS coded here: one previous picture
|
||||||
|
bw_ue(&sh, 1); bw_ue(&sh, 0); bw_ue(&sh, 0); bw_put(&sh, 1, 1); // negative 1, positive 0, delta-1 0, used
|
||||||
|
}
|
||||||
|
bw_put(&sh, 1, 1); bw_put(&sh, 1, 1); // SAO luma, chroma
|
||||||
|
if (!is_idr) { bw_put(&sh, 0, 1); bw_ue(&sh, 0); } // num_ref_idx override, five_minus_max_merge
|
||||||
|
bw_se(&sh, 0); // slice_qp_delta (the driver writes the real one)
|
||||||
|
bw_put(&sh, 0, 1); // loop filter across slices
|
||||||
|
bw_put(&sh, 1, 1); // byte_alignment()
|
||||||
|
while (sh.bits % 8) bw_put(&sh, 0, 1);
|
||||||
|
return vaapi_add_packed(engine, VAEncPackedHeaderSlice, &sh, 1, b->packed, &b->packed_n);
|
||||||
|
}
|
||||||
|
|
||||||
|
int vaapi_encode_frame(
|
||||||
|
VaapiEngine* engine,
|
||||||
|
int force_idr,
|
||||||
|
const uint8_t** out_data,
|
||||||
|
uint32_t* out_len
|
||||||
|
) {
|
||||||
|
if (out_data) *out_data = NULL;
|
||||||
|
if (out_len) *out_len = 0;
|
||||||
|
if (!engine || engine->in_rgb_surf == VA_INVALID_ID) return -1;
|
||||||
|
|
||||||
|
int is_idr = force_idr || engine->idr_pending || engine->frame_count == 0 || engine->since_idr >= engine->gop;
|
||||||
|
// Recon ping-pong: a P frame must reference the previous recon surface, not its own
|
||||||
|
VASurfaceID curr_recon = engine->recon_surfs[engine->frame_count & 1];
|
||||||
|
VASurfaceID prev_recon = engine->recon_surfs[(engine->frame_count + 1) & 1];
|
||||||
|
|
||||||
|
// 1. Hardware VPP Color Conversion + scaling (RGB -> NV12 entirely inside VRAM)
|
||||||
|
VAStatus st = RT.vaBeginPicture(engine->va_dpy, engine->vpp_ctx, engine->nv12_surf);
|
||||||
|
if (st != VA_STATUS_SUCCESS) return -10;
|
||||||
|
st = RT.vaRenderPicture(engine->va_dpy, engine->vpp_ctx, &engine->vpp_buf, 1);
|
||||||
|
if (st != VA_STATUS_SUCCESS) return -10;
|
||||||
|
st = RT.vaEndPicture(engine->va_dpy, engine->vpp_ctx);
|
||||||
|
if (st != VA_STATUS_SUCCESS) return -10;
|
||||||
|
|
||||||
|
// 2. Rate control (every IDR) and the codec's sequence / picture / slice parameters + packed headers
|
||||||
|
EncBuffers b = { .seq = VA_INVALID_ID, .pic = VA_INVALID_ID, .slice = VA_INVALID_ID };
|
||||||
|
int ret = -11;
|
||||||
|
if (is_idr) {
|
||||||
|
VAEncMiscParameterRateControl rc;
|
||||||
|
memset(&rc, 0, sizeof(rc));
|
||||||
|
// VBR: bits_per_second is the ceiling (maxrate) and target_percentage the average (#33)
|
||||||
|
rc.bits_per_second = (uint32_t)engine->max_bps;
|
||||||
|
rc.target_percentage = engine->rc_mode == VA_RC_VBR ? (uint32_t)(engine->target_bps * 100 / engine->max_bps) : 100;
|
||||||
|
rc.window_size = 1000;
|
||||||
|
rc.initial_qp = 28;
|
||||||
|
rc.min_qp = 16;
|
||||||
|
rc.max_qp = 44;
|
||||||
|
rc.rc_flags.bits.disable_frame_skip = 1; // a remote desktop must not drop frames silently
|
||||||
|
b.misc[b.misc_n++] = vaapi_create_misc_buffer(engine, VAEncMiscParameterTypeRateControl, &rc, sizeof(rc));
|
||||||
|
|
||||||
|
VAEncMiscParameterHRD hrd;
|
||||||
|
memset(&hrd, 0, sizeof(hrd));
|
||||||
|
hrd.buffer_size = (uint32_t)engine->buffer_bits; // the viewer preset's bufsize
|
||||||
|
hrd.initial_buffer_fullness = hrd.buffer_size / 2;
|
||||||
|
b.misc[b.misc_n++] = vaapi_create_misc_buffer(engine, VAEncMiscParameterTypeHRD, &hrd, sizeof(hrd));
|
||||||
|
|
||||||
|
// numerator in the low 16 bits, denominator in the high 16 bits
|
||||||
|
VAEncMiscParameterFrameRate fr = { .framerate = (1u << 16) | engine->fps };
|
||||||
|
b.misc[b.misc_n++] = vaapi_create_misc_buffer(engine, VAEncMiscParameterTypeFrameRate, &fr, sizeof(fr));
|
||||||
|
}
|
||||||
|
if ((engine->is_hevc ? vaapi_hevc_params : vaapi_h264_params)(engine, is_idr, curr_recon, prev_recon, &b) != 0) goto done;
|
||||||
|
|
||||||
|
// 3. Render and Encode on AMD VCN hardware
|
||||||
|
VABufferID render_b[12];
|
||||||
|
int render_n = 0;
|
||||||
|
// FFmpeg's order: sequence, rate control misc, picture, packed headers (parameter sets, slice header), slice.
|
||||||
|
// With misc first, radeonsi (Mesa 26) ignored the VBR target: the 1M preset ran at 1.6 Mbps, 0.96 after.
|
||||||
|
if (b.seq != VA_INVALID_ID) render_b[render_n++] = b.seq;
|
||||||
|
for (int i = 0; i < b.misc_n; i++) {
|
||||||
|
if (b.misc[i] != VA_INVALID_ID) render_b[render_n++] = b.misc[i];
|
||||||
|
}
|
||||||
|
render_b[render_n++] = b.pic;
|
||||||
|
for (int i = 0; i < b.packed_n; i++) render_b[render_n++] = b.packed[i];
|
||||||
|
render_b[render_n++] = b.slice;
|
||||||
|
|
||||||
|
st = RT.vaBeginPicture(engine->va_dpy, engine->enc_ctx, engine->nv12_surf);
|
||||||
|
if (st != VA_STATUS_SUCCESS) goto done;
|
||||||
|
st = RT.vaRenderPicture(engine->va_dpy, engine->enc_ctx, render_b, render_n);
|
||||||
|
if (st != VA_STATUS_SUCCESS) goto done;
|
||||||
|
st = RT.vaEndPicture(engine->va_dpy, engine->enc_ctx);
|
||||||
|
if (st != VA_STATUS_SUCCESS) goto done;
|
||||||
|
st = RT.vaSyncSurface(engine->va_dpy, curr_recon);
|
||||||
|
if (st != VA_STATUS_SUCCESS) goto done;
|
||||||
|
|
||||||
|
// 4. Map Bitstream Output; an access unit may arrive as several linked segments
|
||||||
|
VACodedBufferSegment *segment = NULL;
|
||||||
|
st = RT.vaMapBuffer(engine->va_dpy, engine->coded_buf, (void**)&segment);
|
||||||
|
if (st != VA_STATUS_SUCCESS || !segment) goto done;
|
||||||
|
uint32_t total = 0;
|
||||||
|
for (VACodedBufferSegment *seg = segment; seg; seg = seg->next) total += seg->size;
|
||||||
|
if (total > 0 && !(segment->status & VA_CODED_BUF_STATUS_SLICE_OVERFLOW_MASK)) {
|
||||||
|
if (total > engine->output_staging_cap) {
|
||||||
|
engine->output_staging_cap = total + 64 * 1024;
|
||||||
|
engine->output_staging = (uint8_t*)realloc(engine->output_staging, engine->output_staging_cap);
|
||||||
|
}
|
||||||
|
uint32_t off = 0;
|
||||||
|
for (VACodedBufferSegment *seg = segment; seg; seg = seg->next) {
|
||||||
|
memcpy(engine->output_staging + off, seg->buf, seg->size);
|
||||||
|
off += seg->size;
|
||||||
|
}
|
||||||
|
*out_data = engine->output_staging;
|
||||||
|
*out_len = total;
|
||||||
|
}
|
||||||
|
RT.vaUnmapBuffer(engine->va_dpy, engine->coded_buf);
|
||||||
|
|
||||||
|
engine->frame_num = is_idr ? 1 : ((engine->frame_num + 1) & 15);
|
||||||
|
engine->since_idr = is_idr ? 1 : engine->since_idr + 1;
|
||||||
|
engine->frame_count++;
|
||||||
|
ret = 0;
|
||||||
|
|
||||||
|
done:
|
||||||
|
// No bitstream (failure, empty or slice overflow): the next frame_num / POC would skip, so restart with an IDR
|
||||||
|
engine->idr_pending = ret != 0 || *out_len == 0;
|
||||||
|
for (int i = 0; i < b.misc_n; i++) {
|
||||||
|
if (b.misc[i] != VA_INVALID_ID) RT.vaDestroyBuffer(engine->va_dpy, b.misc[i]);
|
||||||
|
}
|
||||||
|
if (b.seq != VA_INVALID_ID) RT.vaDestroyBuffer(engine->va_dpy, b.seq);
|
||||||
|
if (b.pic != VA_INVALID_ID) RT.vaDestroyBuffer(engine->va_dpy, b.pic);
|
||||||
|
if (b.slice != VA_INVALID_ID) RT.vaDestroyBuffer(engine->va_dpy, b.slice);
|
||||||
|
for (int i = 0; i < b.packed_n; i++) RT.vaDestroyBuffer(engine->va_dpy, b.packed[i]);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
void vaapi_destroy(VaapiEngine* engine) {
|
||||||
|
if (!engine) return;
|
||||||
|
|
||||||
|
if (engine->coded_buf != VA_INVALID_ID) RT.vaDestroyBuffer(engine->va_dpy, engine->coded_buf);
|
||||||
|
if (engine->enc_ctx != VA_INVALID_ID) RT.vaDestroyContext(engine->va_dpy, engine->enc_ctx);
|
||||||
|
if (engine->enc_cfg != VA_INVALID_ID) RT.vaDestroyConfig(engine->va_dpy, engine->enc_cfg);
|
||||||
|
|
||||||
|
if (engine->vpp_buf != VA_INVALID_ID) RT.vaDestroyBuffer(engine->va_dpy, engine->vpp_buf);
|
||||||
|
if (engine->vpp_ctx != VA_INVALID_ID) RT.vaDestroyContext(engine->va_dpy, engine->vpp_ctx);
|
||||||
|
if (engine->vpp_cfg != VA_INVALID_ID) RT.vaDestroyConfig(engine->va_dpy, engine->vpp_cfg);
|
||||||
|
|
||||||
|
if (engine->upload_ready) RT.vaDestroyImage(engine->va_dpy, engine->upload_img.image_id);
|
||||||
|
if (engine->in_rgb_surf != VA_INVALID_ID) RT.vaDestroySurfaces(engine->va_dpy, &engine->in_rgb_surf, 1);
|
||||||
|
if (engine->nv12_surf != VA_INVALID_ID) RT.vaDestroySurfaces(engine->va_dpy, &engine->nv12_surf, 1);
|
||||||
|
if (engine->recon_surfs[0] != VA_INVALID_ID || engine->recon_surfs[1] != VA_INVALID_ID) {
|
||||||
|
RT.vaDestroySurfaces(engine->va_dpy, engine->recon_surfs, 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (engine->va_dpy) RT.vaTerminate(engine->va_dpy);
|
||||||
|
if (engine->drm_fd >= 0) close(engine->drm_fd);
|
||||||
|
if (engine->output_staging) free(engine->output_staging);
|
||||||
|
|
||||||
|
free(engine);
|
||||||
|
}
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
#ifndef UU_VAAPI_ENGINE_H
|
||||||
|
#define UU_VAAPI_ENGINE_H
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stddef.h>
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
typedef struct VaapiEngine VaapiEngine;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
uint32_t width; // encode (output) size
|
||||||
|
uint32_t height;
|
||||||
|
uint32_t cap_width; // capture (input) size; VPP scales cap -> width
|
||||||
|
uint32_t cap_height;
|
||||||
|
uint32_t fps;
|
||||||
|
uint32_t gop;
|
||||||
|
int64_t target_bps;
|
||||||
|
int64_t max_bps; // VBR ceiling (viewer preset maxrate)
|
||||||
|
int64_t buffer_bits; // HRD buffer size
|
||||||
|
int is_hevc;
|
||||||
|
const char *device; // DRM render node (UU_VAAPI_DEVICE); NULL = /dev/dri/renderD128
|
||||||
|
} VaapiConfig;
|
||||||
|
|
||||||
|
VaapiEngine* vaapi_create(const VaapiConfig* config);
|
||||||
|
|
||||||
|
// Import a DRI3 / GBM DMA-BUF fd as the zero-copy input surface
|
||||||
|
int vaapi_import_dma_buffer(VaapiEngine* engine, int dma_fd, uint32_t stride);
|
||||||
|
|
||||||
|
// Host fallback: upload ARGB host memory if DMA-BUF is unavailable
|
||||||
|
int vaapi_upload_host_buffer(VaapiEngine* engine, const uint8_t* host_ptr, uint32_t pitch);
|
||||||
|
|
||||||
|
// Encode one frame
|
||||||
|
int vaapi_encode_frame(
|
||||||
|
VaapiEngine* engine,
|
||||||
|
int force_idr,
|
||||||
|
const uint8_t** out_data,
|
||||||
|
uint32_t* out_len
|
||||||
|
);
|
||||||
|
|
||||||
|
void vaapi_destroy(VaapiEngine* engine);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif // UU_VAAPI_ENGINE_H
|
||||||
+59
-34
@@ -535,7 +535,10 @@ int uu_wl_init(int32_t *w,int32_t *h) {
|
|||||||
wl_registry_add_listener(registry,®istry_listener,NULL);
|
wl_registry_add_listener(registry,®istry_listener,NULL);
|
||||||
if(sync_display()!=0 || sync_display()!=0) goto end;
|
if(sync_display()!=0 || sync_display()!=0) goto end;
|
||||||
dma_init();
|
dma_init();
|
||||||
if(!shm || !seat || !copy_manager || !pointer_manager || !keyboard_manager || !output_count) goto end;
|
/* wlr-virtual-pointer is an optional input path. When the compositor does not
|
||||||
|
advertise it, pointer injection is skipped and the caller may drive input
|
||||||
|
through uinput; screencopy + virtual keyboard are still enough to capture. */
|
||||||
|
if(!shm || !seat || !copy_manager || !output_count) goto end;
|
||||||
const char *name=getenv("UU_WAYLAND_OUTPUT"); selected=0;
|
const char *name=getenv("UU_WAYLAND_OUTPUT"); selected=0;
|
||||||
if(name && *name) {
|
if(name && *name) {
|
||||||
for(selected=0;selected<output_count;selected++) if(!strcmp(outputs[selected].name,name)) break;
|
for(selected=0;selected<output_count;selected++) if(!strcmp(outputs[selected].name,name)) break;
|
||||||
@@ -549,23 +552,30 @@ int uu_wl_init(int32_t *w,int32_t *h) {
|
|||||||
power=zwlr_output_power_manager_v1_get_output_power(power_manager,outputs[selected].handle);
|
power=zwlr_output_power_manager_v1_get_output_power(power_manager,outputs[selected].handle);
|
||||||
zwlr_output_power_v1_add_listener(power,&power_listener,NULL);
|
zwlr_output_power_v1_add_listener(power,&power_listener,NULL);
|
||||||
}
|
}
|
||||||
pointer=zwlr_virtual_pointer_manager_v1_create_virtual_pointer_with_output(pointer_manager,seat,outputs[selected].handle);
|
if(pointer_manager) pointer=zwlr_virtual_pointer_manager_v1_create_virtual_pointer_with_output(pointer_manager,seat,outputs[selected].handle);
|
||||||
keyboard=zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(keyboard_manager,seat);
|
/* Some compositors reject a virtual keyboard from anything that is not their active
|
||||||
xkb=xkb_context_new(XKB_CONTEXT_NO_FLAGS);
|
input method (Denial does), and a rejected proxy poisons later requests. Allow the
|
||||||
if(!xkb) goto end;
|
caller to opt out and rely on uinput for key input instead. */
|
||||||
struct xkb_rule_names names={.layout="us"};
|
const char *skip_kbd=getenv("UU_WAYLAND_NO_VIRTUAL_KEYBOARD");
|
||||||
keymap=xkb_keymap_new_from_names(xkb,&names,XKB_KEYMAP_COMPILE_NO_FLAGS);
|
if(keyboard_manager && !(skip_kbd && *skip_kbd && strcmp(skip_kbd,"0")))
|
||||||
if(!keymap) goto end;
|
keyboard=zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(keyboard_manager,seat);
|
||||||
key_state=xkb_state_new(keymap); if(!key_state) goto end;
|
if(keyboard) {
|
||||||
keymap_text=xkb_keymap_get_as_string(keymap,XKB_KEYMAP_FORMAT_TEXT_V1);
|
xkb=xkb_context_new(XKB_CONTEXT_NO_FLAGS);
|
||||||
if(!keymap_text) goto end;
|
if(!xkb) goto end;
|
||||||
keymap_text_len=strlen(keymap_text)+1;
|
struct xkb_rule_names names={.layout="us"};
|
||||||
if(upload_keymap(keymap_text,keymap_text_len)!=0) goto end;
|
keymap=xkb_keymap_new_from_names(xkb,&names,XKB_KEYMAP_COMPILE_NO_FLAGS);
|
||||||
if(sync_display()!=0) goto end;
|
if(!keymap) goto end;
|
||||||
/* Text typing needs unmapped keycodes and a place to declare them. A keymap without either
|
key_state=xkb_state_new(keymap); if(!key_state) goto end;
|
||||||
only costs that path - uu_wl_type_utf8 refuses and the caller keeps its own fallback. */
|
keymap_text=xkb_keymap_get_as_string(keymap,XKB_KEYMAP_FORMAT_TEXT_V1);
|
||||||
keymap_insert=symbols_close(keymap_text);
|
if(!keymap_text) goto end;
|
||||||
spare_count=find_spare_codes(spare_codes,sizeof(spare_codes)/sizeof(spare_codes[0]));
|
keymap_text_len=strlen(keymap_text)+1;
|
||||||
|
if(upload_keymap(keymap_text,keymap_text_len)!=0) goto end;
|
||||||
|
if(sync_display()!=0) goto end;
|
||||||
|
/* Text typing needs unmapped keycodes and a place to declare them. A keymap without either
|
||||||
|
only costs that path - uu_wl_type_utf8 refuses and the caller keeps its own fallback. */
|
||||||
|
keymap_insert=symbols_close(keymap_text);
|
||||||
|
spare_count=find_spare_codes(spare_codes,sizeof(spare_codes)/sizeof(spare_codes[0]));
|
||||||
|
}
|
||||||
initialized=1; *w=width; *h=height; result=0;
|
initialized=1; *w=width; *h=height; result=0;
|
||||||
end:
|
end:
|
||||||
if(result!=0) reset();
|
if(result!=0) reset();
|
||||||
@@ -581,9 +591,12 @@ int uu_wl_select_output(const char *name,uint32_t expected_w,uint32_t expected_h
|
|||||||
if(target==output_count || outputs[target].transform!=WL_OUTPUT_TRANSFORM_NORMAL) goto end;
|
if(target==output_count || outputs[target].transform!=WL_OUTPUT_TRANSFORM_NORMAL) goto end;
|
||||||
uint32_t w=outputs[target].width,h=outputs[target].height;
|
uint32_t w=outputs[target].width,h=outputs[target].height;
|
||||||
if(w!=expected_w || h!=expected_h || !w || !h || w>16384 || h>16384 || (uint64_t)w*h*4>256*1024*1024) goto end;
|
if(w!=expected_w || h!=expected_h || !w || !h || w>16384 || h>16384 || (uint64_t)w*h*4>256*1024*1024) goto end;
|
||||||
struct zwlr_virtual_pointer_v1 *next=zwlr_virtual_pointer_manager_v1_create_virtual_pointer_with_output(pointer_manager,seat,outputs[target].handle);
|
struct zwlr_virtual_pointer_v1 *next=NULL;
|
||||||
if(!next) goto end;
|
if(pointer_manager) {
|
||||||
if(sync_display()!=0) {zwlr_virtual_pointer_v1_destroy(next);goto end;}
|
next=zwlr_virtual_pointer_manager_v1_create_virtual_pointer_with_output(pointer_manager,seat,outputs[target].handle);
|
||||||
|
if(!next) goto end;
|
||||||
|
if(sync_display()!=0) {zwlr_virtual_pointer_v1_destroy(next);goto end;}
|
||||||
|
}
|
||||||
for(unsigned i=0;i<2;i++) { frame_clear(&frames[i]); dma_clear(&frames[i]); shm_clear(&frames[i]); }
|
for(unsigned i=0;i<2;i++) { frame_clear(&frames[i]); dma_clear(&frames[i]); shm_clear(&frames[i]); }
|
||||||
pending=0;
|
pending=0;
|
||||||
if(pointer) zwlr_virtual_pointer_v1_destroy(pointer);
|
if(pointer) zwlr_virtual_pointer_v1_destroy(pointer);
|
||||||
@@ -601,7 +614,11 @@ end:
|
|||||||
int uu_wl_wake(void) {
|
int uu_wl_wake(void) {
|
||||||
pthread_mutex_lock(&lock); int result=-1;
|
pthread_mutex_lock(&lock); int result=-1;
|
||||||
/* Output power management is optional; missing it must not block screencopy. */
|
/* Output power management is optional; missing it must not block screencopy. */
|
||||||
if(initialized && !power) result=0;
|
if(initialized && (!power || power_failed)) {
|
||||||
|
/* No power manager, or the compositor refused the mode (outputs without DPMS,
|
||||||
|
headless outputs): streaming continues, the screen simply stays as it is. */
|
||||||
|
result=0;
|
||||||
|
}
|
||||||
if(initialized && power && !power_failed) {
|
if(initialized && power && !power_failed) {
|
||||||
zwlr_output_power_v1_set_mode(power,ZWLR_OUTPUT_POWER_V1_MODE_ON);
|
zwlr_output_power_v1_set_mode(power,ZWLR_OUTPUT_POWER_V1_MODE_ON);
|
||||||
if(sync_display()==0 && !power_failed) result=0;
|
if(sync_display()==0 && !power_failed) result=0;
|
||||||
@@ -650,6 +667,8 @@ end:
|
|||||||
}
|
}
|
||||||
int uu_wl_move(int32_t x,int32_t y,int relative) {
|
int uu_wl_move(int32_t x,int32_t y,int relative) {
|
||||||
pthread_mutex_lock(&lock); int result=-1;
|
pthread_mutex_lock(&lock); int result=-1;
|
||||||
|
/* -2: no virtual pointer at all, so the caller may use uinput; -1 stays a real failure. */
|
||||||
|
if(initialized && !pointer) { result=-2; goto end; }
|
||||||
if(initialized) {
|
if(initialized) {
|
||||||
if(relative) {
|
if(relative) {
|
||||||
/* UU reports pixels (source DPR=1); Wayland motion is in logical points. */
|
/* UU reports pixels (source DPR=1); Wayland motion is in logical points. */
|
||||||
@@ -664,6 +683,7 @@ end: pthread_mutex_unlock(&lock); return result;
|
|||||||
}
|
}
|
||||||
int uu_wl_button(int button,int pressed) {
|
int uu_wl_button(int button,int pressed) {
|
||||||
pthread_mutex_lock(&lock); int result=-1;
|
pthread_mutex_lock(&lock); int result=-1;
|
||||||
|
if(initialized && !pointer) { goto end; } /* no virtual pointer: report failure so the caller falls back to uinput */
|
||||||
if(initialized) {
|
if(initialized) {
|
||||||
if(button>=4 && button<=7) {
|
if(button>=4 && button<=7) {
|
||||||
if(pressed) {
|
if(pressed) {
|
||||||
@@ -683,6 +703,7 @@ end: pthread_mutex_unlock(&lock); return result;
|
|||||||
}
|
}
|
||||||
int uu_wl_key(uint64_t symbol,int pressed) {
|
int uu_wl_key(uint64_t symbol,int pressed) {
|
||||||
pthread_mutex_lock(&lock); int result=-1;
|
pthread_mutex_lock(&lock); int result=-1;
|
||||||
|
if(initialized && !keyboard) { pthread_mutex_unlock(&lock); return -1; } /* no virtual keyboard: caller falls back to uinput */
|
||||||
if(initialized) {
|
if(initialized) {
|
||||||
for(xkb_keycode_t code=xkb_keymap_min_keycode(keymap);code<=xkb_keymap_max_keycode(keymap);code++) {
|
for(xkb_keycode_t code=xkb_keymap_min_keycode(keymap);code<=xkb_keymap_max_keycode(keymap);code++) {
|
||||||
int matches=0;
|
int matches=0;
|
||||||
@@ -713,20 +734,24 @@ int uu_wl_release_all(void) {
|
|||||||
if(initialized) {
|
if(initialized) {
|
||||||
/* Sweep this client's virtual keyboard directly: a keysym lookup can
|
/* Sweep this client's virtual keyboard directly: a keysym lookup can
|
||||||
fail for unmapped OEM/keypad symbols before reaching held modifiers. */
|
fail for unmapped OEM/keypad symbols before reaching held modifiers. */
|
||||||
for(xkb_keycode_t code=xkb_keymap_min_keycode(keymap);code<=xkb_keymap_max_keycode(keymap);code++) {
|
if(keyboard) {
|
||||||
if(code<8 || code>=sizeof(held_keys) || !xkb_keymap_key_get_name(keymap,code)) continue;
|
for(xkb_keycode_t code=xkb_keymap_min_keycode(keymap);code<=xkb_keymap_max_keycode(keymap);code++) {
|
||||||
zwp_virtual_keyboard_v1_key(keyboard,timestamp(),code-8,WL_KEYBOARD_KEY_STATE_RELEASED);
|
if(code<8 || code>=sizeof(held_keys) || !xkb_keymap_key_get_name(keymap,code)) continue;
|
||||||
if(held_keys[code]) xkb_state_update_key(key_state,code,XKB_KEY_UP);
|
zwp_virtual_keyboard_v1_key(keyboard,timestamp(),code-8,WL_KEYBOARD_KEY_STATE_RELEASED);
|
||||||
|
if(held_keys[code]) xkb_state_update_key(key_state,code,XKB_KEY_UP);
|
||||||
|
}
|
||||||
|
zwp_virtual_keyboard_v1_modifiers(keyboard,
|
||||||
|
xkb_state_serialize_mods(key_state,XKB_STATE_MODS_DEPRESSED),
|
||||||
|
xkb_state_serialize_mods(key_state,XKB_STATE_MODS_LATCHED),
|
||||||
|
xkb_state_serialize_mods(key_state,XKB_STATE_MODS_LOCKED),
|
||||||
|
xkb_state_serialize_layout(key_state,XKB_STATE_LAYOUT_EFFECTIVE));
|
||||||
}
|
}
|
||||||
memset(held_keys,0,sizeof(held_keys));
|
memset(held_keys,0,sizeof(held_keys));
|
||||||
zwp_virtual_keyboard_v1_modifiers(keyboard,
|
if(pointer) {
|
||||||
xkb_state_serialize_mods(key_state,XKB_STATE_MODS_DEPRESSED),
|
for(unsigned code=0x110;code<=0x114;code++)
|
||||||
xkb_state_serialize_mods(key_state,XKB_STATE_MODS_LATCHED),
|
zwlr_virtual_pointer_v1_button(pointer,timestamp(),code,WL_POINTER_BUTTON_STATE_RELEASED);
|
||||||
xkb_state_serialize_mods(key_state,XKB_STATE_MODS_LOCKED),
|
zwlr_virtual_pointer_v1_frame(pointer);
|
||||||
xkb_state_serialize_layout(key_state,XKB_STATE_LAYOUT_EFFECTIVE));
|
}
|
||||||
for(unsigned code=0x110;code<=0x114;code++)
|
|
||||||
zwlr_virtual_pointer_v1_button(pointer,timestamp(),code,WL_POINTER_BUTTON_STATE_RELEASED);
|
|
||||||
zwlr_virtual_pointer_v1_frame(pointer);
|
|
||||||
result=wl_display_flush(display)<0?-1:0;
|
result=wl_display_flush(display)<0?-1:0;
|
||||||
}
|
}
|
||||||
pthread_mutex_unlock(&lock);return result;
|
pthread_mutex_unlock(&lock);return result;
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
# Unofficial UU Remote Linux host in a container, for NAS boxes (Synology DSM, etc.) without a desktop.
|
# Unofficial UU Remote Linux host in a container, for NAS boxes (Synology DSM, etc.) without a desktop.
|
||||||
# Headless mode: file transfer, terminal and port mapping; no remote desktop. Uses the published release binary.
|
# Headless mode: file transfer, terminal and port mapping; no remote desktop. Uses the published release binary.
|
||||||
FROM ubuntu:24.04
|
FROM ubuntu:24.04
|
||||||
ARG VERSION=v0.2.17
|
ARG VERSION=v0.2.20
|
||||||
LABEL org.opencontainers.image.source="https://github.com/VallierDev/uu-remote-linux" \
|
LABEL org.opencontainers.image.source="https://github.com/VallierDev/uu-remote-linux" \
|
||||||
org.opencontainers.image.description="Unofficial UU Remote Linux host, headless (file transfer, terminal, port mapping)" \
|
org.opencontainers.image.description="Unofficial UU Remote Linux host, headless (file transfer, terminal, port mapping)" \
|
||||||
org.opencontainers.image.licenses="GPL-3.0"
|
org.opencontainers.image.licenses="GPL-3.0"
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
Ubuntu / Debian 安装包(.deb);实验性远程开机辅助。/ Debian packages; experimental Wake-on-LAN helper.
|
||||||
|
|
||||||
|
### 新增 / Added
|
||||||
|
- **`.deb` 安装包**(amd64 / arm64):`sudo apt install ./uu-remote-linux_0.2.18_amd64.deb` 一步装好程序、两个桌面插件、
|
||||||
|
用户级 systemd 服务和应用菜单图标,依赖由 apt 自动安装。之后以桌面用户运行:
|
||||||
|
```sh
|
||||||
|
uuremote-server login
|
||||||
|
systemctl --user enable --now uuremote-native.service
|
||||||
|
```
|
||||||
|
服务随图形会话启动(GNOME / KDE 会自动传入显示环境;Xfce 等需按 README 补 `DISPLAY`)。uinput 权限不会自动开启,规则文件放在
|
||||||
|
`/usr/share/doc/uu-remote-linux/`。安装流程在 CI 的 Ubuntu 22.04 上实测(apt 安装、`--help`、systemd 单元校验);尚未在真实桌面上完整验收。
|
||||||
|
- **远程开机辅助(实验性,默认关闭,`UU_WOL_HELPER=1`)**:仿照官方 Windows 被控端,登录后向网易上报本机局域网信息,
|
||||||
|
收到云端的唤醒请求时向同一局域网发送唤醒包,让这台常开的 Linux(例如 NAS)帮你唤醒同局域网的其他电脑。
|
||||||
|
字段名来自官方程序的日志字符串,**未经端到端验证**;不开启时不上报任何局域网信息,只记录唤醒推送的字段名(不含 MAC/IP)。
|
||||||
|
- Debian packages (amd64/arm64) with the binaries, plugins, a systemd user unit and menu entries; install-tested on Ubuntu 22.04 in CI.
|
||||||
|
Experimental, opt-in Wake-on-LAN helper (`UU_WOL_HELPER=1`) modelled on the official Windows host; not verified end to end.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- `uuremote-server doctor` 不再输出带完整路径的插件加载日志(路径可能含用户名)。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.18_amd64.deb` / `uu-remote-linux_0.2.18_arm64.deb`,或 `uu-remote-linux-v0.2.18-<x86_64|aarch64>-linux.tar.gz`,
|
||||||
|
或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.18`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
无头 Wayland 出画面、自定义码率、`show` 与登录体验修复。/ Headless Wayland video, custom bitrate, `show` and login fixes.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **无头 Wayland 主机连上没有画面**(#64 / #65,感谢 @axlrose):输出不支持 DPMS 时电源握手失败不再中断视频;贡献者在 sway headless 上复现并验证。
|
||||||
|
- **自定义码率单位错误**(#67,感谢 @JuanZoran):手机端自定义码率按 bit/s 发送(1 Mbps = 1000000),此前被当成 kbit/s 而触发 100 Mbps 上限,
|
||||||
|
导致大量重传、画面滞留。贡献者在 Hyprland + NVENC 上用手机实测。另外对明显是 Mbps / kbps 的小数值做了兜底换算(维护者补充,未实测)。
|
||||||
|
- **`uuremote-server show` 静默卡 30 秒**(#62,感谢 @axlrose):服务被条件跳过、反复崩溃重启或启动失败时立即报出真实原因。贡献者已用真实 systemd 单元验证。
|
||||||
|
- **登录二维码反复立即失效**(#68,感谢 @axlrose):状态轮询在服务器立即应答时不再紧循环(2 秒退避);二维码连续在几秒内失效时指数退避,
|
||||||
|
并提示可备份删除 `~/.config/uuremote/config.json` 重新登录(注册新设备身份,#68 中以此恢复)。退避逻辑未在被标记的设备上实测。
|
||||||
|
|
||||||
|
### 改进 / Improved
|
||||||
|
- `doctor`:会话里没有 `DISPLAY` / `WAYLAND_DISPLAY` 时给出提示(#66,感谢 @axlrose)。
|
||||||
|
- 文档:`inproc-av` / `viewer-ffmpeg` 只支持 FFmpeg 6.x,FFmpeg 7+ 会在依赖里报 `avfft.h file not found`(#63)。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.19_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.19-<x86_64|aarch64>-linux.tar.gz`,或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.19`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
扫码登录改为与官方客户端一致,修复二维码刚生成就失效。/ QR sign-in now matches the official client.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **登录二维码反复立即失效(1190)**(#68,感谢 @axlrose 的详细排查):逆向官方 Mac 客户端(4.42)后确认,新版服务端在生成二维码时
|
||||||
|
返回 `status_query_ticket`,官方客户端查询扫码状态和确认登录时都用它(放在 `token` 键下);我们此前优先发送旧的 `token` 字段。现在与官方一致:
|
||||||
|
- 生成二维码不带请求体;状态查询用 `status_query_ticket`(服务端没有时才用旧 `token`);
|
||||||
|
- 状态查询是长轮询,每次应答后立即再问,单次超时 60 秒(此前 12 秒);
|
||||||
|
- 状态 3 立即换新码、状态 0 在 0.35 秒后换新码、状态 4 登录(状态 3 不再去调确认登录);
|
||||||
|
- 出错(如 HTTP 400 / 1190)或超时时停止轮询,等用户点击登录窗口新增的「刷新二维码」按钮(终端里按回车;既无窗口也无终端时 60 秒后自动换码)。
|
||||||
|
取代 v0.2.19 的临时退避和「重新注册设备」提示。已用全新设备身份实测:状态查询正常挂起,60 秒后按官方行为停止并等待刷新;
|
||||||
|
未在 #68 那台被标记的设备上实测,「刷新二维码」按钮的界面尚未在桌面上目视验收。
|
||||||
|
- QR sign-in mirrors the official Mac client: `status_query_ticket` as the status ticket, 60 s long poll, regenerate on status 3/0,
|
||||||
|
stop on errors (e.g. code 1190) until the user clicks the new “refresh QR” button.
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.20_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.20-<x86_64|aarch64>-linux.tar.gz`,或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.20`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
Wayland 合成器缺少虚拟指针或虚拟键盘时,桌面仍可使用;systemd 单元示例与 deb 包一致。/ Wayland desktops without virtual pointer/keyboard protocols still come up.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **只缺 wlr-virtual-pointer 或虚拟键盘受限的合成器整个桌面不可用**(#72、#73,感谢 @clionertr):Denial 等合成器不提供
|
||||||
|
`zwlr_virtual_pointer_manager_v1`,或只把虚拟键盘给它自己的输入法。现在这两个协议都是可选的:画面采集照常启动,
|
||||||
|
缺指针时绝对移动改走 uinput(需能访问 `/dev/uinput`,见 README);`UU_WAYLAND_NO_VIRTUAL_KEYBOARD=1` 可跳过虚拟键盘。
|
||||||
|
只有「完全没有虚拟指针」才回退 uinput;坐标超出当前采集输出等其他失败照旧返回,不会把指针移到别的屏幕(#78)。
|
||||||
|
CI 构建与测试通过,**未在 Denial 上实机验证**;Hyprland 等已有虚拟指针的合成器行为不变。
|
||||||
|
- Virtual pointer and keyboard are optional on Wayland; capture still starts and pointer motion falls back to uinput only when
|
||||||
|
the compositor has no wlr-virtual-pointer. Not tested on Denial.
|
||||||
|
|
||||||
|
### 文档 / Docs
|
||||||
|
- README 的用户 systemd 单元与 deb 包一致:不再写死 `DISPLAY=:0`,随 `graphical-session.target` 启动;无头模式、虚拟桌面和
|
||||||
|
Xfce/i3 等不启动该 target 的桌面改用 `WantedBy=default.target`(#69,感谢 @ferstar)。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.21_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.21-<x86_64|aarch64>-linux.tar.gz`,或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.21`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
官方控制端能选「真彩」(4:4:4) 了;自行编译的 `inproc-av` 新增进程内 NVENC 与 AMD/Intel VAAPI。/ The official viewer can select true color (4:4:4); self-built `inproc-av` gains in-process NVENC and VAAPI.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **官方控制端里「真彩」不可选或打开后马上被切回**(#77、#79):设备能力里 HEVC/4:4:4 等格式的宽高原来填的是 0x0,官方控制端会把这样的条目当作不支持。现在每种格式都带上最大尺寸 3840x2160。
|
||||||
|
已实机验收:官方 Mac 控制端连 X11 + NVIDIA 主机,打开真彩后切到 HEVC 4:4:4,持续 30 秒以上没有被切回,也没有请求关键帧(PLI)。
|
||||||
|
- The device capability listed HEVC/4:4:4 formats as 0x0, which the official viewer treats as unsupported; each format now
|
||||||
|
carries its maximum size. Verified with the official Mac viewer: true color stays on (HEVC 4:4:4) for 30+ s, no PLI.
|
||||||
|
|
||||||
|
### 新增(需自行编译,预编译包不受影响)/ Added (self-built only; release packages unchanged)
|
||||||
|
- `--features inproc-av`(仅 X11):
|
||||||
|
- **NVENC 进程内编码**(#75、#77,感谢 @ferstar):直接读取 XShm,支持 4:4:4,不再经过 FFmpeg 进程;失败时依次回退到 FFmpeg 的 NVENC 管线、CPU。我方 NVIDIA 机器未单独验收这条进程内路径。
|
||||||
|
- **VAAPI 进程内编码**(#80、#81,感谢 @ferstar):通过 DRI3 DMA-BUF 零拷贝取屏(没有 DRI3 时改用 XShm 上传),经 VPP 转成 NV12 后送入硬件编码,支持 H.264 和 H.265。贡献者已在 AMD HawkPoint、Cezanne 上用官方 Mac 控制端实机验收;Intel 与 4K 尚未验证。需设置 `UU_VIDEO_ENCODER=vaapi`。
|
||||||
|
- libcuda、libva 都在运行时加载;编译所需的头文件见 README。
|
||||||
|
- In-process NVENC (XShm, 4:4:4) and VAAPI (DRI3 DMA-BUF zero copy, H.264/H.265) under `--features inproc-av` on X11,
|
||||||
|
each falling back to the FFmpeg process pipeline. VAAPI accepted by the contributor on AMD HawkPoint/Cezanne; Intel and 4K untested.
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.22_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.22-<x86_64|aarch64>-linux.tar.gz`,或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.22`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
Executable
+67
@@ -0,0 +1,67 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
# Build uu-remote-linux_<version>_<arch>.deb from release binaries.
|
||||||
|
# usage: packaging/deb/build-deb.sh VERSION BIN_DIR OUT_DIR (VERSION without the leading v)
|
||||||
|
set -eu
|
||||||
|
version=$1 bin=$2 out=$3
|
||||||
|
here=$(cd "$(dirname "$0")" && pwd) root=$(cd "$here/../.." && pwd)
|
||||||
|
case $(uname -m) in x86_64) arch=amd64 ;; aarch64) arch=arm64 ;; *) echo "unsupported arch" >&2; exit 1 ;; esac
|
||||||
|
pkg=$(mktemp -d)
|
||||||
|
trap 'rm -rf "$pkg"' EXIT
|
||||||
|
install -Dm755 "$bin/uuremote-server" "$pkg/usr/bin/uuremote-server"
|
||||||
|
[ -f "$bin/uuremote-viewer" ] && install -Dm755 "$bin/uuremote-viewer" "$pkg/usr/bin/uuremote-viewer"
|
||||||
|
for lib in libuu-wayland.so libuu-portal.so; do
|
||||||
|
[ -f "$bin/$lib" ] && install -Dm644 "$bin/$lib" "$pkg/usr/lib/uu-remote-linux/$lib"
|
||||||
|
done
|
||||||
|
install -Dm644 "$here/uuremote-native.service" "$pkg/usr/lib/systemd/user/uuremote-native.service"
|
||||||
|
install -Dm644 "$root/contrib/desktop/uu-remote-linux.desktop" "$pkg/usr/share/applications/uu-remote-linux.desktop"
|
||||||
|
[ -f "$pkg/usr/bin/uuremote-viewer" ] && install -Dm644 "$root/contrib/desktop/uu-remote-linux-viewer.desktop" "$pkg/usr/share/applications/uu-remote-linux-viewer.desktop"
|
||||||
|
install -Dm644 "$root/contrib/desktop/uu-remote-linux.svg" "$pkg/usr/share/icons/hicolor/scalable/apps/uu-remote-linux.svg"
|
||||||
|
install -Dm644 "$root/LICENSE" "$pkg/usr/share/doc/uu-remote-linux/copyright"
|
||||||
|
# uinput access is opt-in: it lets the service inject input into the whole seat.
|
||||||
|
printf '%s\n' 'KERNEL=="uinput", SUBSYSTEM=="misc", OPTIONS+="static_node=uinput", TAG+="uaccess"' \
|
||||||
|
> "$pkg/usr/share/doc/uu-remote-linux/60-uu-remote-linux-uinput.rules"
|
||||||
|
size=$(du -sk "$pkg/usr" | cut -f1)
|
||||||
|
# Library dependencies from the binaries themselves (the server hard, the viewer recommended).
|
||||||
|
shlibdeps() {
|
||||||
|
work=$(mktemp -d); mkdir "$work/debian"
|
||||||
|
printf 'Source: uu-remote-linux\n\nPackage: uu-remote-linux\nArchitecture: any\n' > "$work/debian/control"
|
||||||
|
(cd "$work" && dpkg-shlibdeps -O --ignore-missing-info "$1" 2>/dev/null) | sed -n 's/^shlibs:Depends=//p'
|
||||||
|
rm -rf "$work"
|
||||||
|
}
|
||||||
|
depends=$(shlibdeps "$pkg/usr/bin/uuremote-server")
|
||||||
|
recommends=""
|
||||||
|
[ -f "$pkg/usr/bin/uuremote-viewer" ] && recommends=$(shlibdeps "$pkg/usr/bin/uuremote-viewer")
|
||||||
|
[ -n "$depends" ] || { echo "dpkg-shlibdeps produced no dependencies" >&2; exit 1; }
|
||||||
|
mkdir -p "$pkg/DEBIAN"
|
||||||
|
cat > "$pkg/DEBIAN/control" <<CONTROL
|
||||||
|
Package: uu-remote-linux
|
||||||
|
Version: $version
|
||||||
|
Architecture: $arch
|
||||||
|
Maintainer: VallierDev <[email protected]>
|
||||||
|
Installed-Size: $size
|
||||||
|
Depends: $depends, ffmpeg
|
||||||
|
Recommends: ${recommends:+$recommends, }libwayland-client0, libxkbcommon0
|
||||||
|
Suggests: libpipewire-0.3-0, libei1, wl-clipboard
|
||||||
|
Section: net
|
||||||
|
Priority: optional
|
||||||
|
Homepage: https://github.com/VallierDev/uu-remote-linux
|
||||||
|
Description: Unofficial native Linux host for NetEase UU Remote
|
||||||
|
Lets the official NetEase UU Remote clients control this Linux desktop
|
||||||
|
(X11, wlroots Wayland and GNOME/KDE Wayland through runtime plugins).
|
||||||
|
Includes the experimental uuremote-viewer. Not affiliated with NetEase.
|
||||||
|
CONTROL
|
||||||
|
cat > "$pkg/DEBIAN/postinst" <<'POSTINST'
|
||||||
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
if [ "$1" = configure ]; then
|
||||||
|
cat <<'MSG'
|
||||||
|
uu-remote-linux installed. As your desktop user (not root):
|
||||||
|
uuremote-server login # scan the QR code with the UU Remote app
|
||||||
|
systemctl --user enable --now uuremote-native.service # start with the graphical session
|
||||||
|
Optional uinput keyboard/mouse (Wayland): see /usr/share/doc/uu-remote-linux/60-uu-remote-linux-uinput.rules
|
||||||
|
MSG
|
||||||
|
fi
|
||||||
|
POSTINST
|
||||||
|
chmod 755 "$pkg/DEBIAN/postinst"
|
||||||
|
mkdir -p "$out"
|
||||||
|
dpkg-deb --build --root-owner-group "$pkg" "$out/uu-remote-linux_${version}_${arch}.deb"
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
# Installed by the uu-remote-linux .deb as a systemd *user* unit; enable it per user:
|
||||||
|
# systemctl --user enable --now uuremote-native.service
|
||||||
|
# GNOME and KDE import DISPLAY / WAYLAND_DISPLAY into the user manager when the graphical session
|
||||||
|
# starts. Desktops that do not (e.g. Xfce) can add a drop-in with Environment=DISPLAY=:0.
|
||||||
|
[Unit]
|
||||||
|
Description=UU Remote Linux host (unofficial)
|
||||||
|
After=graphical-session.target
|
||||||
|
PartOf=graphical-session.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Environment=RUST_LOG=info
|
||||||
|
ExecStart=/usr/bin/uuremote-server
|
||||||
|
Restart=always
|
||||||
|
RestartSec=5
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=graphical-session.target
|
||||||
+1
-10
@@ -1,7 +1,6 @@
|
|||||||
//! Desktop sound for the viewer's 声音 menu: the default output's monitor (PulseAudio or
|
//! Desktop sound for the viewer's 声音 menu: the default output's monitor (PulseAudio or
|
||||||
//! PipeWire-pulse) is encoded to Opus and sent on the negotiated audio m-line.
|
//! PipeWire-pulse) is encoded to Opus and sent on the negotiated audio m-line.
|
||||||
//! Encoding runs in this process with the `inproc-av` feature (unless `UU_FFMPEG_ROOT` is set),
|
//! An FFmpeg child process does the encoding.
|
||||||
//! otherwise an FFmpeg child process does it.
|
|
||||||
//! PipeWire monitors ignore the sink's mute by default, so 被控端静音运行 keeps the stream audible.
|
//! PipeWire monitors ignore the sink's mute by default, so 被控端静音运行 keeps the stream audible.
|
||||||
//! `UU_AUDIO=0` disables it; `UU_AUDIO_SOURCE` picks another Pulse source.
|
//! `UU_AUDIO=0` disables it; `UU_AUDIO_SOURCE` picks another Pulse source.
|
||||||
|
|
||||||
@@ -57,14 +56,6 @@ fn read_packets(stdout: impl Read, tx: &tokio::sync::mpsc::Sender<bytes::Bytes>)
|
|||||||
fn start(source: &str, tx: tokio::sync::mpsc::Sender<bytes::Bytes>)
|
fn start(source: &str, tx: tokio::sync::mpsc::Sender<bytes::Bytes>)
|
||||||
-> Result<(Stopper, tokio::task::JoinHandle<Result<(), String>>), String> {
|
-> Result<(Stopper, tokio::task::JoinHandle<Result<(), String>>), String> {
|
||||||
let stop = Arc::new(AtomicBool::new(false));
|
let stop = Arc::new(AtomicBool::new(false));
|
||||||
#[cfg(feature = "inproc-av")]
|
|
||||||
if crate::inproc_encoder::selected() {
|
|
||||||
let job = tokio::task::spawn_blocking({
|
|
||||||
let (stop, source) = (stop.clone(), source.to_owned());
|
|
||||||
move || crate::inproc_encoder::run_audio(&source, tx, stop)
|
|
||||||
});
|
|
||||||
return Ok((Stopper { stop, child: None }, job));
|
|
||||||
}
|
|
||||||
let mut child = spawn_encoder(source)?;
|
let mut child = spawn_encoder(source)?;
|
||||||
let stdout = child.stdout.take().ok_or("Encoder stdout missing")?;
|
let stdout = child.stdout.take().ok_or("Encoder stdout missing")?;
|
||||||
let job = tokio::task::spawn_blocking(move || read_packets(stdout, &tx));
|
let job = tokio::task::spawn_blocking(move || read_packets(stdout, &tx));
|
||||||
|
|||||||
+21
@@ -251,6 +251,27 @@ impl UUAuthClient {
|
|||||||
Ok((status, value))
|
Ok((status, value))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Signed POST with an optional JSON body (None = empty body, like Moya `requestPlain`) and an
|
||||||
|
/// explicit timeout. The official clients long-poll the QR status with a 60 s request timeout.
|
||||||
|
pub async fn post_with_timeout(&self, path: &str, body: Option<&serde_json::Value>, timeout: std::time::Duration) -> Result<(u16, serde_json::Value), String> {
|
||||||
|
let body_str = body.map(serde_json::to_string).transpose().map_err(|e| e.to_string())?.unwrap_or_default();
|
||||||
|
let resp = self.http.post(format!("{}{}", BASE_URL, path)).timeout(timeout)
|
||||||
|
.headers(self.build_headers("POST", path, &body_str)).body(body_str)
|
||||||
|
.send().await.map_err(|e| format!("HTTP post {path} failed: {}", transport_error(&e)))?;
|
||||||
|
let status = resp.status().as_u16();
|
||||||
|
Ok((status, resp.json().await.unwrap_or(serde_json::Value::Null)))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Signed JSON POST to another API host (the signature covers the path only).
|
||||||
|
pub async fn post_json_url(&self, base: &str, path: &str, body: &serde_json::Value) -> Result<(u16, serde_json::Value), String> {
|
||||||
|
let body_str = serde_json::to_string(body).map_err(|e| e.to_string())?;
|
||||||
|
let resp = self.http.post(format!("{base}{path}"))
|
||||||
|
.headers(self.build_headers("POST", path, &body_str)).body(body_str)
|
||||||
|
.send().await.map_err(|e| format!("HTTP post {path} failed: {}", transport_error(&e)))?;
|
||||||
|
let status = resp.status().as_u16();
|
||||||
|
Ok((status, resp.json().await.unwrap_or(serde_json::Value::Null)))
|
||||||
|
}
|
||||||
|
|
||||||
/// Guest APIs use requestPlain for empty requests; sign the actual empty body.
|
/// Guest APIs use requestPlain for empty requests; sign the actual empty body.
|
||||||
/// Errors intentionally exclude response text and URL (both can contain secrets).
|
/// Errors intentionally exclude response text and URL (both can contain secrets).
|
||||||
pub async fn assist_post(&self, path: &str, body: Option<&serde_json::Value>) -> Result<(u16, serde_json::Value), String> {
|
pub async fn assist_post(&self, path: &str, body: Option<&serde_json::Value>) -> Result<(u16, serde_json::Value), String> {
|
||||||
|
|||||||
+4
-3
@@ -35,12 +35,13 @@ pub fn h264_device_capability(
|
|||||||
/// The payload sits under `data.device_capability` with `type` beside it. The earlier flat shape
|
/// The payload sits under `data.device_capability` with `type` beside it. The earlier flat shape
|
||||||
/// (`type` at the top, fields directly in `data`) was not recognised by the iPhone client, which
|
/// (`type` at the top, fields directly in `data`) was not recognised by the iPhone client, which
|
||||||
/// then kept quality and chroma locked at their defaults (#49). Only 8-bit and the chroma formats
|
/// then kept quality and chroma locked at their defaults (#49). Only 8-bit and the chroma formats
|
||||||
/// the encoder really produces are listed; the first entry carries the maximum size as officially.
|
/// the encoder really produces are listed, each with its maximum size: the official viewer treats a
|
||||||
|
/// 0x0 entry as unsupported (#77; the 4.37 host we copied had a GTX 660 without HEVC/4:4:4).
|
||||||
pub fn device_capability(client_id: &str, ice_id: &str, display_id: i32, fps: i32, codec_impl: i32, hevc: bool, full_chroma: bool) -> Value {
|
pub fn device_capability(client_id: &str, ice_id: &str, display_id: i32, fps: i32, codec_impl: i32, hevc: bool, full_chroma: bool) -> Value {
|
||||||
let mut codecs = Vec::new();
|
let mut codecs = Vec::new();
|
||||||
for codec in [VIDEO_CODEC_H264].into_iter().chain(hevc.then_some(2)) {
|
for codec in [VIDEO_CODEC_H264].into_iter().chain(hevc.then_some(2)) {
|
||||||
for chroma in [1].into_iter().chain(full_chroma.then_some(3)) {
|
for chroma in [1].into_iter().chain(full_chroma.then_some(3)) {
|
||||||
let (width, height) = if codecs.is_empty() { (3840, 2160) } else { (0, 0) };
|
let (width, height) = (3840, 2160);
|
||||||
codecs.push(json!({"video_codec": codec, "chroma_sampling": chroma, "codec_impl": codec_impl,
|
codecs.push(json!({"video_codec": codec, "chroma_sampling": chroma, "codec_impl": codec_impl,
|
||||||
"bit_depth": 8, "width": width, "height": height}));
|
"bit_depth": 8, "width": width, "height": height}));
|
||||||
}
|
}
|
||||||
@@ -86,7 +87,7 @@ mod tests {
|
|||||||
let caps = &payload["data"]["device_capability"]["video_codec_capability"];
|
let caps = &payload["data"]["device_capability"]["video_codec_capability"];
|
||||||
assert_eq!(caps.as_array().unwrap().len(), 4);
|
assert_eq!(caps.as_array().unwrap().len(), 4);
|
||||||
assert_eq!(caps[0], json!({"video_codec":1,"chroma_sampling":1,"codec_impl":5,"bit_depth":8,"width":3840,"height":2160}));
|
assert_eq!(caps[0], json!({"video_codec":1,"chroma_sampling":1,"codec_impl":5,"bit_depth":8,"width":3840,"height":2160}));
|
||||||
assert_eq!(caps[3], json!({"video_codec":2,"chroma_sampling":3,"codec_impl":5,"bit_depth":8,"width":0,"height":0}));
|
assert_eq!(caps[3], json!({"video_codec":2,"chroma_sampling":3,"codec_impl":5,"bit_depth":8,"width":3840,"height":2160}));
|
||||||
assert_eq!(payload["data"]["device_capability"]["display_info"][0]["hdr"], -1);
|
assert_eq!(payload["data"]["device_capability"]["display_info"][0]["hdr"], -1);
|
||||||
let h264_420 = device_capability("c", "i", 0, 60, 5, false, false);
|
let h264_420 = device_capability("c", "i", 0, 60, 5, false, false);
|
||||||
assert_eq!(h264_420["data"]["device_capability"]["video_codec_capability"].as_array().unwrap().len(), 1);
|
assert_eq!(h264_420["data"]["device_capability"]["video_codec_capability"].as_array().unwrap().len(), 1);
|
||||||
|
|||||||
+50
-10
@@ -45,8 +45,8 @@ pub struct VideoSettings {
|
|||||||
pub fps: u32,
|
pub fps: u32,
|
||||||
pub codec: VideoCodec,
|
pub codec: VideoCodec,
|
||||||
pub quality: u64,
|
pub quality: u64,
|
||||||
/// Viewer max_custom_bitrate (only used for QUALITY_CUSTOM): Mbit/s, or kbit/s above 1000.
|
/// Viewer max_custom_bitrate in bits/s (only used for QUALITY_CUSTOM).
|
||||||
pub custom_mbps: u32,
|
pub custom_bps: u32,
|
||||||
/// Scaled stream size (其他分辨率); None streams the native desktop size.
|
/// Scaled stream size (其他分辨率); None streams the native desktop size.
|
||||||
pub output: Option<(u32, u32)>,
|
pub output: Option<(u32, u32)>,
|
||||||
/// CHROMA_420 or CHROMA_444 (真彩); 4:4:4 only when the encoder pipeline supports it.
|
/// CHROMA_420 or CHROMA_444 (真彩); 4:4:4 only when the encoder pipeline supports it.
|
||||||
@@ -54,7 +54,7 @@ pub struct VideoSettings {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Default for VideoSettings {
|
impl Default for VideoSettings {
|
||||||
fn default() -> Self { let (source_id,source_generation)=crate::wayland::selection(); Self { source_id,source_generation, codec: VideoCodec::H264, fps: 60, quality: QUALITY_AUTO, custom_mbps: 0, output: None, chroma: CHROMA_420 } }
|
fn default() -> Self { let (source_id,source_generation)=crate::wayland::selection(); Self { source_id,source_generation, codec: VideoCodec::H264, fps: 60, quality: QUALITY_AUTO, custom_bps: 0, output: None, chroma: CHROMA_420 } }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Selectable smaller stream sizes with the desktop's aspect ratio (even dimensions).
|
/// Selectable smaller stream sizes with the desktop's aspect ratio (even dimensions).
|
||||||
@@ -86,8 +86,8 @@ impl VideoSettings {
|
|||||||
QUALITY_GENERAL => Some(2_000),
|
QUALITY_GENERAL => Some(2_000),
|
||||||
QUALITY_HD => Some(8_000),
|
QUALITY_HD => Some(8_000),
|
||||||
QUALITY_BLURAY => Some(20_000),
|
QUALITY_BLURAY => Some(20_000),
|
||||||
QUALITY_CUSTOM if self.custom_mbps > 0 =>
|
QUALITY_CUSTOM if self.custom_bps > 0 =>
|
||||||
Some(if self.custom_mbps > 1_000 { self.custom_mbps } else { self.custom_mbps * 1_000 }.min(100_000)),
|
Some((self.custom_bps / 1_000).clamp(1, 100_000)),
|
||||||
_ => None,
|
_ => None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -112,6 +112,14 @@ fn fps_from_option(value: u64) -> Option<u64> {
|
|||||||
|
|
||||||
/// Applies a capture-setting RPC to `settings` and returns the RpcResponse payload (Message 22),
|
/// Applies a capture-setting RPC to `settings` and returns the RpcResponse payload (Message 22),
|
||||||
/// or None when the RPC is not a capture/fps/quality setting.
|
/// or None when the RPC is not a capture/fps/quality setting.
|
||||||
|
/// max_custom_bitrate (field 8) in bit/s: the mobile viewer sends 1_000_000 for 1 Mbps (#67). Values
|
||||||
|
/// that can only be a different unit stay usable instead of collapsing to a 1 kbit/s cap: below 1000
|
||||||
|
/// they are Mbit/s, below 200_000 kbit/s (no viewer offers custom rates under 200 kbit/s).
|
||||||
|
fn custom_bitrate_bps(value: u64) -> u32 {
|
||||||
|
let bps = if value < 1_000 { value * 1_000_000 } else if value < 200_000 { value * 1_000 } else { value };
|
||||||
|
bps.min(u64::from(u32::MAX)) as u32
|
||||||
|
}
|
||||||
|
|
||||||
pub fn handle_rpc(rpc: &[WireField], settings: &watch::Sender<VideoSettings>, native: (u32, u32)) -> Option<Vec<u8>> {
|
pub fn handle_rpc(rpc: &[WireField], settings: &watch::Sender<VideoSettings>, native: (u32, u32)) -> Option<Vec<u8>> {
|
||||||
handle_rpc_with_codecs(rpc, settings, native, true, false)
|
handle_rpc_with_codecs(rpc, settings, native, true, false)
|
||||||
}
|
}
|
||||||
@@ -148,7 +156,7 @@ fn apply_rpc(rpc: &[WireField], settings: &watch::Sender<VideoSettings>, native:
|
|||||||
// Field 1 is the viewer's fps option index (1 = 30, 2 = 60, ...); 18 fpsCount is the frame rate.
|
// Field 1 is the viewer's fps option index (1 = 30, 2 = 60, ...); 18 fpsCount is the frame rate.
|
||||||
if let Some(fps) = number(&fields, 18).filter(|v| *v > 0).or_else(|| number(&fields, 1).and_then(fps_from_option)) { next.fps = fps as u32; }
|
if let Some(fps) = number(&fields, 18).filter(|v| *v > 0).or_else(|| number(&fields, 1).and_then(fps_from_option)) { next.fps = fps as u32; }
|
||||||
if let Some(quality) = number(&fields, 2).filter(|v| *v > 0) { next.quality = quality; }
|
if let Some(quality) = number(&fields, 2).filter(|v| *v > 0) { next.quality = quality; }
|
||||||
if let Some(bitrate) = number(&fields, 8).filter(|v| *v > 0) { next.custom_mbps = bitrate as u32; }
|
if let Some(bitrate) = number(&fields, 8).filter(|v| *v > 0) { next.custom_bps = custom_bitrate_bps(bitrate); }
|
||||||
// Field 7 chorma_format (sic): 3 = 4:4:4 when 真彩 is on, 1 = 4:2:0. The Sync reports what is encoded.
|
// Field 7 chorma_format (sic): 3 = 4:4:4 when 真彩 is on, 1 = 4:2:0. The Sync reports what is encoded.
|
||||||
match number(&fields, 7) {
|
match number(&fields, 7) {
|
||||||
Some(CHROMA_444) if full_chroma => next.chroma = CHROMA_444,
|
Some(CHROMA_444) if full_chroma => next.chroma = CHROMA_444,
|
||||||
@@ -237,7 +245,7 @@ pub fn sync_payload(settings: &VideoSettings, native: (u32, u32)) -> Vec<u8> {
|
|||||||
put_varint(1, u64::from(settings.fps), &mut out);
|
put_varint(1, u64::from(settings.fps), &mut out);
|
||||||
put_varint(2, settings.quality, &mut out);
|
put_varint(2, settings.quality, &mut out);
|
||||||
put_varint(3, settings.chroma, &mut out);
|
put_varint(3, settings.chroma, &mut out);
|
||||||
if settings.custom_mbps > 0 { put_varint(4, u64::from(settings.custom_mbps), &mut out); }
|
if settings.custom_bps > 0 { put_varint(4, u64::from(settings.custom_bps), &mut out); }
|
||||||
put_varint(5, u64::from(size.0), &mut out);
|
put_varint(5, u64::from(size.0), &mut out);
|
||||||
put_varint(6, u64::from(size.1), &mut out);
|
put_varint(6, u64::from(size.1), &mut out);
|
||||||
put_varint(9, u64::from(size.0), &mut out);
|
put_varint(9, u64::from(size.0), &mut out);
|
||||||
@@ -284,7 +292,7 @@ mod tests {
|
|||||||
put_varint(18, 30, &mut body);
|
put_varint(18, 30, &mut body);
|
||||||
let request = rpc(77, 2, &body);
|
let request = rpc(77, 2, &body);
|
||||||
let response = handle_rpc(&decode_wire(&request).unwrap(), &tx, (1920, 1080)).unwrap();
|
let response = handle_rpc(&decode_wire(&request).unwrap(), &tx, (1920, 1080)).unwrap();
|
||||||
assert_eq!(*rx.borrow(), VideoSettings { source_id:0,source_generation:0, codec: VideoCodec::H264, fps: 30, quality: QUALITY_GENERAL, custom_mbps: 0, output: None, chroma: CHROMA_420 });
|
assert_eq!(*rx.borrow(), VideoSettings { source_id:0,source_generation:0, codec: VideoCodec::H264, fps: 30, quality: QUALITY_GENERAL, custom_bps: 0, output: None, chroma: CHROMA_420 });
|
||||||
assert_eq!(rx.borrow().max_kbps(), Some(2_000));
|
assert_eq!(rx.borrow().max_kbps(), Some(2_000));
|
||||||
let fields = decode_wire(&response).unwrap();
|
let fields = decode_wire(&response).unwrap();
|
||||||
assert_eq!(message(&fields, 1), Some(&[8u8, 77][..]));
|
assert_eq!(message(&fields, 1), Some(&[8u8, 77][..]));
|
||||||
@@ -468,8 +476,40 @@ mod tests {
|
|||||||
#[test]
|
#[test]
|
||||||
fn auto_quality_keeps_constant_quality_encoding() {
|
fn auto_quality_keeps_constant_quality_encoding() {
|
||||||
assert_eq!(VideoSettings::default().max_kbps(), None);
|
assert_eq!(VideoSettings::default().max_kbps(), None);
|
||||||
assert_eq!(VideoSettings { quality: QUALITY_CUSTOM, custom_mbps: 0, ..Default::default() }.max_kbps(), None);
|
assert_eq!(VideoSettings { quality: QUALITY_CUSTOM, custom_bps: 0, ..Default::default() }.max_kbps(), None);
|
||||||
assert_eq!(VideoSettings { quality: QUALITY_CUSTOM, custom_mbps: 12, ..Default::default() }.max_kbps(), Some(12_000));
|
assert_eq!(VideoSettings { quality: QUALITY_CUSTOM, custom_bps: 12_000_000, ..Default::default() }.max_kbps(), Some(12_000));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn mobile_custom_bitrate_is_bits_per_second_in_request_and_sync() {
|
||||||
|
// Mobile viewer sends field 8 = 1_000_000 for 1 Mbps (observed live, 2026-10-20).
|
||||||
|
for (bps, kbps) in [(1_000_000, 1_000), (30_000_000, 30_000), (500_000, 500), (100_000_000, 100_000), (200_000_000, 100_000)] {
|
||||||
|
let (tx, rx) = watch::channel(VideoSettings::default());
|
||||||
|
let mut body = Vec::new();
|
||||||
|
put_varint(2, QUALITY_CUSTOM, &mut body);
|
||||||
|
put_varint(8, bps, &mut body);
|
||||||
|
handle_rpc(&decode_wire(&rpc(7, 2, &body)).unwrap(), &tx, (1920, 1080)).unwrap();
|
||||||
|
assert_eq!(rx.borrow().max_kbps(), Some(kbps));
|
||||||
|
let sync = sync_payload(&rx.borrow(), (1920, 1080));
|
||||||
|
assert_eq!(number(&decode_wire(&sync).unwrap(), 4), Some(bps));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn small_custom_bitrates_are_read_as_larger_units() {
|
||||||
|
assert_eq!(custom_bitrate_bps(20), 20_000_000);
|
||||||
|
assert_eq!(custom_bitrate_bps(8_000), 8_000_000);
|
||||||
|
assert_eq!(custom_bitrate_bps(1_000_000), 1_000_000);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn oversized_custom_bitrate_does_not_wrap_before_encoder_limit() {
|
||||||
|
let (tx, rx) = watch::channel(VideoSettings::default());
|
||||||
|
let mut body = Vec::new();
|
||||||
|
put_varint(2, QUALITY_CUSTOM, &mut body);
|
||||||
|
put_varint(8, u64::from(u32::MAX) + 1, &mut body);
|
||||||
|
handle_rpc(&decode_wire(&rpc(8, 2, &body)).unwrap(), &tx, (1920, 1080)).unwrap();
|
||||||
|
assert_eq!(rx.borrow().max_kbps(), Some(100_000));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|||||||
@@ -70,6 +70,16 @@ impl DamageCapture {
|
|||||||
|
|
||||||
pub fn size(&self) -> (u32, u32) { (self.width as u32, self.height as u32) }
|
pub fn size(&self) -> (u32, u32) { (self.width as u32, self.height as u32) }
|
||||||
|
|
||||||
|
pub fn shm_raw_ptr(&self) -> *mut u8 { self.shm_ptr }
|
||||||
|
|
||||||
|
pub fn shm_size(&self) -> usize { self.len }
|
||||||
|
|
||||||
|
pub fn refresh(&mut self) -> Result<(), String> {
|
||||||
|
self.conn.shm_get_image(self.root, 0, 0, self.width, self.height, !0, Z_PIXMAP, self.seg, 0)
|
||||||
|
.map_err(text)?.reply().map_err(text)?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
/// Waits up to `timeout` for the screen to change. Returns `true` on change, `false` on timeout.
|
/// Waits up to `timeout` for the screen to change. Returns `true` on change, `false` on timeout.
|
||||||
pub fn wait(&mut self, timeout: Duration) -> Result<bool, String> {
|
pub fn wait(&mut self, timeout: Duration) -> Result<bool, String> {
|
||||||
let deadline = Instant::now() + timeout;
|
let deadline = Instant::now() + timeout;
|
||||||
|
|||||||
@@ -38,9 +38,19 @@ async fn command_output(program: &str, args: &[&str]) -> Option<String> {
|
|||||||
Some(String::from_utf8_lossy(&output.stdout).trim().to_owned())
|
Some(String::from_utf8_lossy(&output.stdout).trim().to_owned())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Whether the report must say that this session has no screen to capture: neither DISPLAY nor
|
||||||
|
/// WAYLAND_DISPLAY is set, and the backend is the X11 one that needs a display to open.
|
||||||
|
fn missing_display(backend: crate::desktop_backend::DesktopBackend, headless: bool,
|
||||||
|
display: Option<&std::ffi::OsStr>, wayland: Option<&std::ffi::OsStr>) -> bool {
|
||||||
|
!headless && backend == crate::desktop_backend::DesktopBackend::X11
|
||||||
|
&& display.is_none() && wayland.is_none()
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn run() -> Result<(), String> {
|
pub async fn run() -> Result<(), String> {
|
||||||
use crate::desktop_backend as backend;
|
use crate::desktop_backend as backend;
|
||||||
use crate::engine_plugin::{load, Engine};
|
use crate::engine_plugin::{load, Engine};
|
||||||
|
// Info logs (e.g. plugin paths under the home directory) would bypass the redaction below.
|
||||||
|
log::set_max_level(log::LevelFilter::Warn);
|
||||||
println!("uu-remote-linux doctor (safe to paste: no ids, tokens, addresses or file contents)");
|
println!("uu-remote-linux doctor (safe to paste: no ids, tokens, addresses or file contents)");
|
||||||
line("version", format!("v{} {}", env!("CARGO_PKG_VERSION"), std::env::consts::ARCH));
|
line("version", format!("v{} {}", env!("CARGO_PKG_VERSION"), std::env::consts::ARCH));
|
||||||
line("glibc", glibc());
|
line("glibc", glibc());
|
||||||
@@ -64,6 +74,13 @@ pub async fn run() -> Result<(), String> {
|
|||||||
if selected.as_ref().is_ok_and(|b| *b == backend::DesktopBackend::X11) && backend::wayland_session_running() && !backend::headless() {
|
if selected.as_ref().is_ok_and(|b| *b == backend::DesktopBackend::X11) && backend::wayland_session_running() && !backend::headless() {
|
||||||
println!(" ! X11 backend inside a Wayland session: the picture will be black");
|
println!(" ! X11 backend inside a Wayland session: the picture will be black");
|
||||||
}
|
}
|
||||||
|
// A session without any display cannot capture a screen; say so instead of naming a backend.
|
||||||
|
if let Ok(selected) = &selected {
|
||||||
|
if missing_display(*selected, backend::headless(), std::env::var_os("DISPLAY").as_deref(), std::env::var_os("WAYLAND_DISPLAY").as_deref()) {
|
||||||
|
println!(" ! DISPLAY and WAYLAND_DISPLAY are unset: the X11 engine will only try :0 and :1; without an X server there, no screen can be captured");
|
||||||
|
println!(" terminal, file transfer and port mapping still work; UU_DESKTOP_BACKEND=none marks the host as headless");
|
||||||
|
}
|
||||||
|
}
|
||||||
if cfg!(feature = "engine-plugins") {
|
if cfg!(feature = "engine-plugins") {
|
||||||
for engine in [Engine::Wayland, Engine::Portal] {
|
for engine in [Engine::Wayland, Engine::Portal] {
|
||||||
line(engine.file(), match load(engine) { Ok(()) => "loaded".to_owned(), Err(e) => e });
|
line(engine.file(), match load(engine) { Ok(()) => "loaded".to_owned(), Err(e) => e });
|
||||||
@@ -131,4 +148,18 @@ mod tests {
|
|||||||
if home.len() > 1 { assert_eq!(super::redact(&format!("{home}/.config/x")), "~/.config/x"); }
|
if home.len() > 1 { assert_eq!(super::redact(&format!("{home}/.config/x")), "~/.config/x"); }
|
||||||
assert_eq!(super::env_state("UU_DOCTOR_TEST_SURELY_UNSET"), "unset");
|
assert_eq!(super::env_state("UU_DOCTOR_TEST_SURELY_UNSET"), "unset");
|
||||||
}
|
}
|
||||||
|
#[test]
|
||||||
|
fn a_session_without_any_display_is_reported() {
|
||||||
|
use crate::desktop_backend::DesktopBackend;
|
||||||
|
let display = std::ffi::OsStr::new(":0");
|
||||||
|
let wayland = std::ffi::OsStr::new("wayland-1");
|
||||||
|
// No DISPLAY and no WAYLAND_DISPLAY: nothing can be captured.
|
||||||
|
assert!(super::missing_display(DesktopBackend::X11, false, None, None));
|
||||||
|
// One of them present: the backend has a screen to open.
|
||||||
|
assert!(!super::missing_display(DesktopBackend::X11, false, Some(display), None));
|
||||||
|
assert!(!super::missing_display(DesktopBackend::X11, false, None, Some(wayland)));
|
||||||
|
// Another backend, or a headless host: not this warning.
|
||||||
|
assert!(!super::missing_display(DesktopBackend::Wayland, false, None, None));
|
||||||
|
assert!(!super::missing_display(DesktopBackend::X11, true, None, None));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+671
-397
File diff suppressed because it is too large.
Load diff
+4
-1
@@ -328,8 +328,11 @@ impl InputInjector {
|
|||||||
// uinput ABS axes span the compositor's whole desktop. A captured output
|
// uinput ABS axes span the compositor's whole desktop. A captured output
|
||||||
// uses its own pixel space; bind absolute motion to that Wayland output,
|
// uses its own pixel space; bind absolute motion to that Wayland output,
|
||||||
// including when uinput remains in use for keyboard/buttons/relative input.
|
// including when uinput remains in use for keyboard/buttons/relative input.
|
||||||
|
// Only a compositor without wlr-virtual-pointer (-2) falls through to the uinput
|
||||||
|
// absolute pointer; an out-of-range point must not land on another output.
|
||||||
if !relative && self.backend==crate::desktop_backend::DesktopBackend::Wayland {
|
if !relative && self.backend==crate::desktop_backend::DesktopBackend::Wayland {
|
||||||
return crate::wayland::move_pointer(x,y,false);
|
let result=crate::wayland::move_pointer(x,y,false);
|
||||||
|
if result!=-2 { return result; }
|
||||||
}
|
}
|
||||||
if let Some(uinput)=&self.uinput {
|
if let Some(uinput)=&self.uinput {
|
||||||
if relative { return Self::uinput_result(uinput.move_relative(x,y)); }
|
if relative { return Self::uinput_result(uinput.move_relative(x,y)); }
|
||||||
|
|||||||
+65
-33
@@ -268,13 +268,22 @@ pub async fn prepare_device() -> Result<(Value, Credentials), String> {
|
|||||||
pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
|
pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
|
||||||
let (mut cfg, creds) = prepare_device().await?;
|
let (mut cfg, creds) = prepare_device().await?;
|
||||||
let client = UUAuthClient::new(creds.clone());
|
let client = UUAuthClient::new(creds.clone());
|
||||||
|
// Mirrors the official Mac client (LoginViewController / LoginManager, UURemote 4.42): gen/login has
|
||||||
|
// no body; the status long poll sends gen's `status_query_ticket` under `token` with the last
|
||||||
|
// status, re-asks as soon as an answer arrives (60 s request timeout), regenerates on status 3
|
||||||
|
// at once and on status 0 after 0.35 s, logs in on 4, and on any error (e.g. HTTP 400 code 1190)
|
||||||
|
// stops until the user asks for a new QR. Sending gen's older `token` field made the cloud reject
|
||||||
|
// every QR within seconds (#68).
|
||||||
|
let timeout = Duration::from_secs(60);
|
||||||
loop {
|
loop {
|
||||||
let (status, resp) = client.post_json("/api/v1/qrcode/gen/login", &json!({})).await?;
|
let (status, resp) = client.post_with_timeout("/api/v1/qrcode/gen/login", None, timeout).await?;
|
||||||
let d = data("qrcode gen", status, &resp)?;
|
let d = match data("qrcode gen", status, &resp) {
|
||||||
|
Ok(d) => d.clone(),
|
||||||
|
Err(e) => { println!("QR code could not be loaded ({e})"); wait_for_refresh(ui, "二维码加载失败").await; continue; }
|
||||||
|
};
|
||||||
let url = d.get("qrcode_jump_url").and_then(|v| v.as_str()).ok_or("qrcode gen returned no qrcode_jump_url")?.to_string();
|
let url = d.get("qrcode_jump_url").and_then(|v| v.as_str()).ok_or("qrcode gen returned no qrcode_jump_url")?.to_string();
|
||||||
let ticket = d.get("token").or_else(|| d.get("status_query_ticket")).and_then(|v| v.as_str())
|
let ticket = qr_ticket(&d).ok_or("qrcode gen returned no status ticket")?.to_string();
|
||||||
.ok_or("qrcode gen returned no token")?.to_string();
|
ui.offer_refresh(false);
|
||||||
if ui.shown() {
|
if ui.shown() {
|
||||||
let modules = qrcode::QrCode::new(url.as_bytes()).map_err(|e| e.to_string())?.width() + 2;
|
let modules = qrcode::QrCode::new(url.as_bytes()).map_err(|e| e.to_string())?.width() + 2;
|
||||||
let (rgba, edge) = qr_rgba(&url, (224 / modules).max(2), 1)?;
|
let (rgba, edge) = qr_rgba(&url, (224 / modules).max(2), 1)?;
|
||||||
@@ -289,40 +298,31 @@ pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
|
|||||||
file.write_all(&crate::cursor::encode_png(edge as u32,edge as u32,&rgba)).map_err(|e|e.to_string())?;
|
file.write_all(&crate::cursor::encode_png(edge as u32,edge as u32,&rgba)).map_err(|e|e.to_string())?;
|
||||||
}
|
}
|
||||||
if !ui.quiet() { println!("\nScan with the UU Remote mobile app (网易UU远程 App 扫码登录):\n{}", render_qr(&url)?); }
|
if !ui.quiet() { println!("\nScan with the UU Remote mobile app (网易UU远程 App 扫码登录):\n{}", render_qr(&url)?); }
|
||||||
// Status is a long poll: send the state already shown (server enum 1..4; observed:
|
|
||||||
// 1 waiting, 2 scanned, 4 after the phone confirmed); the server answers when it changes.
|
|
||||||
let mut login_status = 1i64;
|
let mut login_status = 1i64;
|
||||||
let mut expired = false;
|
let failure = loop {
|
||||||
for _ in 0..150 {
|
|
||||||
let query = json!({"token": ticket, "qrcode_jump_url": url, "login_status": login_status});
|
let query = json!({"token": ticket, "qrcode_jump_url": url, "login_status": login_status});
|
||||||
let (status, resp) = match client.post_json("/api/v1/qrcode/login/status", &query).await {
|
let (status, resp) = match client.post_with_timeout("/api/v1/qrcode/login/status", Some(&query), timeout).await {
|
||||||
Ok(r) => r,
|
Ok(r) => r,
|
||||||
Err(_) => continue, // long-poll timeout: ask again
|
Err(_) => break "网络超时,二维码已停止刷新",
|
||||||
};
|
};
|
||||||
// Code 1190 (HTTP 400, "二维码已失效"): the QR expired; generate a new one.
|
let code = resp.get("code").and_then(|c| c.as_i64());
|
||||||
if resp.get("code").and_then(|c| c.as_i64()) == Some(QR_EXPIRED) {
|
if code == Some(QR_EXPIRED) { break "二维码已失效"; }
|
||||||
ui.status("二维码已过期,正在刷新…", Tone::Info);
|
let Ok(d) = data("qrcode status", status, &resp) else { break "二维码状态查询失败"; };
|
||||||
expired = true; break;
|
let st = d.get("status").and_then(|v| v.as_i64()).unwrap_or(login_status);
|
||||||
}
|
|
||||||
let st = data("qrcode status", status, &resp)?.get("status").and_then(|v| v.as_i64()).unwrap_or(login_status);
|
|
||||||
if st == login_status { continue; }
|
|
||||||
login_status = st;
|
|
||||||
match st {
|
match st {
|
||||||
2 => {
|
1 => {}
|
||||||
|
2 => if login_status != 2 {
|
||||||
println!("已扫码,请在手机上确认 (scanned, confirm on the phone)");
|
println!("已扫码,请在手机上确认 (scanned, confirm on the phone)");
|
||||||
ui.status("已扫码,请在手机上确认登录", Tone::Ok);
|
ui.status("已扫码,请在手机上确认登录", Tone::Ok);
|
||||||
}
|
},
|
||||||
3 | 4 => {
|
3 => { println!("QR code expired; generating a new one"); break ""; }
|
||||||
// A final state: confirmed logs in; cancelled/expired is refused and a new QR follows.
|
0 => { tokio::time::sleep(Duration::from_millis(350)).await; break ""; }
|
||||||
|
4 => {
|
||||||
let body = json!({"token": ticket, "qrcode_jump_url": url});
|
let body = json!({"token": ticket, "qrcode_jump_url": url});
|
||||||
let (status, resp) = client.post_json("/api/v1/login/by_qrcode", &body).await?;
|
let (status, resp) = client.post_with_timeout("/api/v1/login/by_qrcode", Some(&body), timeout).await?;
|
||||||
let d = match data("qrcode login", status, &resp) {
|
let d = match data("qrcode login", status, &resp) {
|
||||||
Ok(d) => d,
|
Ok(d) => d,
|
||||||
Err(e) => {
|
Err(e) => { println!("QR login not granted ({e})"); break "登录失败"; }
|
||||||
println!("QR status {st}: login not granted ({e})");
|
|
||||||
ui.status("手机端未确认登录,正在刷新二维码…", Tone::Error);
|
|
||||||
expired = true; break;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
let token = d.get("token").and_then(|v| v.as_str()).ok_or("login returned no token")?;
|
let token = d.get("token").and_then(|v| v.as_str()).ok_or("login returned no token")?;
|
||||||
let user = d.get("user_id").and_then(|v| v.as_str()).ok_or("login returned no user_id")?;
|
let user = d.get("user_id").and_then(|v| v.as_str()).ok_or("login returned no user_id")?;
|
||||||
@@ -339,17 +339,49 @@ pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
|
|||||||
println!("Logged in as {} ({}); saved to {}", nickname, user, path.display());
|
println!("Logged in as {} ({}); saved to {}", nickname, user, path.display());
|
||||||
return Ok(if nickname.is_empty() { user.to_string() } else { nickname.to_string() });
|
return Ok(if nickname.is_empty() { user.to_string() } else { nickname.to_string() });
|
||||||
}
|
}
|
||||||
_ => { println!("QR status: {st}"); ui.status("二维码已失效,正在刷新…", Tone::Error); expired = true; break; }
|
other => { println!("QR status: {other}"); break "二维码已失效"; }
|
||||||
}
|
}
|
||||||
}
|
login_status = st;
|
||||||
println!("{}", if expired { "QR code expired; generating a new one" } else { "QR code timed out; generating a new one" });
|
};
|
||||||
tokio::time::sleep(Duration::from_secs(1)).await; // never spin if the server keeps refusing
|
if !failure.is_empty() { wait_for_refresh(ui, failure).await; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// gen/login's status ticket: `status_query_ticket` (current cloud and official clients), else the
|
||||||
|
/// older `token` field for servers that do not send it.
|
||||||
|
fn qr_ticket(gen: &Value) -> Option<&str> {
|
||||||
|
gen.get("status_query_ticket").or_else(|| gen.get("token")).and_then(|v| v.as_str()).filter(|t| !t.is_empty())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Stop like the official client and wait for the user: the 刷新二维码 button, Enter in a terminal,
|
||||||
|
/// or (no window and no terminal, e.g. a service) one minute.
|
||||||
|
async fn wait_for_refresh(ui: &LoginUi, reason: &str) {
|
||||||
|
use std::io::IsTerminal;
|
||||||
|
ui.status(&format!("{reason},请点击「刷新二维码」"), Tone::Error);
|
||||||
|
ui.offer_refresh(true);
|
||||||
|
let terminal = !ui.quiet() && std::io::stdin().is_terminal();
|
||||||
|
if terminal { println!("{reason}. Press Enter to show a new QR code (按回车刷新二维码)"); }
|
||||||
|
else { println!("{reason}; waiting for 刷新二维码{}", if ui.shown() { "" } else { " (a new QR code follows in 60 s)" }); }
|
||||||
|
let mut line = terminal.then(|| tokio::task::spawn_blocking(|| { let mut s = String::new(); let _ = std::io::stdin().read_line(&mut s); }));
|
||||||
|
let started = std::time::Instant::now();
|
||||||
|
loop {
|
||||||
|
if ui.take_refresh() || (ui.shown() && ui.closed()) { break; }
|
||||||
|
if let Some(handle) = line.as_mut() { if handle.is_finished() { break; } }
|
||||||
|
if !ui.shown() && !terminal && started.elapsed() >= Duration::from_secs(60) { break; }
|
||||||
|
tokio::time::sleep(Duration::from_millis(200)).await;
|
||||||
|
}
|
||||||
|
ui.offer_refresh(false);
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
#[test]
|
||||||
|
fn status_ticket_prefers_status_query_ticket() {
|
||||||
|
assert_eq!(qr_ticket(&json!({"token": "old", "status_query_ticket": "new"})), Some("new"));
|
||||||
|
assert_eq!(qr_ticket(&json!({"token": "old"})), Some("old"));
|
||||||
|
assert_eq!(qr_ticket(&json!({"status_query_ticket": ""})), None);
|
||||||
|
}
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn service_waits_until_a_new_token_is_saved() {
|
async fn service_waits_until_a_new_token_is_saved() {
|
||||||
let dir = std::env::temp_dir().join(format!("uu-login-wait-{}", std::process::id()));
|
let dir = std::env::temp_dir().join(format!("uu-login-wait-{}", std::process::id()));
|
||||||
|
|||||||
@@ -10,6 +10,8 @@ extern "C" {
|
|||||||
fn uu_login_ui_set_done(text: *const libc::c_char);
|
fn uu_login_ui_set_done(text: *const libc::c_char);
|
||||||
fn uu_login_ui_closed() -> libc::c_int;
|
fn uu_login_ui_closed() -> libc::c_int;
|
||||||
fn uu_login_ui_close();
|
fn uu_login_ui_close();
|
||||||
|
fn uu_login_ui_offer_refresh(visible: libc::c_int);
|
||||||
|
fn uu_login_ui_take_refresh() -> libc::c_int;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy)]
|
#[derive(Clone, Copy)]
|
||||||
@@ -56,6 +58,19 @@ impl LoginUi {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[allow(unused_variables)]
|
#[allow(unused_variables)]
|
||||||
|
/// Show or hide the 刷新二维码 button (a failed QR waits for the user, like the official client).
|
||||||
|
pub fn offer_refresh(&self, visible: bool) {
|
||||||
|
#[cfg(uu_gtk)]
|
||||||
|
if self.shown { unsafe { uu_login_ui_offer_refresh(libc::c_int::from(visible)) } }
|
||||||
|
#[cfg(not(uu_gtk))]
|
||||||
|
let _ = visible;
|
||||||
|
}
|
||||||
|
/// The user clicked 刷新二维码 since the last call.
|
||||||
|
pub fn take_refresh(&self) -> bool {
|
||||||
|
#[cfg(uu_gtk)]
|
||||||
|
if self.shown { return unsafe { uu_login_ui_take_refresh() } != 0; }
|
||||||
|
false
|
||||||
|
}
|
||||||
pub fn status(&self, text: &str, tone: Tone) {
|
pub fn status(&self, text: &str, tone: Tone) {
|
||||||
#[cfg(uu_gtk)]
|
#[cfg(uu_gtk)]
|
||||||
if self.shown { let t = cstr(text); unsafe { uu_login_ui_set_status(t.as_ptr(), tone as libc::c_int) } }
|
if self.shown { let t = cstr(text); unsafe { uu_login_ui_set_status(t.as_ptr(), tone as libc::c_int) } }
|
||||||
|
|||||||
+55
-2
@@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
mod engine_plugin;
|
mod engine_plugin;
|
||||||
mod doctor;
|
mod doctor;
|
||||||
|
mod wol;
|
||||||
mod desktop_backend;
|
mod desktop_backend;
|
||||||
mod desktop_session;
|
mod desktop_session;
|
||||||
mod desktop_power;
|
mod desktop_power;
|
||||||
@@ -142,6 +143,35 @@ fn write_host_pid() {
|
|||||||
let _ = write!(f, "{}", std::process::id());
|
let _ = write!(f, "{}", std::process::id());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/// Why `unit` is not (going to be) running, from `systemctl --user show`; None while it is active or starting.
|
||||||
|
fn unit_not_running(unit: &str, settled: bool) -> Option<String> {
|
||||||
|
let output = std::process::Command::new("systemctl").args(["--user", "show", unit, "-p", "ActiveState,SubState,ConditionResult"]).output().ok()?;
|
||||||
|
let text = String::from_utf8_lossy(&output.stdout);
|
||||||
|
let value = |key: &str| text.lines().find_map(|l| l.strip_prefix(key).and_then(|v| v.strip_prefix('='))).unwrap_or("").to_owned();
|
||||||
|
unit_state_problem(unit, &value("ActiveState"), &value("SubState"), &value("ConditionResult"), settled)
|
||||||
|
}
|
||||||
|
fn unit_state_problem(unit: &str, active: &str, sub: &str, condition: &str, settled: bool) -> Option<String> {
|
||||||
|
let hint = format!("see `systemctl --user status {unit}` and `journalctl --user -u {unit}`");
|
||||||
|
if condition == "no" { return Some(format!("{unit} was skipped: a Condition in the unit is not met (e.g. ConditionEnvironment outside the graphical session); {hint}")); }
|
||||||
|
if active == "failed" { return Some(format!("{unit} failed to start; {hint}")); }
|
||||||
|
if sub == "auto-restart" { return Some(format!("{unit} keeps exiting and being restarted; {hint}")); }
|
||||||
|
if settled && active == "inactive" { return Some(format!("{unit} is not running; {hint}")); }
|
||||||
|
None
|
||||||
|
}
|
||||||
|
#[cfg(test)]
|
||||||
|
mod show_unit_tests {
|
||||||
|
#[test]
|
||||||
|
fn skipped_crashing_and_failed_units_are_reported() {
|
||||||
|
let p = |a, s, c, settled| super::unit_state_problem("u.service", a, s, c, settled);
|
||||||
|
assert!(p("inactive", "dead", "no", false).unwrap().contains("skipped"));
|
||||||
|
assert!(p("activating", "auto-restart", "yes", false).unwrap().contains("restarted"));
|
||||||
|
assert!(p("failed", "failed", "yes", false).unwrap().contains("failed"));
|
||||||
|
assert!(p("inactive", "dead", "yes", false).is_none());
|
||||||
|
assert!(p("inactive", "dead", "yes", true).unwrap().contains("not running"));
|
||||||
|
assert!(p("active", "running", "yes", true).is_none());
|
||||||
|
assert!(p("activating", "start", "yes", true).is_none());
|
||||||
|
}
|
||||||
|
}
|
||||||
/// `uuremote-server show` (desktop launcher): open the running host's window, or start the host in the
|
/// `uuremote-server show` (desktop launcher): open the running host's window, or start the host in the
|
||||||
/// foreground with its window when none runs (e.g. no systemd unit installed yet).
|
/// foreground with its window when none runs (e.g. no systemd unit installed yet).
|
||||||
fn show_running_host() -> Result<(), Box<dyn std::error::Error>> {
|
fn show_running_host() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
@@ -161,7 +191,10 @@ fn show_running_host() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
.stdout(std::process::Stdio::null()).stderr(std::process::Stdio::null()).status().is_ok_and(|s| s.success());
|
.stdout(std::process::Stdio::null()).stderr(std::process::Stdio::null()).status().is_ok_and(|s| s.success());
|
||||||
if installed && std::process::Command::new("systemctl").args(["--user", "start", &unit]).status().is_ok_and(|s| s.success()) {
|
if installed && std::process::Command::new("systemctl").args(["--user", "start", &unit]).status().is_ok_and(|s| s.success()) {
|
||||||
let before = std::fs::metadata(host_pid_path()).and_then(|m| m.modified()).ok();
|
let before = std::fs::metadata(host_pid_path()).and_then(|m| m.modified()).ok();
|
||||||
for _ in 0..60 {
|
for attempt in 0..60 {
|
||||||
|
// `systemctl start` also returns 0 when the unit is skipped by a Condition or keeps
|
||||||
|
// crashing under Restart=; report that instead of waiting 30 s for a pid (#62).
|
||||||
|
if let Some(reason) = unit_not_running(&unit, attempt >= 2) { return Err(reason.into()); }
|
||||||
std::thread::sleep(std::time::Duration::from_millis(500));
|
std::thread::sleep(std::time::Duration::from_millis(500));
|
||||||
let fresh = std::fs::metadata(host_pid_path()).and_then(|m| m.modified()).ok().is_some_and(|t| Some(t) != before);
|
let fresh = std::fs::metadata(host_pid_path()).and_then(|m| m.modified()).ok().is_some_and(|t| Some(t) != before);
|
||||||
let pid = std::fs::read_to_string(host_pid_path()).ok().and_then(|s| s.trim().parse::<i32>().ok());
|
let pid = std::fs::read_to_string(host_pid_path()).ok().and_then(|s| s.trim().parse::<i32>().ok());
|
||||||
@@ -170,7 +203,7 @@ fn show_running_host() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
if unsafe { libc::kill(pid, libc::SIGUSR1) } == 0 { return Ok(()); }
|
if unsafe { libc::kill(pid, libc::SIGUSR1) } == 0 { return Ok(()); }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return Err("the UU remote host service started but did not open its window".into());
|
return Err(format!("{unit} is running but did not open its window within 30 s; check `journalctl --user -u {unit}`").into());
|
||||||
}
|
}
|
||||||
use std::os::unix::process::CommandExt;
|
use std::os::unix::process::CommandExt;
|
||||||
Err(Box::new(std::process::Command::new("/proc/self/exe").env("UU_SHOW_WINDOW", "1").exec()))
|
Err(Box::new(std::process::Command::new("/proc/self/exe").env("UU_SHOW_WINDOW", "1").exec()))
|
||||||
@@ -649,6 +682,11 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
}
|
}
|
||||||
SignalingEvent::Connected => {
|
SignalingEvent::Connected => {
|
||||||
log::info!("Signaling handshake established.");
|
log::info!("Signaling handshake established.");
|
||||||
|
static WOL_REPORTED: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
|
||||||
|
if wol::enabled() && assist.as_ref().is_none_or(|s| s.is_account()) && !WOL_REPORTED.swap(true, std::sync::atomic::Ordering::AcqRel) {
|
||||||
|
let client = auth.clone();
|
||||||
|
tokio::spawn(async move { wol::report(&client).await; });
|
||||||
|
}
|
||||||
}
|
}
|
||||||
SignalingEvent::RoomInfoAck(_) => { log::info!("RoomInfo acknowledged by NetEase server"); }
|
SignalingEvent::RoomInfoAck(_) => { log::info!("RoomInfo acknowledged by NetEase server"); }
|
||||||
SignalingEvent::DeviceInfoChanged(val) => {
|
SignalingEvent::DeviceInfoChanged(val) => {
|
||||||
@@ -658,6 +696,21 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
log::debug!("Assist bmsg_push shape: type={:?} keys={:?} data_keys={:?}",
|
log::debug!("Assist bmsg_push shape: type={:?} keys={:?} data_keys={:?}",
|
||||||
val.get("type").and_then(serde_json::Value::as_str), keys(Some(&val)), keys(val.get("data")));
|
val.get("type").and_then(serde_json::Value::as_str), keys(Some(&val)), keys(val.get("data")));
|
||||||
}
|
}
|
||||||
|
if val.get("type").and_then(serde_json::Value::as_str) == Some("wake_on_lan") {
|
||||||
|
// Key names only: the target carries a MAC and LAN address.
|
||||||
|
let data = val.get("data").unwrap_or(&val);
|
||||||
|
log::info!("wake_on_lan push received: keys={:?} target_keys={:?} helper_enabled={}",
|
||||||
|
data.as_object().map(|o| o.keys().cloned().collect::<Vec<_>>()).unwrap_or_default(),
|
||||||
|
data.get("target_device").and_then(|t| t.as_object()).map(|o| o.keys().cloned().collect::<Vec<_>>()).unwrap_or_default(),
|
||||||
|
wol::enabled());
|
||||||
|
if wol::enabled() {
|
||||||
|
match wol::handle_push(data) {
|
||||||
|
Ok(sent) => log::info!("WOL helper: magic packet sent ({sent} datagrams)"),
|
||||||
|
Err(error) => log::warn!("WOL helper: {error}"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if val.get("type").and_then(serde_json::Value::as_str) == Some("get_control_mode") {
|
if val.get("type").and_then(serde_json::Value::as_str) == Some("get_control_mode") {
|
||||||
if let Some(s) = assist.as_mut() {
|
if let Some(s) = assist.as_mut() {
|
||||||
match s.control_mode(val.get("data").unwrap_or(&serde_json::Value::Null)).await {
|
match s.control_mode(val.get("data").unwrap_or(&serde_json::Value::Null)).await {
|
||||||
|
|||||||
+33
-13
@@ -198,11 +198,9 @@ impl Encoder {
|
|||||||
fn nvidia_present() -> bool {
|
fn nvidia_present() -> bool {
|
||||||
std::path::Path::new("/proc/driver/nvidia/version").exists() || std::path::Path::new("/dev/nvidia0").exists()
|
std::path::Path::new("/proc/driver/nvidia/version").exists() || std::path::Path::new("/dev/nvidia0").exists()
|
||||||
}
|
}
|
||||||
/// 真彩 (4:4:4) needs the FFmpeg process pipeline with NVENC or libx264 (h264_vaapi and the
|
/// 真彩 (4:4:4): NVENC (in-process or FFmpeg) and libx264; h264_vaapi is 4:2:0 only.
|
||||||
/// in-process encoder are 4:2:0 only).
|
/// A GPU without 4:4:4 NVENC falls back to libx264, which keeps 4:4:4.
|
||||||
pub fn full_chroma_available() -> bool {
|
pub fn full_chroma_available() -> bool {
|
||||||
#[cfg(feature = "inproc-av")]
|
|
||||||
if crate::inproc_encoder::selected() { return false; }
|
|
||||||
Encoder::requested() != Encoder::Vaapi
|
Encoder::requested() != Encoder::Vaapi
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -506,17 +504,33 @@ async fn read_encoder(
|
|||||||
) -> Result<(), String> {
|
) -> Result<(), String> {
|
||||||
// The sequence is shared so a CPU fallback or settings restart continues it (skip statistics stay correct).
|
// The sequence is shared so a CPU fallback or settings restart continues it (skip statistics stay correct).
|
||||||
let encoder = Encoder::requested();
|
let encoder = Encoder::requested();
|
||||||
if encoder == Encoder::Cpu { return read_encoder_with(size,display,portal,latest,Encoder::Cpu,sequence,settings,idr,budget).await; }
|
if encoder == Encoder::Cpu { return read_encoder_with(size,display,portal,latest,Encoder::Cpu,true,sequence,settings,idr,budget).await; }
|
||||||
match read_encoder_with(size,display.clone(),portal.clone(),latest.clone(),encoder,sequence.clone(),settings,idr.clone(),budget.clone()).await {
|
#[cfg_attr(not(feature = "inproc-av"), allow(unused_mut))]
|
||||||
|
let mut result = read_encoder_with(size,display.clone(),portal.clone(),latest.clone(),encoder,true,sequence.clone(),settings,idr.clone(),budget.clone()).await;
|
||||||
|
// A failed native NVENC session (old driver, unsupported mode) still leaves FFmpeg's NVENC process pipeline.
|
||||||
|
#[cfg(feature = "inproc-av")]
|
||||||
|
if let Err(error) = &result {
|
||||||
|
if !latest.is_closed() && native_inproc(&display, portal.is_some(), encoder) {
|
||||||
|
log::warn!("In-process {} stream unavailable; switching to the FFmpeg process pipeline: {}",encoder.name_for(settings.codec),error);
|
||||||
|
result = read_encoder_with(size,display.clone(),portal.clone(),latest.clone(),encoder,false,sequence.clone(),settings,idr.clone(),budget.clone()).await;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
match result {
|
||||||
Ok(())=>Ok(()),
|
Ok(())=>Ok(()),
|
||||||
Err(error) if !latest.is_closed()=>{
|
Err(error) if !latest.is_closed()=>{
|
||||||
log::warn!("{} stream unavailable; switching scoped encoder to CPU: {}",encoder.name_for(settings.codec),error);
|
log::warn!("{} stream unavailable; switching scoped encoder to CPU: {}",encoder.name_for(settings.codec),error);
|
||||||
read_encoder_with(size,display,portal,latest,Encoder::Cpu,sequence,settings,idr,budget).await
|
read_encoder_with(size,display,portal,latest,Encoder::Cpu,true,sequence,settings,idr,budget).await
|
||||||
},
|
},
|
||||||
Err(error)=>Err(error),
|
Err(error)=>Err(error),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The native in-process NVENC path serves X11 only (not Wayland/KMS capture or a portal session).
|
||||||
|
#[cfg(feature = "inproc-av")]
|
||||||
|
fn native_inproc(display: &str, portal: bool, encoder: Encoder) -> bool {
|
||||||
|
!display.starts_with("wayland:") && !display.starts_with("kms:") && !portal && crate::inproc_encoder::selected(encoder)
|
||||||
|
}
|
||||||
|
|
||||||
/// Capture and encode inside this process; each packet is one access unit.
|
/// Capture and encode inside this process; each packet is one access unit.
|
||||||
#[cfg(feature = "inproc-av")]
|
#[cfg(feature = "inproc-av")]
|
||||||
async fn read_inprocess(
|
async fn read_inprocess(
|
||||||
@@ -528,9 +542,11 @@ async fn read_inprocess(
|
|||||||
let stop = Arc::new(AtomicBool::new(false));
|
let stop = Arc::new(AtomicBool::new(false));
|
||||||
// If this future is dropped (reader task aborted), the blocking encoder stops at its next packet.
|
// If this future is dropped (reader task aborted), the blocking encoder stops at its next packet.
|
||||||
let _stop_on_drop = StopOnDrop(stop.clone());
|
let _stop_on_drop = StopOnDrop(stop.clone());
|
||||||
|
// A restart aborts the previous reader without waiting for its blocking encoder; wait for it here.
|
||||||
|
let slot = crate::inproc_encoder::stream_slot(&idr).await;
|
||||||
let job = tokio::task::spawn_blocking({
|
let job = tokio::task::spawn_blocking({
|
||||||
let stop = stop.clone();
|
let stop = stop.clone();
|
||||||
move || crate::inproc_encoder::run(config, units_tx, stop, idr, budget)
|
move || { let _slot = slot; crate::inproc_encoder::run(config, units_tx, stop, idr, budget) }
|
||||||
});
|
});
|
||||||
let mut gate = DependencyGate::default();
|
let mut gate = DependencyGate::default();
|
||||||
while let Some(unit) = units.recv().await {
|
while let Some(unit) = units.recv().await {
|
||||||
@@ -579,7 +595,8 @@ fn rate_args(settings: &VideoSettings, encoder: Encoder) -> (String, String) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async fn read_encoder_with(
|
async fn read_encoder_with(
|
||||||
size: (u32,u32),display:String,portal:Option<Arc<crate::portal::PortalSession>>,latest:mpsc::Sender<Arc<CompleteFrame>>,encoder:Encoder,sequence:Arc<std::sync::atomic::AtomicU64>,
|
size: (u32,u32),display:String,portal:Option<Arc<crate::portal::PortalSession>>,latest:mpsc::Sender<Arc<CompleteFrame>>,encoder:Encoder,
|
||||||
|
#[cfg_attr(not(feature = "inproc-av"), allow(unused_variables))] allow_inproc: bool,sequence:Arc<std::sync::atomic::AtomicU64>,
|
||||||
settings: VideoSettings, #[cfg_attr(not(feature = "inproc-av"), allow(unused_variables))] idr: Arc<AtomicBool>, budget: Arc<Semaphore>,
|
settings: VideoSettings, #[cfg_attr(not(feature = "inproc-av"), allow(unused_variables))] idr: Arc<AtomicBool>, budget: Arc<Semaphore>,
|
||||||
)->Result<(),String>{
|
)->Result<(),String>{
|
||||||
let selected_output=if display.starts_with("wayland:") {crate::wayland::source(settings.source_id)} else {None};
|
let selected_output=if display.starts_with("wayland:") {crate::wayland::source(settings.source_id)} else {None};
|
||||||
@@ -593,14 +610,14 @@ async fn read_encoder_with(
|
|||||||
Some(Arc::new(capture))
|
Some(Arc::new(capture))
|
||||||
} else { None };
|
} else { None };
|
||||||
#[cfg(feature = "inproc-av")]
|
#[cfg(feature = "inproc-av")]
|
||||||
if !wayland && portal.is_none() && crate::inproc_encoder::selected() {
|
if allow_inproc && native_inproc(&display, portal.is_some(), encoder) {
|
||||||
let max_kbps = settings.max_kbps().unwrap_or(30_000) as i64;
|
let max_kbps = settings.max_kbps().unwrap_or(30_000) as i64;
|
||||||
let config = crate::inproc_encoder::Config {
|
let config = crate::inproc_encoder::Config {
|
||||||
display: display.clone(), input: size, output: settings.output, fps: u32::from(settings.fps),
|
display: display.clone(), input: size, output: settings.output, fps: u32::from(settings.fps),
|
||||||
gop: gop_frames(settings.fps, true) as u32, cq: settings.cq() as u32,
|
gop: gop_frames(settings.fps, true) as u32, cq: settings.cq() as u32,
|
||||||
target_bps: settings.max_kbps().map_or(16_000, |k| i64::from(k) * 3 / 4) * 1000,
|
target_bps: settings.max_kbps().map_or(16_000, |k| i64::from(k) * 3 / 4) * 1000,
|
||||||
max_bps: max_kbps * 1000, buffer_bits: i64::from(buffer_for(&settings, encoder)) * 1000, encoder, codec: settings.codec,
|
max_bps: max_kbps * 1000, buffer_bits: i64::from(buffer_for(&settings, encoder)) * 1000, codec: settings.codec, chroma: settings.chroma,
|
||||||
damage: crate::inproc_encoder::damage_enabled(),
|
vaapi: encoder == Encoder::Vaapi,
|
||||||
};
|
};
|
||||||
log::info!("Desktop encoder: display={} source={}x{} output={:?} fps={} cq={} maxrate={}k encoder={} pipeline=in-process",
|
log::info!("Desktop encoder: display={} source={}x{} output={:?} fps={} cq={} maxrate={}k encoder={} pipeline=in-process",
|
||||||
display,size.0,size.1,settings.output,settings.fps,config.cq,max_kbps,encoder.name_for(settings.codec));
|
display,size.0,size.1,settings.output,settings.fps,config.cq,max_kbps,encoder.name_for(settings.codec));
|
||||||
@@ -775,7 +792,10 @@ fn probe_settings() -> Result<VideoSettings,String> {
|
|||||||
None=>crate::capture_setting::QUALITY_AUTO,
|
None=>crate::capture_setting::QUALITY_AUTO,
|
||||||
Some(v)=>v.parse::<u64>().ok().filter(|q|(1..=5).contains(q)).ok_or("UU_PROBE_QUALITY must be 1-5")?,
|
Some(v)=>v.parse::<u64>().ok().filter(|q|(1..=5).contains(q)).ok_or("UU_PROBE_QUALITY must be 1-5")?,
|
||||||
};
|
};
|
||||||
Ok(VideoSettings {fps,quality,codec:probe_codec(),..VideoSettings::default()})
|
let mut settings=VideoSettings {fps,quality,codec:probe_codec(),..VideoSettings::default()};
|
||||||
|
// UU_PROBE_CHROMA=444 requests 真彩 like the viewer does (only where full_chroma_available()).
|
||||||
|
if std::env::var("UU_PROBE_CHROMA").as_deref()==Ok("444") && full_chroma_available() { settings.chroma=crate::capture_setting::CHROMA_444; }
|
||||||
|
Ok(settings)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The probe follows `UU_VIDEO_CODEC` so the HEVC path can be measured at all (H.264 otherwise),
|
/// The probe follows `UU_VIDEO_CODEC` so the HEVC path can be measured at all (H.264 otherwise),
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
//! Uses the same optional FFmpeg dependency as the host inproc-av feature.
|
//! Uses the optional FFmpeg 6 libraries of the `viewer-ffmpeg` feature.
|
||||||
use super::desktop::{Decoder,Frame};
|
use super::desktop::{Decoder,Frame};
|
||||||
use ffmpeg_next as av;
|
use ffmpeg_next as av;
|
||||||
use super::media::Codec;
|
use super::media::Codec;
|
||||||
|
|||||||
+123
@@ -0,0 +1,123 @@
|
|||||||
|
//! Experimental Wake-on-LAN helper (`UU_WOL_HELPER=1`, off by default).
|
||||||
|
//!
|
||||||
|
//! The official Windows host (GameViewerServer: LoginManager::reportLanInfo, PushMessageHandler::wakeOnLan,
|
||||||
|
//! wake_on_lan.cpp host::send_wol) reports its LAN address to `api-ipv4…/api/v1/device/wake_on_lan/info`
|
||||||
|
//! after sign-in (logged as "mac / ip / subnet_mask", response carries `turn_on_wol`), and on a
|
||||||
|
//! `wake_on_lan` cloud push with a `target_device` {mac, ip, subnet_mask} it sends a magic packet to that
|
||||||
|
//! subnet's broadcast address, waking another PC of the account on the same LAN. The exact request and
|
||||||
|
//! push field names come from the official log strings only; nothing here is verified end to end yet.
|
||||||
|
//! Addresses are sent to NetEase only when the helper is enabled and are never logged.
|
||||||
|
|
||||||
|
use std::net::{Ipv4Addr, SocketAddrV4, UdpSocket};
|
||||||
|
|
||||||
|
pub fn enabled() -> bool { std::env::var("UU_WOL_HELPER").is_ok_and(|v| v == "1") }
|
||||||
|
|
||||||
|
/// `aa:bb:cc:dd:ee:ff` / `aa-bb-…` / `aabbcc…` → 6 bytes.
|
||||||
|
pub fn parse_mac(text: &str) -> Option<[u8; 6]> {
|
||||||
|
let hex: String = text.chars().filter(|c| c.is_ascii_hexdigit()).collect();
|
||||||
|
if hex.len() != 12 || text.chars().any(|c| !(c.is_ascii_hexdigit() || matches!(c, ':' | '-' | '.'))) { return None; }
|
||||||
|
let mut mac = [0u8; 6];
|
||||||
|
for (i, byte) in mac.iter_mut().enumerate() { *byte = u8::from_str_radix(&hex[i * 2..i * 2 + 2], 16).ok()?; }
|
||||||
|
(mac != [0; 6] && mac != [0xff; 6]).then_some(mac)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Six 0xFF bytes followed by the MAC sixteen times.
|
||||||
|
pub fn magic_packet(mac: [u8; 6]) -> Vec<u8> {
|
||||||
|
let mut packet = vec![0xff; 6];
|
||||||
|
for _ in 0..16 { packet.extend_from_slice(&mac); }
|
||||||
|
packet
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Directed broadcast of `ip`/`mask`, or None when either is missing or invalid.
|
||||||
|
pub fn subnet_broadcast(ip: &str, mask: &str) -> Option<Ipv4Addr> {
|
||||||
|
let (ip, mask): (Ipv4Addr, Ipv4Addr) = (ip.parse().ok()?, mask.parse().ok()?);
|
||||||
|
let mask = u32::from(mask);
|
||||||
|
if mask == 0 || mask.leading_ones() + mask.trailing_zeros() != 32 { return None; }
|
||||||
|
Some(Ipv4Addr::from(u32::from(ip) | !mask))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Handles a `wake_on_lan` push payload; returns how many datagrams were sent.
|
||||||
|
pub fn handle_push(data: &serde_json::Value) -> Result<usize, String> {
|
||||||
|
let target = data.get("target_device").or_else(|| data.get("data").and_then(|d| d.get("target_device")))
|
||||||
|
.ok_or("wake_on_lan push without target_device")?;
|
||||||
|
let text = |key: &str| target.get(key).and_then(serde_json::Value::as_str).unwrap_or("");
|
||||||
|
let mac = parse_mac(text("mac")).ok_or("wake_on_lan target has no valid mac")?;
|
||||||
|
let packet = magic_packet(mac);
|
||||||
|
let socket = UdpSocket::bind("0.0.0.0:0").map_err(|e| format!("WOL socket: {}", e.kind()))?;
|
||||||
|
socket.set_broadcast(true).map_err(|e| format!("WOL broadcast: {}", e.kind()))?;
|
||||||
|
let mut targets = vec![Ipv4Addr::BROADCAST];
|
||||||
|
if let Some(directed) = subnet_broadcast(text("ip"), text("subnet_mask")) { targets.insert(0, directed); }
|
||||||
|
let mut sent = 0;
|
||||||
|
for address in targets { for port in [9, 7] {
|
||||||
|
if socket.send_to(&packet, SocketAddrV4::new(address, port)).is_ok() { sent += 1; }
|
||||||
|
} }
|
||||||
|
if sent == 0 { return Err("WOL packet could not be sent".into()); }
|
||||||
|
Ok(sent)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// This host's LAN identity on the default IPv4 route: (mac, ip, subnet mask).
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
pub fn lan_info() -> Option<(String, String, String)> {
|
||||||
|
let routes = std::fs::read_to_string("/proc/net/route").ok()?;
|
||||||
|
let iface = routes.lines().skip(1).map(|l| l.split_whitespace().collect::<Vec<_>>())
|
||||||
|
.find(|f| f.len() > 2 && f[1] == "00000000")?.first()?.to_string();
|
||||||
|
let mac = std::fs::read_to_string(format!("/sys/class/net/{iface}/address")).ok()?.trim().to_owned();
|
||||||
|
parse_mac(&mac)?;
|
||||||
|
let mut addrs: *mut libc::ifaddrs = std::ptr::null_mut();
|
||||||
|
if unsafe { libc::getifaddrs(&mut addrs) } != 0 { return None; }
|
||||||
|
let mut result = None;
|
||||||
|
let mut cursor = addrs;
|
||||||
|
while !cursor.is_null() {
|
||||||
|
let entry = unsafe { &*cursor };
|
||||||
|
cursor = entry.ifa_next;
|
||||||
|
if entry.ifa_addr.is_null() || entry.ifa_netmask.is_null() { continue; }
|
||||||
|
let name = unsafe { std::ffi::CStr::from_ptr(entry.ifa_name) }.to_string_lossy();
|
||||||
|
if name != iface.as_str() || i32::from(unsafe { (*entry.ifa_addr).sa_family }) != libc::AF_INET { continue; }
|
||||||
|
let v4 = |p: *mut libc::sockaddr| Ipv4Addr::from(u32::from_be(unsafe { (*(p as *const libc::sockaddr_in)).sin_addr.s_addr }));
|
||||||
|
result = Some((mac.clone(), v4(entry.ifa_addr).to_string(), v4(entry.ifa_netmask).to_string()));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
unsafe { libc::freeifaddrs(addrs) };
|
||||||
|
result
|
||||||
|
}
|
||||||
|
#[cfg(not(target_os = "linux"))]
|
||||||
|
pub fn lan_info() -> Option<(String, String, String)> { None }
|
||||||
|
|
||||||
|
/// Report this host's LAN identity like the official host after sign-in.
|
||||||
|
pub async fn report(auth: &crate::auth::UUAuthClient) {
|
||||||
|
let Some((mac, ip, subnet_mask)) = lan_info() else { log::warn!("WOL helper: no IPv4 default-route interface"); return; };
|
||||||
|
let body = serde_json::json!({ "mac": mac, "ip": ip, "subnet_mask": subnet_mask });
|
||||||
|
match auth.post_json_url("https://api-ipv4.nrd.nie.163.com", "/api/v1/device/wake_on_lan/info", &body).await {
|
||||||
|
Ok((status, value)) => log::info!("WOL helper: LAN info reported: status={status} code={:?} turn_on_wol={:?}",
|
||||||
|
value.get("code").and_then(serde_json::Value::as_i64),
|
||||||
|
value.get("data").and_then(|d| d.get("turn_on_wol")).or_else(|| value.get("turn_on_wol"))),
|
||||||
|
Err(error) => log::warn!("WOL helper: LAN info report failed: {error}"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
#[test]
|
||||||
|
fn mac_parsing_and_packet() {
|
||||||
|
assert_eq!(parse_mac("AA:bb:cc:dd:ee:01"), Some([0xaa, 0xbb, 0xcc, 0xdd, 0xee, 1]));
|
||||||
|
assert_eq!(parse_mac("aa-bb-cc-dd-ee-01"), parse_mac("aabbccddee01"));
|
||||||
|
assert!(parse_mac("aa:bb:cc").is_none() && parse_mac("zz:bb:cc:dd:ee:01").is_none() && parse_mac("00:00:00:00:00:00").is_none());
|
||||||
|
let packet = magic_packet([1, 2, 3, 4, 5, 6]);
|
||||||
|
assert_eq!(packet.len(), 102);
|
||||||
|
assert_eq!(&packet[..6], &[0xff; 6]);
|
||||||
|
assert_eq!(&packet[96..], &[1, 2, 3, 4, 5, 6]);
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn directed_broadcast() {
|
||||||
|
assert_eq!(subnet_broadcast("192.168.2.29", "255.255.255.0"), Some(Ipv4Addr::new(192, 168, 2, 255)));
|
||||||
|
assert_eq!(subnet_broadcast("10.1.2.3", "255.255.0.0"), Some(Ipv4Addr::new(10, 1, 255, 255)));
|
||||||
|
assert_eq!(subnet_broadcast("10.1.2.3", "255.0.255.0"), None);
|
||||||
|
assert_eq!(subnet_broadcast("", "255.255.255.0"), None);
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn push_without_target_is_rejected() {
|
||||||
|
assert!(handle_push(&serde_json::json!({})).is_err());
|
||||||
|
assert!(handle_push(&serde_json::json!({"target_device": {"mac": "nope"}})).is_err());
|
||||||
|
}
|
||||||
|
}
|
||||||
Vendored
+4
@@ -0,0 +1,4 @@
|
|||||||
|
`ffnvcodec/dynlink_cuda.h` and `ffnvcodec/nvEncodeAPI.h` are unmodified copies from
|
||||||
|
[nv-codec-headers](https://github.com/FFmpeg/nv-codec-headers) tag `n12.1.14.0`
|
||||||
|
(NVENC API 12.1, the version FFmpeg 6.1 builds against; NVIDIA Linux driver 530.41 or newer).
|
||||||
|
MIT licensed, see the header comments. Only the in-process NVENC engine (`--features inproc-av`) uses them.
|
||||||
+518
@@ -0,0 +1,518 @@
|
|||||||
|
/*
|
||||||
|
* This copyright notice applies to this header file only:
|
||||||
|
*
|
||||||
|
* Copyright (c) 2016
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person
|
||||||
|
* obtaining a copy of this software and associated documentation
|
||||||
|
* files (the "Software"), to deal in the Software without
|
||||||
|
* restriction, including without limitation the rights to use,
|
||||||
|
* copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the software, and to permit persons to whom the
|
||||||
|
* software is furnished to do so, subject to the following
|
||||||
|
* conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be
|
||||||
|
* included in all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||||
|
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||||
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
|
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||||
|
* OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#if !defined(FFNV_DYNLINK_CUDA_H) && !defined(CUDA_VERSION)
|
||||||
|
#define FFNV_DYNLINK_CUDA_H
|
||||||
|
|
||||||
|
#include <stddef.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
|
#define CUDA_VERSION 7050
|
||||||
|
|
||||||
|
#if defined(_WIN32) || defined(__CYGWIN__)
|
||||||
|
#define CUDAAPI __stdcall
|
||||||
|
#else
|
||||||
|
#define CUDAAPI
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define CU_CTX_SCHED_BLOCKING_SYNC 4
|
||||||
|
|
||||||
|
typedef int CUdevice;
|
||||||
|
#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined(__LP64__) || defined(__aarch64__)
|
||||||
|
typedef unsigned long long CUdeviceptr;
|
||||||
|
#else
|
||||||
|
typedef unsigned int CUdeviceptr;
|
||||||
|
#endif
|
||||||
|
typedef unsigned long long CUtexObject;
|
||||||
|
|
||||||
|
typedef struct CUarray_st *CUarray;
|
||||||
|
typedef struct CUctx_st *CUcontext;
|
||||||
|
typedef struct CUstream_st *CUstream;
|
||||||
|
typedef struct CUevent_st *CUevent;
|
||||||
|
typedef struct CUfunc_st *CUfunction;
|
||||||
|
typedef struct CUmod_st *CUmodule;
|
||||||
|
typedef struct CUmipmappedArray_st *CUmipmappedArray;
|
||||||
|
typedef struct CUgraphicsResource_st *CUgraphicsResource;
|
||||||
|
typedef struct CUextMemory_st *CUexternalMemory;
|
||||||
|
typedef struct CUextSemaphore_st *CUexternalSemaphore;
|
||||||
|
typedef struct CUeglStreamConnection_st *CUeglStreamConnection;
|
||||||
|
|
||||||
|
typedef struct CUlinkState_st *CUlinkState;
|
||||||
|
|
||||||
|
typedef enum cudaError_enum {
|
||||||
|
CUDA_SUCCESS = 0,
|
||||||
|
CUDA_ERROR_NOT_READY = 600,
|
||||||
|
CUDA_ERROR_LAUNCH_TIMEOUT = 702,
|
||||||
|
CUDA_ERROR_UNKNOWN = 999
|
||||||
|
} CUresult;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Device properties (subset)
|
||||||
|
*/
|
||||||
|
typedef enum CUdevice_attribute_enum {
|
||||||
|
CU_DEVICE_ATTRIBUTE_CLOCK_RATE = 13,
|
||||||
|
CU_DEVICE_ATTRIBUTE_TEXTURE_ALIGNMENT = 14,
|
||||||
|
CU_DEVICE_ATTRIBUTE_MULTIPROCESSOR_COUNT = 16,
|
||||||
|
CU_DEVICE_ATTRIBUTE_INTEGRATED = 18,
|
||||||
|
CU_DEVICE_ATTRIBUTE_CAN_MAP_HOST_MEMORY = 19,
|
||||||
|
CU_DEVICE_ATTRIBUTE_COMPUTE_MODE = 20,
|
||||||
|
CU_DEVICE_ATTRIBUTE_CONCURRENT_KERNELS = 31,
|
||||||
|
CU_DEVICE_ATTRIBUTE_PCI_BUS_ID = 33,
|
||||||
|
CU_DEVICE_ATTRIBUTE_PCI_DEVICE_ID = 34,
|
||||||
|
CU_DEVICE_ATTRIBUTE_TCC_DRIVER = 35,
|
||||||
|
CU_DEVICE_ATTRIBUTE_MEMORY_CLOCK_RATE = 36,
|
||||||
|
CU_DEVICE_ATTRIBUTE_GLOBAL_MEMORY_BUS_WIDTH = 37,
|
||||||
|
CU_DEVICE_ATTRIBUTE_ASYNC_ENGINE_COUNT = 40,
|
||||||
|
CU_DEVICE_ATTRIBUTE_UNIFIED_ADDRESSING = 41,
|
||||||
|
CU_DEVICE_ATTRIBUTE_PCI_DOMAIN_ID = 50,
|
||||||
|
CU_DEVICE_ATTRIBUTE_TEXTURE_PITCH_ALIGNMENT = 51,
|
||||||
|
CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR = 75,
|
||||||
|
CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MINOR = 76,
|
||||||
|
CU_DEVICE_ATTRIBUTE_MANAGED_MEMORY = 83,
|
||||||
|
CU_DEVICE_ATTRIBUTE_MULTI_GPU_BOARD = 84,
|
||||||
|
CU_DEVICE_ATTRIBUTE_MULTI_GPU_BOARD_GROUP_ID = 85,
|
||||||
|
} CUdevice_attribute;
|
||||||
|
|
||||||
|
typedef enum CUarray_format_enum {
|
||||||
|
CU_AD_FORMAT_UNSIGNED_INT8 = 0x01,
|
||||||
|
CU_AD_FORMAT_UNSIGNED_INT16 = 0x02,
|
||||||
|
CU_AD_FORMAT_UNSIGNED_INT32 = 0x03,
|
||||||
|
CU_AD_FORMAT_SIGNED_INT8 = 0x08,
|
||||||
|
CU_AD_FORMAT_SIGNED_INT16 = 0x09,
|
||||||
|
CU_AD_FORMAT_SIGNED_INT32 = 0x0a,
|
||||||
|
CU_AD_FORMAT_HALF = 0x10,
|
||||||
|
CU_AD_FORMAT_FLOAT = 0x20
|
||||||
|
} CUarray_format;
|
||||||
|
|
||||||
|
typedef enum CUmemorytype_enum {
|
||||||
|
CU_MEMORYTYPE_HOST = 1,
|
||||||
|
CU_MEMORYTYPE_DEVICE = 2,
|
||||||
|
CU_MEMORYTYPE_ARRAY = 3
|
||||||
|
} CUmemorytype;
|
||||||
|
|
||||||
|
typedef enum CUlimit_enum {
|
||||||
|
CU_LIMIT_STACK_SIZE = 0,
|
||||||
|
CU_LIMIT_PRINTF_FIFO_SIZE = 1,
|
||||||
|
CU_LIMIT_MALLOC_HEAP_SIZE = 2,
|
||||||
|
CU_LIMIT_DEV_RUNTIME_SYNC_DEPTH = 3,
|
||||||
|
CU_LIMIT_DEV_RUNTIME_PENDING_LAUNCH_COUNT = 4
|
||||||
|
} CUlimit;
|
||||||
|
|
||||||
|
typedef enum CUresourcetype_enum {
|
||||||
|
CU_RESOURCE_TYPE_ARRAY = 0x00,
|
||||||
|
CU_RESOURCE_TYPE_MIPMAPPED_ARRAY = 0x01,
|
||||||
|
CU_RESOURCE_TYPE_LINEAR = 0x02,
|
||||||
|
CU_RESOURCE_TYPE_PITCH2D = 0x03
|
||||||
|
} CUresourcetype;
|
||||||
|
|
||||||
|
typedef enum CUaddress_mode_enum {
|
||||||
|
CU_TR_ADDRESS_MODE_WRAP = 0,
|
||||||
|
CU_TR_ADDRESS_MODE_CLAMP = 1,
|
||||||
|
CU_TR_ADDRESS_MODE_MIRROR = 2,
|
||||||
|
CU_TR_ADDRESS_MODE_BORDER = 3
|
||||||
|
} CUaddress_mode;
|
||||||
|
|
||||||
|
typedef enum CUfilter_mode_enum {
|
||||||
|
CU_TR_FILTER_MODE_POINT = 0,
|
||||||
|
CU_TR_FILTER_MODE_LINEAR = 1
|
||||||
|
} CUfilter_mode;
|
||||||
|
|
||||||
|
typedef enum CUgraphicsRegisterFlags_enum {
|
||||||
|
CU_GRAPHICS_REGISTER_FLAGS_NONE = 0,
|
||||||
|
CU_GRAPHICS_REGISTER_FLAGS_READ_ONLY = 1,
|
||||||
|
CU_GRAPHICS_REGISTER_FLAGS_WRITE_DISCARD = 2,
|
||||||
|
CU_GRAPHICS_REGISTER_FLAGS_SURFACE_LDST = 4,
|
||||||
|
CU_GRAPHICS_REGISTER_FLAGS_TEXTURE_GATHER = 8
|
||||||
|
} CUgraphicsRegisterFlags;
|
||||||
|
|
||||||
|
typedef enum CUexternalMemoryHandleType_enum {
|
||||||
|
CU_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD = 1,
|
||||||
|
CU_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32 = 2,
|
||||||
|
CU_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT = 3,
|
||||||
|
CU_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_HEAP = 4,
|
||||||
|
CU_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_RESOURCE = 5,
|
||||||
|
} CUexternalMemoryHandleType;
|
||||||
|
|
||||||
|
typedef enum CUexternalSemaphoreHandleType_enum {
|
||||||
|
CU_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD = 1,
|
||||||
|
CU_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32 = 2,
|
||||||
|
CU_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT = 3,
|
||||||
|
CU_EXTERNAL_SEMAPHORE_HANDLE_TYPE_D3D12_FENCE = 4,
|
||||||
|
CU_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TIMELINE_SEMAPHORE_FD = 9,
|
||||||
|
CU_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TIMELINE_SEMAPHORE_WIN32 = 10,
|
||||||
|
} CUexternalSemaphoreHandleType;
|
||||||
|
|
||||||
|
typedef enum CUjit_option_enum
|
||||||
|
{
|
||||||
|
CU_JIT_MAX_REGISTERS = 0,
|
||||||
|
CU_JIT_THREADS_PER_BLOCK = 1,
|
||||||
|
CU_JIT_WALL_TIME = 2,
|
||||||
|
CU_JIT_INFO_LOG_BUFFER = 3,
|
||||||
|
CU_JIT_INFO_LOG_BUFFER_SIZE_BYTES = 4,
|
||||||
|
CU_JIT_ERROR_LOG_BUFFER = 5,
|
||||||
|
CU_JIT_ERROR_LOG_BUFFER_SIZE_BYTES = 6,
|
||||||
|
CU_JIT_OPTIMIZATION_LEVEL = 7,
|
||||||
|
CU_JIT_TARGET_FROM_CUCONTEXT = 8,
|
||||||
|
CU_JIT_TARGET = 9,
|
||||||
|
CU_JIT_FALLBACK_STRATEGY = 10,
|
||||||
|
CU_JIT_GENERATE_DEBUG_INFO = 11,
|
||||||
|
CU_JIT_LOG_VERBOSE = 12,
|
||||||
|
CU_JIT_GENERATE_LINE_INFO = 13,
|
||||||
|
CU_JIT_CACHE_MODE = 14,
|
||||||
|
CU_JIT_NEW_SM3X_OPT = 15,
|
||||||
|
CU_JIT_FAST_COMPILE = 16,
|
||||||
|
CU_JIT_GLOBAL_SYMBOL_NAMES = 17,
|
||||||
|
CU_JIT_GLOBAL_SYMBOL_ADDRESSES = 18,
|
||||||
|
CU_JIT_GLOBAL_SYMBOL_COUNT = 19,
|
||||||
|
CU_JIT_NUM_OPTIONS
|
||||||
|
} CUjit_option;
|
||||||
|
|
||||||
|
typedef enum CUjitInputType_enum
|
||||||
|
{
|
||||||
|
CU_JIT_INPUT_CUBIN = 0,
|
||||||
|
CU_JIT_INPUT_PTX = 1,
|
||||||
|
CU_JIT_INPUT_FATBINARY = 2,
|
||||||
|
CU_JIT_INPUT_OBJECT = 3,
|
||||||
|
CU_JIT_INPUT_LIBRARY = 4,
|
||||||
|
CU_JIT_NUM_INPUT_TYPES
|
||||||
|
} CUjitInputType;
|
||||||
|
|
||||||
|
typedef enum CUeglFrameType
|
||||||
|
{
|
||||||
|
CU_EGL_FRAME_TYPE_ARRAY = 0,
|
||||||
|
CU_EGL_FRAME_TYPE_PITCH = 1,
|
||||||
|
} CUeglFrameType;
|
||||||
|
|
||||||
|
typedef enum CUeglColorFormat
|
||||||
|
{
|
||||||
|
CU_EGL_COLOR_FORMAT_YUV420_PLANAR = 0x00,
|
||||||
|
CU_EGL_COLOR_FORMAT_YUV420_SEMIPLANAR = 0x01,
|
||||||
|
CU_EGL_COLOR_FORMAT_YVU420_SEMIPLANAR = 0x15,
|
||||||
|
CU_EGL_COLOR_FORMAT_Y10V10U10_420_SEMIPLANAR = 0x17,
|
||||||
|
CU_EGL_COLOR_FORMAT_Y12V12U12_420_SEMIPLANAR = 0x19,
|
||||||
|
} CUeglColorFormat;
|
||||||
|
|
||||||
|
typedef enum CUd3d11DeviceList_enum
|
||||||
|
{
|
||||||
|
CU_D3D11_DEVICE_LIST_ALL = 1,
|
||||||
|
CU_D3D11_DEVICE_LIST_CURRENT_FRAME = 2,
|
||||||
|
CU_D3D11_DEVICE_LIST_NEXT_FRAME = 3,
|
||||||
|
} CUd3d11DeviceList;
|
||||||
|
|
||||||
|
#ifndef CU_UUID_HAS_BEEN_DEFINED
|
||||||
|
#define CU_UUID_HAS_BEEN_DEFINED
|
||||||
|
typedef struct CUuuid_st {
|
||||||
|
char bytes[16];
|
||||||
|
} CUuuid;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
typedef struct CUDA_MEMCPY2D_st {
|
||||||
|
size_t srcXInBytes;
|
||||||
|
size_t srcY;
|
||||||
|
CUmemorytype srcMemoryType;
|
||||||
|
const void *srcHost;
|
||||||
|
CUdeviceptr srcDevice;
|
||||||
|
CUarray srcArray;
|
||||||
|
size_t srcPitch;
|
||||||
|
|
||||||
|
size_t dstXInBytes;
|
||||||
|
size_t dstY;
|
||||||
|
CUmemorytype dstMemoryType;
|
||||||
|
void *dstHost;
|
||||||
|
CUdeviceptr dstDevice;
|
||||||
|
CUarray dstArray;
|
||||||
|
size_t dstPitch;
|
||||||
|
|
||||||
|
size_t WidthInBytes;
|
||||||
|
size_t Height;
|
||||||
|
} CUDA_MEMCPY2D;
|
||||||
|
|
||||||
|
typedef struct CUDA_RESOURCE_DESC_st {
|
||||||
|
CUresourcetype resType;
|
||||||
|
union {
|
||||||
|
struct {
|
||||||
|
CUarray hArray;
|
||||||
|
} array;
|
||||||
|
struct {
|
||||||
|
CUmipmappedArray hMipmappedArray;
|
||||||
|
} mipmap;
|
||||||
|
struct {
|
||||||
|
CUdeviceptr devPtr;
|
||||||
|
CUarray_format format;
|
||||||
|
unsigned int numChannels;
|
||||||
|
size_t sizeInBytes;
|
||||||
|
} linear;
|
||||||
|
struct {
|
||||||
|
CUdeviceptr devPtr;
|
||||||
|
CUarray_format format;
|
||||||
|
unsigned int numChannels;
|
||||||
|
size_t width;
|
||||||
|
size_t height;
|
||||||
|
size_t pitchInBytes;
|
||||||
|
} pitch2D;
|
||||||
|
struct {
|
||||||
|
int reserved[32];
|
||||||
|
} reserved;
|
||||||
|
} res;
|
||||||
|
unsigned int flags;
|
||||||
|
} CUDA_RESOURCE_DESC;
|
||||||
|
|
||||||
|
typedef struct CUDA_TEXTURE_DESC_st {
|
||||||
|
CUaddress_mode addressMode[3];
|
||||||
|
CUfilter_mode filterMode;
|
||||||
|
unsigned int flags;
|
||||||
|
unsigned int maxAnisotropy;
|
||||||
|
CUfilter_mode mipmapFilterMode;
|
||||||
|
float mipmapLevelBias;
|
||||||
|
float minMipmapLevelClamp;
|
||||||
|
float maxMipmapLevelClamp;
|
||||||
|
float borderColor[4];
|
||||||
|
int reserved[12];
|
||||||
|
} CUDA_TEXTURE_DESC;
|
||||||
|
|
||||||
|
/* Unused type */
|
||||||
|
typedef struct CUDA_RESOURCE_VIEW_DESC_st CUDA_RESOURCE_VIEW_DESC;
|
||||||
|
|
||||||
|
typedef unsigned int GLenum;
|
||||||
|
typedef unsigned int GLuint;
|
||||||
|
/*
|
||||||
|
* Prefix type name to avoid collisions. Clients using these types
|
||||||
|
* will include the real headers with real definitions.
|
||||||
|
*/
|
||||||
|
typedef int32_t ffnv_EGLint;
|
||||||
|
typedef void *ffnv_EGLStreamKHR;
|
||||||
|
|
||||||
|
typedef enum CUGLDeviceList_enum {
|
||||||
|
CU_GL_DEVICE_LIST_ALL = 1,
|
||||||
|
CU_GL_DEVICE_LIST_CURRENT_FRAME = 2,
|
||||||
|
CU_GL_DEVICE_LIST_NEXT_FRAME = 3,
|
||||||
|
} CUGLDeviceList;
|
||||||
|
|
||||||
|
typedef struct CUDA_EXTERNAL_MEMORY_HANDLE_DESC_st {
|
||||||
|
CUexternalMemoryHandleType type;
|
||||||
|
union {
|
||||||
|
int fd;
|
||||||
|
struct {
|
||||||
|
void *handle;
|
||||||
|
const void *name;
|
||||||
|
} win32;
|
||||||
|
} handle;
|
||||||
|
unsigned long long size;
|
||||||
|
unsigned int flags;
|
||||||
|
unsigned int reserved[16];
|
||||||
|
} CUDA_EXTERNAL_MEMORY_HANDLE_DESC;
|
||||||
|
|
||||||
|
typedef struct CUDA_EXTERNAL_MEMORY_BUFFER_DESC_st {
|
||||||
|
unsigned long long offset;
|
||||||
|
unsigned long long size;
|
||||||
|
unsigned int flags;
|
||||||
|
unsigned int reserved[16];
|
||||||
|
} CUDA_EXTERNAL_MEMORY_BUFFER_DESC;
|
||||||
|
|
||||||
|
typedef struct CUDA_EXTERNAL_SEMAPHORE_HANDLE_DESC_st {
|
||||||
|
CUexternalSemaphoreHandleType type;
|
||||||
|
union {
|
||||||
|
int fd;
|
||||||
|
struct {
|
||||||
|
void *handle;
|
||||||
|
const void *name;
|
||||||
|
} win32;
|
||||||
|
} handle;
|
||||||
|
unsigned int flags;
|
||||||
|
unsigned int reserved[16];
|
||||||
|
} CUDA_EXTERNAL_SEMAPHORE_HANDLE_DESC;
|
||||||
|
|
||||||
|
typedef struct CUDA_EXTERNAL_SEMAPHORE_SIGNAL_PARAMS_st {
|
||||||
|
struct {
|
||||||
|
struct {
|
||||||
|
unsigned long long value;
|
||||||
|
} fence;
|
||||||
|
unsigned int reserved[16];
|
||||||
|
} params;
|
||||||
|
unsigned int flags;
|
||||||
|
unsigned int reserved[16];
|
||||||
|
} CUDA_EXTERNAL_SEMAPHORE_SIGNAL_PARAMS;
|
||||||
|
|
||||||
|
typedef CUDA_EXTERNAL_SEMAPHORE_SIGNAL_PARAMS CUDA_EXTERNAL_SEMAPHORE_WAIT_PARAMS;
|
||||||
|
|
||||||
|
typedef struct CUDA_ARRAY_DESCRIPTOR_st {
|
||||||
|
size_t Width;
|
||||||
|
size_t Height;
|
||||||
|
|
||||||
|
CUarray_format Format;
|
||||||
|
unsigned int NumChannels;
|
||||||
|
} CUDA_ARRAY_DESCRIPTOR;
|
||||||
|
|
||||||
|
typedef struct CUDA_ARRAY3D_DESCRIPTOR_st {
|
||||||
|
size_t Width;
|
||||||
|
size_t Height;
|
||||||
|
size_t Depth;
|
||||||
|
|
||||||
|
CUarray_format Format;
|
||||||
|
unsigned int NumChannels;
|
||||||
|
unsigned int Flags;
|
||||||
|
} CUDA_ARRAY3D_DESCRIPTOR;
|
||||||
|
|
||||||
|
typedef struct CUDA_EXTERNAL_MEMORY_MIPMAPPED_ARRAY_DESC_st {
|
||||||
|
unsigned long long offset;
|
||||||
|
CUDA_ARRAY3D_DESCRIPTOR arrayDesc;
|
||||||
|
unsigned int numLevels;
|
||||||
|
unsigned int reserved[16];
|
||||||
|
} CUDA_EXTERNAL_MEMORY_MIPMAPPED_ARRAY_DESC;
|
||||||
|
|
||||||
|
#define CU_EGL_FRAME_MAX_PLANES 3
|
||||||
|
typedef struct CUeglFrame_st {
|
||||||
|
union {
|
||||||
|
CUarray pArray[CU_EGL_FRAME_MAX_PLANES];
|
||||||
|
void* pPitch[CU_EGL_FRAME_MAX_PLANES];
|
||||||
|
} frame;
|
||||||
|
unsigned int width;
|
||||||
|
unsigned int height;
|
||||||
|
unsigned int depth;
|
||||||
|
unsigned int pitch;
|
||||||
|
unsigned int planeCount;
|
||||||
|
unsigned int numChannels;
|
||||||
|
CUeglFrameType frameType;
|
||||||
|
CUeglColorFormat eglColorFormat;
|
||||||
|
CUarray_format cuFormat;
|
||||||
|
} CUeglFrame;
|
||||||
|
|
||||||
|
#define CU_STREAM_DEFAULT 0
|
||||||
|
#define CU_STREAM_NON_BLOCKING 1
|
||||||
|
|
||||||
|
#define CU_EVENT_DEFAULT 0
|
||||||
|
#define CU_EVENT_BLOCKING_SYNC 1
|
||||||
|
#define CU_EVENT_DISABLE_TIMING 2
|
||||||
|
|
||||||
|
#define CU_EVENT_WAIT_DEFAULT 0
|
||||||
|
#define CU_EVENT_WAIT_EXTERNAL 1
|
||||||
|
|
||||||
|
#define CU_TRSF_READ_AS_INTEGER 1
|
||||||
|
|
||||||
|
typedef void CUDAAPI CUstreamCallback(CUstream hStream, CUresult status, void *userdata);
|
||||||
|
|
||||||
|
typedef CUresult CUDAAPI tcuInit(unsigned int Flags);
|
||||||
|
typedef CUresult CUDAAPI tcuDriverGetVersion(int *driverVersion);
|
||||||
|
typedef CUresult CUDAAPI tcuDeviceGetCount(int *count);
|
||||||
|
typedef CUresult CUDAAPI tcuDeviceGet(CUdevice *device, int ordinal);
|
||||||
|
typedef CUresult CUDAAPI tcuDeviceGetAttribute(int *pi, CUdevice_attribute attrib, CUdevice dev);
|
||||||
|
typedef CUresult CUDAAPI tcuDeviceGetName(char *name, int len, CUdevice dev);
|
||||||
|
typedef CUresult CUDAAPI tcuDeviceGetUuid(CUuuid *uuid, CUdevice dev);
|
||||||
|
typedef CUresult CUDAAPI tcuDeviceGetUuid_v2(CUuuid *uuid, CUdevice dev);
|
||||||
|
typedef CUresult CUDAAPI tcuDeviceGetLuid(char* luid, unsigned int* deviceNodeMask, CUdevice dev);
|
||||||
|
typedef CUresult CUDAAPI tcuDeviceGetByPCIBusId(CUdevice* dev, const char* pciBusId);
|
||||||
|
typedef CUresult CUDAAPI tcuDeviceGetPCIBusId(char* pciBusId, int len, CUdevice dev);
|
||||||
|
typedef CUresult CUDAAPI tcuDeviceComputeCapability(int *major, int *minor, CUdevice dev);
|
||||||
|
typedef CUresult CUDAAPI tcuCtxCreate_v2(CUcontext *pctx, unsigned int flags, CUdevice dev);
|
||||||
|
typedef CUresult CUDAAPI tcuCtxGetCurrent(CUcontext *pctx);
|
||||||
|
typedef CUresult CUDAAPI tcuCtxSetLimit(CUlimit limit, size_t value);
|
||||||
|
typedef CUresult CUDAAPI tcuCtxPushCurrent_v2(CUcontext pctx);
|
||||||
|
typedef CUresult CUDAAPI tcuCtxPopCurrent_v2(CUcontext *pctx);
|
||||||
|
typedef CUresult CUDAAPI tcuCtxDestroy_v2(CUcontext ctx);
|
||||||
|
typedef CUresult CUDAAPI tcuMemAlloc_v2(CUdeviceptr *dptr, size_t bytesize);
|
||||||
|
typedef CUresult CUDAAPI tcuMemAllocPitch_v2(CUdeviceptr *dptr, size_t *pPitch, size_t WidthInBytes, size_t Height, unsigned int ElementSizeBytes);
|
||||||
|
typedef CUresult CUDAAPI tcuMemAllocManaged(CUdeviceptr *dptr, size_t bytesize, unsigned int flags);
|
||||||
|
typedef CUresult CUDAAPI tcuMemsetD8Async(CUdeviceptr dstDevice, unsigned char uc, size_t N, CUstream hStream);
|
||||||
|
typedef CUresult CUDAAPI tcuMemFree_v2(CUdeviceptr dptr);
|
||||||
|
typedef CUresult CUDAAPI tcuMemcpy(CUdeviceptr dst, CUdeviceptr src, size_t bytesize);
|
||||||
|
typedef CUresult CUDAAPI tcuMemcpyAsync(CUdeviceptr dst, CUdeviceptr src, size_t bytesize, CUstream hStream);
|
||||||
|
typedef CUresult CUDAAPI tcuMemcpy2D_v2(const CUDA_MEMCPY2D *pcopy);
|
||||||
|
typedef CUresult CUDAAPI tcuMemcpy2DAsync_v2(const CUDA_MEMCPY2D *pcopy, CUstream hStream);
|
||||||
|
typedef CUresult CUDAAPI tcuMemcpyHtoD_v2(CUdeviceptr dstDevice, const void *srcHost, size_t ByteCount);
|
||||||
|
typedef CUresult CUDAAPI tcuMemcpyHtoDAsync_v2(CUdeviceptr dstDevice, const void *srcHost, size_t ByteCount, CUstream hStream);
|
||||||
|
typedef CUresult CUDAAPI tcuMemcpyDtoH_v2(void *dstHost, CUdeviceptr srcDevice, size_t ByteCount);
|
||||||
|
typedef CUresult CUDAAPI tcuMemcpyDtoHAsync_v2(void *dstHost, CUdeviceptr srcDevice, size_t ByteCount, CUstream hStream);
|
||||||
|
typedef CUresult CUDAAPI tcuMemcpyDtoD_v2(CUdeviceptr dstDevice, CUdeviceptr srcDevice, size_t ByteCount);
|
||||||
|
typedef CUresult CUDAAPI tcuMemcpyDtoDAsync_v2(CUdeviceptr dstDevice, CUdeviceptr srcDevice, size_t ByteCount, CUstream hStream);
|
||||||
|
typedef CUresult CUDAAPI tcuGetErrorName(CUresult error, const char** pstr);
|
||||||
|
typedef CUresult CUDAAPI tcuGetErrorString(CUresult error, const char** pstr);
|
||||||
|
typedef CUresult CUDAAPI tcuCtxGetDevice(CUdevice *device);
|
||||||
|
|
||||||
|
typedef CUresult CUDAAPI tcuDevicePrimaryCtxRetain(CUcontext *pctx, CUdevice dev);
|
||||||
|
typedef CUresult CUDAAPI tcuDevicePrimaryCtxRelease(CUdevice dev);
|
||||||
|
typedef CUresult CUDAAPI tcuDevicePrimaryCtxSetFlags(CUdevice dev, unsigned int flags);
|
||||||
|
typedef CUresult CUDAAPI tcuDevicePrimaryCtxGetState(CUdevice dev, unsigned int *flags, int *active);
|
||||||
|
typedef CUresult CUDAAPI tcuDevicePrimaryCtxReset(CUdevice dev);
|
||||||
|
|
||||||
|
typedef CUresult CUDAAPI tcuStreamCreate(CUstream *phStream, unsigned int flags);
|
||||||
|
typedef CUresult CUDAAPI tcuStreamQuery(CUstream hStream);
|
||||||
|
typedef CUresult CUDAAPI tcuStreamSynchronize(CUstream hStream);
|
||||||
|
typedef CUresult CUDAAPI tcuStreamDestroy_v2(CUstream hStream);
|
||||||
|
typedef CUresult CUDAAPI tcuStreamAddCallback(CUstream hStream, CUstreamCallback *callback, void *userdata, unsigned int flags);
|
||||||
|
typedef CUresult CUDAAPI tcuStreamWaitEvent(CUstream hStream, CUevent hEvent, unsigned int flags);
|
||||||
|
typedef CUresult CUDAAPI tcuEventCreate(CUevent *phEvent, unsigned int flags);
|
||||||
|
typedef CUresult CUDAAPI tcuEventDestroy_v2(CUevent hEvent);
|
||||||
|
typedef CUresult CUDAAPI tcuEventSynchronize(CUevent hEvent);
|
||||||
|
typedef CUresult CUDAAPI tcuEventQuery(CUevent hEvent);
|
||||||
|
typedef CUresult CUDAAPI tcuEventRecord(CUevent hEvent, CUstream hStream);
|
||||||
|
|
||||||
|
typedef CUresult CUDAAPI tcuLaunchKernel(CUfunction f, unsigned int gridDimX, unsigned int gridDimY, unsigned int gridDimZ, unsigned int blockDimX, unsigned int blockDimY, unsigned int blockDimZ, unsigned int sharedMemBytes, CUstream hStream, void** kernelParams, void** extra);
|
||||||
|
typedef CUresult CUDAAPI tcuLinkCreate(unsigned int numOptions, CUjit_option* options, void** optionValues, CUlinkState* stateOut);
|
||||||
|
typedef CUresult CUDAAPI tcuLinkAddData(CUlinkState state, CUjitInputType type, void* data, size_t size, const char* name, unsigned int numOptions, CUjit_option* options, void** optionValues);
|
||||||
|
typedef CUresult CUDAAPI tcuLinkComplete(CUlinkState state, void** cubinOut, size_t* sizeOut);
|
||||||
|
typedef CUresult CUDAAPI tcuLinkDestroy(CUlinkState state);
|
||||||
|
typedef CUresult CUDAAPI tcuModuleLoadData(CUmodule* module, const void* image);
|
||||||
|
typedef CUresult CUDAAPI tcuModuleUnload(CUmodule hmod);
|
||||||
|
typedef CUresult CUDAAPI tcuModuleGetFunction(CUfunction* hfunc, CUmodule hmod, const char* name);
|
||||||
|
typedef CUresult CUDAAPI tcuModuleGetGlobal(CUdeviceptr *dptr, size_t *bytes, CUmodule hmod, const char* name);
|
||||||
|
typedef CUresult CUDAAPI tcuTexObjectCreate(CUtexObject* pTexObject, const CUDA_RESOURCE_DESC* pResDesc, const CUDA_TEXTURE_DESC* pTexDesc, const CUDA_RESOURCE_VIEW_DESC* pResViewDesc);
|
||||||
|
typedef CUresult CUDAAPI tcuTexObjectDestroy(CUtexObject texObject);
|
||||||
|
|
||||||
|
typedef CUresult CUDAAPI tcuGLGetDevices_v2(unsigned int* pCudaDeviceCount, CUdevice* pCudaDevices, unsigned int cudaDeviceCount, CUGLDeviceList deviceList);
|
||||||
|
typedef CUresult CUDAAPI tcuGraphicsGLRegisterImage(CUgraphicsResource* pCudaResource, GLuint image, GLenum target, unsigned int Flags);
|
||||||
|
typedef CUresult CUDAAPI tcuGraphicsUnregisterResource(CUgraphicsResource resource);
|
||||||
|
typedef CUresult CUDAAPI tcuGraphicsMapResources(unsigned int count, CUgraphicsResource* resources, CUstream hStream);
|
||||||
|
typedef CUresult CUDAAPI tcuGraphicsUnmapResources(unsigned int count, CUgraphicsResource* resources, CUstream hStream);
|
||||||
|
typedef CUresult CUDAAPI tcuGraphicsSubResourceGetMappedArray(CUarray* pArray, CUgraphicsResource resource, unsigned int arrayIndex, unsigned int mipLevel);
|
||||||
|
typedef CUresult CUDAAPI tcuGraphicsResourceGetMappedPointer(CUdeviceptr *devPtrOut, size_t *sizeOut, CUgraphicsResource resource);
|
||||||
|
|
||||||
|
typedef CUresult CUDAAPI tcuImportExternalMemory(CUexternalMemory* extMem_out, const CUDA_EXTERNAL_MEMORY_HANDLE_DESC* memHandleDesc);
|
||||||
|
typedef CUresult CUDAAPI tcuDestroyExternalMemory(CUexternalMemory extMem);
|
||||||
|
typedef CUresult CUDAAPI tcuExternalMemoryGetMappedBuffer(CUdeviceptr* devPtr, CUexternalMemory extMem, const CUDA_EXTERNAL_MEMORY_BUFFER_DESC* bufferDesc);
|
||||||
|
typedef CUresult CUDAAPI tcuExternalMemoryGetMappedMipmappedArray(CUmipmappedArray* mipmap, CUexternalMemory extMem, const CUDA_EXTERNAL_MEMORY_MIPMAPPED_ARRAY_DESC* mipmapDesc);
|
||||||
|
typedef CUresult CUDAAPI tcuMipmappedArrayGetLevel(CUarray* pLevelArray, CUmipmappedArray hMipmappedArray, unsigned int level);
|
||||||
|
typedef CUresult CUDAAPI tcuMipmappedArrayDestroy(CUmipmappedArray hMipmappedArray);
|
||||||
|
|
||||||
|
typedef CUresult CUDAAPI tcuImportExternalSemaphore(CUexternalSemaphore* extSem_out, const CUDA_EXTERNAL_SEMAPHORE_HANDLE_DESC* semHandleDesc);
|
||||||
|
typedef CUresult CUDAAPI tcuDestroyExternalSemaphore(CUexternalSemaphore extSem);
|
||||||
|
typedef CUresult CUDAAPI tcuSignalExternalSemaphoresAsync(const CUexternalSemaphore* extSemArray, const CUDA_EXTERNAL_SEMAPHORE_SIGNAL_PARAMS* paramsArray, unsigned int numExtSems, CUstream stream);
|
||||||
|
typedef CUresult CUDAAPI tcuWaitExternalSemaphoresAsync(const CUexternalSemaphore* extSemArray, const CUDA_EXTERNAL_SEMAPHORE_WAIT_PARAMS* paramsArray, unsigned int numExtSems, CUstream stream);
|
||||||
|
|
||||||
|
typedef CUresult CUDAAPI tcuArrayCreate(CUarray *pHandle, const CUDA_ARRAY_DESCRIPTOR* pAllocateArray);
|
||||||
|
typedef CUresult CUDAAPI tcuArray3DCreate(CUarray *pHandle, const CUDA_ARRAY3D_DESCRIPTOR* pAllocateArray);
|
||||||
|
typedef CUresult CUDAAPI tcuArrayDestroy(CUarray hArray);
|
||||||
|
|
||||||
|
typedef CUresult CUDAAPI tcuEGLStreamProducerConnect(CUeglStreamConnection* conn, ffnv_EGLStreamKHR stream, ffnv_EGLint width, ffnv_EGLint height);
|
||||||
|
typedef CUresult CUDAAPI tcuEGLStreamProducerDisconnect(CUeglStreamConnection* conn);
|
||||||
|
typedef CUresult CUDAAPI tcuEGLStreamConsumerDisconnect(CUeglStreamConnection* conn);
|
||||||
|
typedef CUresult CUDAAPI tcuEGLStreamProducerPresentFrame(CUeglStreamConnection* conn, CUeglFrame eglframe, CUstream* pStream);
|
||||||
|
typedef CUresult CUDAAPI tcuEGLStreamProducerReturnFrame(CUeglStreamConnection* conn, CUeglFrame* eglframe, CUstream* pStream);
|
||||||
|
|
||||||
|
typedef CUresult CUDAAPI tcuD3D11GetDevice(CUdevice *device, void *dxgiAdapter);
|
||||||
|
typedef CUresult CUDAAPI tcuD3D11GetDevices(unsigned int *deviceCountOut, CUdevice *devices, unsigned int deviceCount, void *d3d11device, CUd3d11DeviceList listType);
|
||||||
|
typedef CUresult CUDAAPI tcuGraphicsD3D11RegisterResource(CUgraphicsResource *cudaResourceOut, void *d3d11Resource, unsigned int flags);
|
||||||
|
#endif
|
||||||
+4451
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user