Skip to content
Merged
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ moq-uring = { version = "0.0.12", path = "rs/moq-uring", default-features = fals
moq-v4l = { version = "0.1.0", path = "rs/moq-v4l" }
# Standalone crate (moq-dev/vaapi); vendored from cros-libva + cros-codecs.
# dlopen's libva at runtime (no libva-dev at build, no NEEDED libva in the binary).
moq-vaapi = "0.1.0"
moq-vaapi = "0.1.1"
# `default-features = false` is here for `capture` (V4L2, libclang), which the
# cross-compiled Python, Swift, Kotlin, and Go builds have no use for: adding
# `features = ["capture"]` to a consumer that ships in those bindings pulls the
Expand Down
11 changes: 10 additions & 1 deletion quest/m1/vendor-sync/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,19 @@ kixelated/cros-codecs, kixelated/openh264-rs, kixelated/fflate) and the
Public API: none expected; a ported fix that changes one says so. Wire: QUIC
behavior follows quinn's fixes.

VAAPI's completed cycle adopted crates.io `moq-vaapi 0.1.1` after
[the source fix](https://github.com/moq-dev/vaapi/pull/5) and
[read-only CI](https://github.com/moq-dev/vaapi/pull/6) merged. When re-creating
the next cycle, always include moq-dev/vaapi even though it is a crates.io
dependency outside this tree. Restore its Goal of auditing both ChromeOS
upstreams and publishing/adopting any needed fixes. Carry checked heads and
dispositions from [VAAPI's Upstream audit](https://github.com/moq-dev/vaapi/blob/v0.1.1/README.md#upstream),
which records cros-libva `59384456ac2ae78c0c3e5515f41ef1efd9b802cf` and
cros-codecs `a050c6cde530e563197ee9e3e72ab01f48a0c41f`.

## Required

- [UniFFI generator forks are current](/quest/m1/vendor-sync/uniffi.md) - the generator forks carry upstream's fixes until rust2 replaces them
- [moq-vaapi has every cros-codecs fix it needs](/quest/m1/vendor-sync/vaapi.md) - cros-libva and cros-codecs fixes reach moq-dev/vaapi

## Related

Expand Down
63 changes: 0 additions & 63 deletions quest/m1/vendor-sync/vaapi.md

This file was deleted.

6 changes: 3 additions & 3 deletions quest/m2/video-vaapi.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ surfaces.

Decided in the 2026-09-30 audit: moved from m4, and the "gated on a
`moq-dev/vaapi` release" blocker is gone. That crate is our own repo (last
release 0.1.0 on 2026-09-24), so this quest includes the crate work (HEVC
release 0.1.1 on 2026-11-04), so this quest includes the crate work (HEVC
encode, H.265 decode, pre-generated bindings, the resize pool) and cutting the
release, then bumping the workspace requirement here. The resize-pool quest
folds in for the same reason.

**Decode.** The H.264 decoder landed (`decode/backend/vaapi.rs`; the workspace pins moq-vaapi 0.1.0),
**Decode.** The H.264 decoder landed (`decode/backend/vaapi.rs`; the workspace pins moq-vaapi 0.1.1),
with the default `decode::Config::output` of `Output::Native` handing out
DMA-BUF surfaces the renderer imports without a download. H.265 decode is still missing, so a Linux box
without NVDEC has no hardware path for it.
Expand All @@ -30,7 +30,7 @@ Intel Meteor Lake. `just rs gpu` also runs the ignored
VPP to 720p/480p/360p, GPU encode of every frame, and decoded output sizes and
counts. What is left is H.265, below.

**H.265.** The VAAPI backend advertises H.264 only. `moq-vaapi` 0.1.0 vendors
**H.265.** The VAAPI backend advertises H.264 only. `moq-vaapi` 0.1.1 vendors
the HEVC buffer types (`src/buffer/hevc.rs`) but its `Encoder` is hardcoded to
`VAProfileH264Main` (with `VAEntrypointEncSlice`, or the low-power entrypoint
where that is all a device has), so exposing an HEVC encoder is a
Expand Down
4 changes: 2 additions & 2 deletions quest/m3/obs-linux-gpu.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ In m3 until the OBS encoder ships and a Linux user reports CPU readback as
the bottleneck.

- Start with an API feasibility probe. OBS exposes DMA-BUF import in `graphics.h`; that is not proof its compositor textures can be exported. Determine whether EGL/GL allocation export is available, or whether an upstream OBS hook or an encoder-owned exportable render target is required.
- moq-video encodes a `Surface::DmaBuf` on VAAPI without a download, and scales one through VPP (moq-vaapi 0.1.0). This quest still has to turn an OBS compositor texture into a DMA-BUF that import accepts.
- moq-video encodes a `Surface::DmaBuf` on VAAPI without a download, and scales one through VPP (moq-vaapi 0.1.1). This quest still has to turn an OBS compositor texture into a DMA-BUF that import accepts.
- Negotiate DRM device, fourcc, plane offsets/strides, modifiers, and synchronization. Reuse `Surface::DmaBuf` and the hardware encoder's real import path, retaining allocation ownership until completion. A borrowed fd or an importable packed RGB texture does not prove the encoder accepts NV12 on the same device.
- Prefer direct import; otherwise GPU-convert into exportable NV12 surfaces. Document and measure each GPU copy. Keep CPU staging as a visible fallback, not as the successful accelerated result.
- Validate at least one Intel/AMD VAAPI path on hardware before promising broad support. Scope NVIDIA/CUDA interoperability separately if it needs another allocation or synchronization strategy. Test unsupported modifiers, multi-plane buffers, fd closure, cancellation, device loss, resize, and repeated pool reuse.
Expand All @@ -24,4 +24,4 @@ the bottleneck.

- [Video hardware validation](/quest/m3/video-hardware.md) - native input and encoder acceptance need hardware evidence
- [VA-API encodes an external Vulkan image](/quest/m2/vaapi-vulkan-import.md) - explicit sync for an external DMA-BUF, and the public `DmaBuf` constructor from #4975
- [VAAPI encode and decode](/quest/m2/video-vaapi.md) - H.265 and checked-in bindings. The DMA-BUF encoder import this quest needs is already on main (moq-vaapi 0.1.0).
- [VAAPI encode and decode](/quest/m2/video-vaapi.md) - H.265 and checked-in bindings. The DMA-BUF encoder import this quest needs is already on main (moq-vaapi 0.1.1).
4 changes: 0 additions & 4 deletions rs/workspace-hack/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,6 @@ itertools = { version = "0.13" }
libc = { version = "0.2", features = ["extra_traits"] }
libspa = { version = "0.10", default-features = false, features = ["v0_3_33"] }
linux-raw-sys = { version = "0.12", features = ["auxvec", "elf", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "system", "xdp"] }
log = { version = "0.4", default-features = false, features = ["release_max_level_debug"] }
nix = { version = "0.31", features = ["net", "uio"] }
nom-15128469a54ed75a = { package = "nom", version = "7" }
pipewire = { version = "0.10", default-features = false, features = ["v0_3_53"] }
Expand Down Expand Up @@ -364,7 +363,6 @@ itertools = { version = "0.13" }
libc = { version = "0.2", features = ["extra_traits"] }
libspa = { version = "0.10", default-features = false, features = ["v0_3_33"] }
linux-raw-sys = { version = "0.12", features = ["auxvec", "elf", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "system", "xdp"] }
log = { version = "0.4", default-features = false, features = ["release_max_level_debug"] }
nix = { version = "0.31", features = ["net", "uio"] }
nom-15128469a54ed75a = { package = "nom", version = "7" }
pipewire = { version = "0.10", default-features = false, features = ["v0_3_53"] }
Expand Down Expand Up @@ -432,7 +430,6 @@ itertools = { version = "0.13" }
libc = { version = "0.2", features = ["extra_traits"] }
libspa = { version = "0.10", default-features = false, features = ["v0_3_33"] }
linux-raw-sys = { version = "0.12", features = ["auxvec", "elf", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "system", "xdp"] }
log = { version = "0.4", default-features = false, features = ["release_max_level_debug"] }
nix = { version = "0.31", features = ["net", "uio"] }
nom-15128469a54ed75a = { package = "nom", version = "7" }
pipewire = { version = "0.10", default-features = false, features = ["v0_3_53"] }
Expand Down Expand Up @@ -468,7 +465,6 @@ itertools = { version = "0.13" }
libc = { version = "0.2", features = ["extra_traits"] }
libspa = { version = "0.10", default-features = false, features = ["v0_3_33"] }
linux-raw-sys = { version = "0.12", features = ["auxvec", "elf", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "system", "xdp"] }
log = { version = "0.4", default-features = false, features = ["release_max_level_debug"] }
nix = { version = "0.31", features = ["net", "uio"] }
nom-15128469a54ed75a = { package = "nom", version = "7" }
pipewire = { version = "0.10", default-features = false, features = ["v0_3_53"] }
Expand Down
Loading