Merge origin/dev into the Windows D3D11 backend branch

Dev landed #1720 (VAAPI reintroduction), which reworked the same moq-video
files. The merge is clean: the Windows Media Foundation encoder and the Linux
VAAPI encoder sit on separate cfg-gated candidate lines, and the Frame enum
gains both Surface/Texture without collision.

Re-ran taplo afterward, which normalized two column-width-150 arrays the merge
surfaced: deny.toml's allow-git list (collapsed) and the cros-codecs dependency
features in moq-video's Cargo.toml (expanded).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: kixelated

Cargo.lock

@@ -109,3 +109,9 @@ strip = true
 # doesn't have that feature yet, so consume a fork branch until it's merged.
 [patch.crates-io]
 nvidia-video-codec-sdk = { git = "https://github.com/kixelated/nvidia-video-codec-sdk.git", branch = "dynamic-loading" }
+# moq-video's `vaapi` feature uses discord/cros-codecs (`vaapi_dlopen`), which
+# pulls cros-libva 0.0.13. The `dlopen` feature it needs (load libva at runtime
+# so a vaapi-enabled binary still links without libva-dev and still loads on a
+# libva-less machine, falling back to software) lives only on discord's fork, so
+# point the published 0.0.13 at it. Drop once `dlopen` is upstreamed.
+cros-libva = { git = "https://github.com/discord/cros-libva.git", branch = "discord-0.0.13" }

Cargo.toml

@@ -70,4 +70,8 @@ allow-registry = ["https://github.com/rust-lang/crates.io-index"]
 # moq-video patches nvidia-video-codec-sdk to a fork that adds dlopen
 # (`dynamic-loading`); see the root Cargo.toml [patch.crates-io]. Drop this once
 # the feature is upstreamed and the patch is removed.
-allow-git = ["https://github.com/kixelated/nvidia-video-codec-sdk"]
+#
+# The `vaapi` feature pulls discord/cros-codecs (the maintained fork: cros-libva
+# 0.0.13 + a hardened H.264 VAAPI encoder) and patches cros-libva to discord's
+# fork for the `dlopen` feature. Drop these once `dlopen` is upstreamed.
+allow-git = ["https://github.com/kixelated/nvidia-video-codec-sdk", "https://github.com/discord/cros-codecs", "https://github.com/discord/cros-libva"]

deny.toml

@@ -90,9 +90,9 @@ moq-cli publish --url https://relay.example.com --broadcast cam.hang capture --n
 
 Video capture uses a native per-platform backend (AVFoundation on macOS, V4L2 on
 Linux, Media Foundation on Windows) and picks a hardware H.264 encoder
-(VideoToolbox on macOS, NVENC on Linux NVIDIA) when one is present, falling back
-to the built-in software encoder (openh264); force either with `--hardware` /
-`--software`. `--camera` takes a bare integer as a device index, otherwise a
+(VideoToolbox on macOS, NVENC on Linux NVIDIA, VAAPI on Linux Intel/AMD) when one
+is present, falling back to the built-in software encoder (openh264); force either
+with `--hardware` / `--software`. `--camera` takes a bare integer as a device index, otherwise a
 device path (Linux) or name (a friendly-name substring on Windows, the
 AVFoundation `uniqueID` on macOS). Audio capture uses cpal (CoreAudio / WASAPI /
 ALSA) and encodes Opus.

doc/bin/cli.md

@@ -104,6 +104,10 @@
             # cpal's `alsa-sys` (moq-audio `capture` feature) links libasound on
             # Linux via pkg-config; macOS uses CoreAudio, so no dep there.
             pkgs.alsa-lib
+            # moq-video `vaapi` feature: cros-libva runs bindgen against the libva
+            # headers at build time (found via pkg-config), even though libva is
+            # dlopen'd at runtime (`vaapi_dlopen`). macOS has no VAAPI.
+            pkgs.libva
           ];
 
         # JavaScript dependencies

flake.nix

@@ -33,7 +33,17 @@ export class Consumer<T> {
 				this.#framesRead = 0;
 			}
 
-			const frame = await this.#group.readFrame();
+			let frame: Uint8Array | undefined;
+			try {
+				frame = await this.#group.readFrame();
+			} catch {
+				// The group was reset or we fell behind its eviction window. Resync from
+				// the next group, which begins with a fresh snapshot (frame 0), so no
+				// partial state is presented.
+				this.#group = undefined;
+				continue;
+			}
+
 			if (frame === undefined) {
 				// The group is exhausted; advance to the next one.
 				this.#group = undefined;

js/json/src/consumer.ts

@@ -7,23 +7,22 @@ async function main() {
 	// Create a broadcast (a collection of tracks)
 	const broadcast = new Moq.Broadcast();
 
+	// Insert the "chat" track up front. A subscriber is served directly from this
+	// track, no requested() round-trip needed. Mirrors the Rust createTrack/insertTrack.
+	publishTrack(broadcast.createTrack("chat"));
+
 	// Publish the broadcast to the connection
 	connection.publish(Moq.Path.from("my-broadcast"), broadcast);
 	console.log("Published broadcast: my-broadcast");
 
-	// Wait for subscription requests
+	// Tracks created on demand (instead of up front) are still supported: handle any
+	// subscribe for a track that wasn't statically inserted.
 	for (;;) {
 		const request = await broadcast.requested();
 		if (!request) break;
 
-		// Accept the request for the "chat" track
-		if (request.name === "chat") {
-			// accept() commits the track's immutable properties and returns the Track.
-			publishTrack(request.accept());
-		} else {
-			// Reject other tracks
-			request.reject(new Error("track not found"));
-		}
+		// Reject anything we didn't insert above.
+		request.reject(new Error("track not found"));
 	}
 }