Fix 10bit encoding

.gitignore

@@ -11,3 +11,4 @@ va-api-nvidia.files
 va-api-nvidia.includes
 meson.build.user
 .idea
+pr_summary.md

cross-i386.txt

@@ -0,0 +1,22 @@
+[binaries]
+c = 'gcc'
+cpp = 'g++'
+ar = 'ar'
+strip = 'strip'
+pkg-config = 'pkg-config'
+
+[built-in options]
+c_args = ['-m32']
+c_link_args = ['-m32']
+cpp_args = ['-m32']
+cpp_link_args = ['-m32']
+
+[properties]
+pkg_config_libdir = ['/usr/lib/i386-linux-gnu/pkgconfig', '/usr/share/pkgconfig', '/usr/lib/pkgconfig']
+sys_root = '/'
+
+[host_machine]
+system = 'linux'
+cpu_family = 'x86'
+cpu = 'i686'
+endian = 'little'

docs/install-fedora.md

@@ -0,0 +1,141 @@
+# Installation on Fedora
+
+Tested on Fedora 43 with NVIDIA driver 580.126.18 (RPM Fusion).
+
+## Prerequisites
+
+NVIDIA proprietary driver installed via RPM Fusion (`akmod-nvidia`).
+
+Verify:
+```bash
+nvidia-smi --query-gpu=driver_version --format=csv,noheader
+```
+
+## Step 1 — Install build dependencies (64-bit)
+
+```bash
+sudo dnf install -y \
+    meson ninja-build gcc pkg-config \
+    libva-devel libdrm-devel mesa-libEGL-devel nv-codec-headers \
+    libva-utils
+```
+
+## Step 2 — Install build dependencies (32-bit, for Steam)
+
+```bash
+sudo dnf install -y \
+    glibc-devel.i686 \
+    libva-devel.i686 libdrm-devel.i686 mesa-libEGL-devel.i686
+```
+
+## Step 3 — Remove stock libva-nvidia-driver
+
+If you have the Fedora-packaged version (v0.0.16, decode-only), remove it first:
+
+```bash
+sudo dnf remove -y libva-nvidia-driver
+```
+
+## Step 4 — Build 64-bit
+
+```bash
+meson setup build64 . --wipe --prefix=/usr
+meson compile -C build64
+```
+
+## Step 5 — Build 32-bit (cross-compile)
+
+Fedora uses `/usr/lib/pkgconfig` for 32-bit `.pc` files (not `/usr/lib/i386-linux-gnu/`).
+Create a cross-file:
+
+```bash
+cat > cross-i386-fedora.txt << 'EOF'
+[binaries]
+c = 'gcc'
+cpp = 'g++'
+ar = 'ar'
+strip = 'strip'
+pkg-config = 'pkg-config'
+
+[built-in options]
+c_args = ['-m32']
+c_link_args = ['-m32']
+cpp_args = ['-m32']
+cpp_link_args = ['-m32']
+
+[properties]
+pkg_config_libdir = ['/usr/lib/pkgconfig', '/usr/share/pkgconfig']
+sys_root = '/'
+
+[host_machine]
+system = 'linux'
+cpu_family = 'x86'
+cpu = 'i686'
+endian = 'little'
+EOF
+```
+
+Then build:
+
+```bash
+meson setup build32 . --wipe --cross-file cross-i386-fedora.txt
+meson compile -C build32
+```
+
+## Step 6 — Install
+
+```bash
+sudo meson install -C build64
+sudo mkdir -p /usr/lib/dri
+sudo cp build32/nvidia_drv_video.so /usr/lib/dri/nvidia_drv_video.so
+```
+
+This installs:
+- 64-bit driver → `/usr/lib64/dri/nvidia_drv_video.so`
+- 32-bit driver → `/usr/lib/dri/nvidia_drv_video.so`
+- nvenc-helper → `/usr/libexec/nvenc-helper`
+
+## Step 7 — Systemd user service
+
+```bash
+mkdir -p ~/.config/systemd/user
+cat > ~/.config/systemd/user/nvenc-helper.service << 'EOF'
+[Unit]
+Description=NVENC encode helper for nvidia-vaapi-driver
+Documentation=https://github.com/efortin/nvidia-vaapi-driver
+After=graphical-session.target
+
+[Service]
+Type=simple
+ExecStart=/usr/libexec/nvenc-helper
+Restart=on-failure
+RestartSec=2
+
+[Install]
+WantedBy=graphical-session.target
+EOF
+
+systemctl --user daemon-reload
+systemctl --user enable nvenc-helper.service
+systemctl --user restart nvenc-helper.service
+```
+
+## Step 8 — Verify
+
+```bash
+# Check helper is running
+systemctl --user is-active nvenc-helper.service
+
+# Check VA-API profiles (should show VAEntrypointEncSlice for encode)
+vainfo --display drm --device /dev/dri/renderD128
+```
+
+Expected output includes both decode (VLD) and encode (EncSlice) entrypoints:
+```
+VAProfileH264Main               :  VAEntrypointVLD
+VAProfileH264Main               :  VAEntrypointEncSlice
+VAProfileHEVCMain               :  VAEntrypointVLD
+VAProfileHEVCMain               :  VAEntrypointEncSlice
+```
+
+No environment variables needed. Just launch Steam.

docs/install-ubuntu.md

@@ -0,0 +1,114 @@
+# Installation on Ubuntu
+
+Tested on Ubuntu 22.04+ with NVIDIA proprietary driver.
+
+## Prerequisites
+
+NVIDIA proprietary driver installed.
+
+Verify:
+```bash
+nvidia-smi --query-gpu=driver_version --format=csv,noheader
+```
+
+Detect the driver version (used for 32-bit packages):
+```bash
+NV_VER=$(dpkg -l | grep 'libnvidia-compute-.*amd64' | awk '{print $2}' | sed 's/libnvidia-compute-//' | sed 's/:amd64//' | head -1)
+echo "NVIDIA driver: $NV_VER"
+```
+
+## Step 1 — Install build dependencies (64-bit)
+
+```bash
+sudo apt-get install -y --no-install-recommends \
+    meson ninja-build gcc pkg-config \
+    libva-dev libdrm-dev libegl-dev libffmpeg-nvenc-dev \
+    vainfo
+```
+
+## Step 2 — Install build dependencies (32-bit, for Steam)
+
+```bash
+sudo dpkg --add-architecture i386
+sudo apt-get update
+
+sudo apt-get install -y --no-install-recommends \
+    gcc-multilib \
+    libva-dev:i386 libdrm-dev:i386 libegl-dev:i386 \
+    libnvidia-compute-${NV_VER}:i386 \
+    libnvidia-encode-${NV_VER}:i386
+```
+
+## Step 3 — Build 64-bit
+
+```bash
+meson setup build64 . --wipe --prefix=/usr
+meson compile -C build64
+```
+
+## Step 4 — Build 32-bit (cross-compile)
+
+The repo includes `cross-i386.txt` configured for Ubuntu paths (`/usr/lib/i386-linux-gnu/`).
+
+```bash
+meson setup build32 . --wipe --cross-file cross-i386.txt
+meson compile -C build32
+```
+
+## Step 5 — Install
+
+```bash
+sudo meson install -C build64
+sudo mkdir -p /usr/lib/i386-linux-gnu/dri
+sudo cp build32/nvidia_drv_video.so /usr/lib/i386-linux-gnu/dri/nvidia_drv_video.so
+```
+
+This installs:
+- 64-bit driver → `/usr/lib/x86_64-linux-gnu/dri/nvidia_drv_video.so`
+- 32-bit driver → `/usr/lib/i386-linux-gnu/dri/nvidia_drv_video.so`
+- nvenc-helper → `/usr/libexec/nvenc-helper`
+
+## Step 6 — Systemd user service
+
+```bash
+mkdir -p ~/.config/systemd/user
+cat > ~/.config/systemd/user/nvenc-helper.service << 'EOF'
+[Unit]
+Description=NVENC encode helper for nvidia-vaapi-driver
+Documentation=https://github.com/efortin/nvidia-vaapi-driver
+After=graphical-session.target
+
+[Service]
+Type=simple
+ExecStart=/usr/libexec/nvenc-helper
+Restart=on-failure
+RestartSec=2
+
+[Install]
+WantedBy=graphical-session.target
+EOF
+
+systemctl --user daemon-reload
+systemctl --user enable nvenc-helper.service
+systemctl --user restart nvenc-helper.service
+```
+
+## Step 7 — Verify
+
+```bash
+# Check helper is running
+systemctl --user is-active nvenc-helper.service
+
+# Check VA-API profiles (should show VAEntrypointEncSlice for encode)
+vainfo --display drm --device /dev/dri/renderD128
+```
+
+Expected output includes both decode (VLD) and encode (EncSlice) entrypoints:
+```
+VAProfileH264Main               :  VAEntrypointVLD
+VAProfileH264Main               :  VAEntrypointEncSlice
+VAProfileHEVCMain               :  VAEntrypointVLD
+VAProfileHEVCMain               :  VAEntrypointEncSlice
+```
+
+No environment variables needed. Just launch Steam.

meson.build

@@ -55,10 +55,14 @@ sources = [
     'src/direct/direct-export-buf.c',
     'src/direct/nv-driver.c',
     'src/h264.c',
+    'src/h264_encode.c',
     'src/hevc.c',
+    'src/hevc_encode.c',
     'src/jpeg.c',
     'src/mpeg2.c',
     'src/mpeg4.c',
+    'src/nvenc.c',
+    'src/nvenc-ipc-client.c',
     'src/vabackend.c',
     'src/vc1.c',
     'src/vp8.c',
@@ -84,6 +88,47 @@ shared_library(
     gnu_symbol_visibility: 'hidden',
 )
 
+# Build the 64-bit NVENC helper daemon (only for native builds, not cross-compiled i386)
+if host_machine.cpu_family() == 'x86_64' or host_machine.cpu_family() == 'aarch64'
+    helper_deps = [
+        cc.find_library('dl', required : false),
+        dependency('ffnvcodec', version: '>= 11.1.5.1'),
+        dependency('threads'),
+    ]
+    executable(
+        'nvenc-helper',
+        'src/nvenc-helper.c',
+        'src/nvenc-ipc-client.c',   # for nvenc_ipc_get_socket_path
+        dependencies: helper_deps,
+        install: true,
+        install_dir: get_option('libexecdir'),
+    )
+endif
+
+# Tests (native builds only, not cross-compiled)
+if not meson.is_cross_build()
+    libva_test_deps = [
+        dependency('libva'),
+        dependency('libva-drm'),
+        cc.find_library('m', required : false),
+    ]
+
+    test_encode = executable('test_encode', 'tests/test_encode.c',
+        dependencies : libva_test_deps, install : false)
+    test('encode', test_encode, timeout : 60)
+
+    test_encode_config = executable('test_encode_config', 'tests/test_encode_config.c',
+        dependencies : libva_test_deps, install : false)
+    test('encode_config', test_encode_config, timeout : 60)
+
+    gst_launch = find_program('gst-launch-1.0', required : false)
+    if gst_launch.found()
+        test('gstreamer', find_program('tests/test_gstreamer.sh'),
+             timeout : 120,
+             env : ['GST_VAAPI_ALL_DRIVERS=1', 'LIBVA_DRIVER_NAME=nvidia'])
+    endif
+endif
+
 meson.add_devenv(environment({
     'NVD_LOG': '1',
     'LIBVA_DRIVER_NAME': 'nvidia',

nvenc-helper.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=NVENC encode helper for nvidia-vaapi-driver
+Documentation=https://github.com/efortin/nvidia-vaapi-driver
+After=graphical-session.target
+
+[Service]
+Type=simple
+ExecStart=/usr/libexec/nvenc-helper
+Restart=on-failure
+RestartSec=2
+
+[Install]
+WantedBy=graphical-session.target