Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .config/nextest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ test-group = "v4l2"
filter = "package(moq-ffi) & test(=bench::benchmark_ffi)"
slow-timeout = { period = "60s" }

# The shaped uplink crosses BBR3's max-bandwidth windows before waiting for recovery.
[[profile.default.overrides]]
filter = "package(moq-ffi) & test(/^test::rung::/)"
slow-timeout = { period = "120s", terminate-after = 2 }

# The receive-window benchmark sweeps a grid twice, once through a bottleneck
# whose rate bounds how fast a run can go, so it outlasts the hang budget.
[[profile.default.overrides]]
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,7 @@ jobs:
# viewer: diff-independent, since a break can arrive through the relay,
# js/net, or the wire between them.
# `rs quic-sim` sweeps moq-quic's simulated workloads from a fresh seed; PRs run a fixed 64.
# `rs rung-disable` proves FFI simulcast disable and recovery on a shaped BBR3 uplink.
# `test resume-model` sweeps resume against its model from a fresh seed; PRs run a fixed 64.
# It also runs the bandwidth probe's acceptance suite, of which PRs run the short cases.
# `test drill impaired` runs the relay drills over a freshly seeded shaper; PRs run loopback.
Expand All @@ -355,7 +356,7 @@ jobs:
# `rs v4l2` streams moq-video's V4L2 capture from the kernel's vivid
# virtual camera, a module load no pull request job should make.
# `js worklet-matrix` loads `?worklet` output through the bundlers pinned in test/worklet.
recipe: ["gate", "rs doctest --workspace", "rs send-depth", "test drill-sensitivity", "rs uring", "test drain", "test json-properties", "test resume-model", "rs quic-sim", "test drill impaired", "rs cli-export", "rs hls-conformance", "rs quic-stress", "rs audio-devices", "rs multicast", "rs render-sw", "test qmux", "rs v4l2", "js worklet-matrix"]
recipe: ["gate", "rs doctest --workspace", "rs send-depth", "test drill-sensitivity", "rs uring", "test drain", "test json-properties", "test resume-model", "rs quic-sim", "rs rung-disable", "test drill impaired", "rs cli-export", "rs hls-conformance", "rs quic-stress", "rs audio-devices", "rs multicast", "rs render-sw", "test qmux", "rs v4l2", "js worklet-matrix"]
include:
# Miri interprets kio's and moq-net's in-memory unsafe; too slow for the merge gate.
- recipe: rs miri
Expand Down
1 change: 1 addition & 0 deletions Cargo.lock

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

1 change: 0 additions & 1 deletion quest/m1/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ their end report, so an embedder's drain alert pages on real cuts.
- [Finalize moq-lite-07](/quest/m1/lite07-finalize.md) - when the maintainer cuts it, lite-07 negotiates as `moq-lite-07` and the next release ships it
- [Sockets](/quest/m1/socket/README.md) - a generic dial/accept `Socket` in moq-net, Rust, JS, and Python, with tracks as streams; moq-boy and CARLA move onto it
- [A smaller, safer API than release](/quest/m1/api-audit/README.md) - every surface added since release has a consumer or is gone, overlapping operations are collapsed, names mirror across Rust, JS, and the bindings, and every break says how to migrate
- [Native rung disable proof](/quest/m1/simulcast-rung-disable.md) - a shaped uplink through moq-ffi proves the top rendition stops and resumes over real BBR3 probing
- [Audio jitter target](/quest/m1/audio-jitter-target/README.md) - the playout target is default in both languages; time-stretched browser playback without steady-state underruns and a native trace replay remain
- [A/V clock](/quest/m1/av-clock.md) - the audio playhead drives Sync.reference while audio plays, through per-track sync handles
- [Container reads drop backfill](/quest/m1/read-backfill.md) - the JS container consumer drops groups below its read cursor like Rust
Expand Down
4 changes: 0 additions & 4 deletions quest/m1/c/api-gaps.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,3 @@ The independent JSON window caller timestamp gap is implemented in

Public API: moq-c gains pre-encoded rung disable, lower-rendition ordering,
and reservation rate control. Wire: none.

## Required

- [OBS rung disable](/quest/m1/simulcast-rung-disable.md) - land the shared importer and FFI prerequisites in [moq-dev/moq#7029](https://github.com/moq-dev/moq/pull/7029) before adding their C ABI counterparts
33 changes: 0 additions & 33 deletions quest/m1/simulcast-rung-disable.md

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,8 @@ grant; `Options::bandwidth` documents that
`300_000 * channels` (`backend/libopus.rs`, `rs/moq-audio/src/opus.rs`). `Policy::min` defaults to a tenth of
the ceiling (`rs/moq-mux/src/rate.rs`); for Opus it is the codec floor. A
grant below it disables the rendition until bandwidth recovers (decided
2026-10-04 with the enabled flag), through the disable and re-enable rule
[simulcast rung disable](/quest/m1/simulcast-rung-disable.md) puts beside
`Control` rather than a second one; the encoder never errors. Viewers with
2026-10-04 with the enabled flag), through the rung disable and re-enable
rule in `moq_mux::rate::Control` rather than a second one; the encoder never errors. Viewers with
no enabled alternative hold it ([push-to-talk](/quest/m1/push-to-talk/README.md)),
so its demand can stay while its grant is below the floor; recovery evaluates a
hypothetical share against the current estimate, as the ladder controller
Expand All @@ -68,7 +67,3 @@ one policy step, holds it on a `None` grant, and ramps back when the grant
returns; a grant below the Opus floor disables the rendition, and recovered
bandwidth enables it again even after the last viewer unsubscribed; a PCM Producer
ignores every grant.

## Required

- [Simulcast rung disable](/quest/m1/simulcast-rung-disable.md) - the shared disable and re-enable rule in `moq_mux::rate` that this quest reuses
4 changes: 0 additions & 4 deletions quest/m2/obs-multitrack-check.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,3 @@ OBS, so the manual run never happened.
each rendition advertises its own bitrate in the catalog.

Public API: none. Wire: none.

## Related

- [Simulcast rung disable](/quest/m1/simulcast-rung-disable.md) - the shaped-uplink proof of the rung disable [moq-dev/moq#7029](https://github.com/moq-dev/moq/pull/7029) added, which turns these layers off as the grant falls
3 changes: 1 addition & 2 deletions quest/m2/probe/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ publisher-local padding handle:
Decided with the maintainer on 2026-10-20:

- The send target, native probing,
and the native publishers' [rung disable](/quest/m1/simulcast-rung-disable.md)
and the native publishers' rung disable
moved to m1, so Rust, FFI, and OBS publishers recover a stopped rendition in
the next breaking release. Their rung disable needs the target and native
probing, not padding.
Expand Down Expand Up @@ -96,7 +96,6 @@ This README's own work, once the children land:

## Required

- [Native rung disable proof](/quest/m1/simulcast-rung-disable.md) - a shaped uplink through moq-ffi proves the top rendition stops and resumes over real BBR3 probing
- [Browser send estimate](/quest/m2/probe/browser-send-estimate.md) - shipping Chrome and Safari publishers adapt to the relay's PROBE estimate, since they have no `getStats()`
- [One page-wide getStats sampling ticker](/quest/m2/probe/stats-ticker.md) - a page's connections share one sampling ticker
- [Padding probes](/quest/m2/probe/padding.md) - a browser probes with a lowest-priority padding stream on an ALR schedule
Expand Down
2 changes: 1 addition & 1 deletion quest/m2/probe/padding.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Decided with the maintainer on 2026-10-17 (see the
implements the sender hook in `js/net`, mirroring Rust's
`transport::Probe`. Decided 2026-10-20: browser-only. A native session without
native probing (moq-quic under CUBIC) has no sender, so
[native rung disable](/quest/m1/simulcast-rung-disable.md) never stops a
the native rung disable (`moq_mux::rate::Policy::lower`) never stops a
rung there.
- **The browser's send target.** The `js/net` mirror of the Rust send
target (`Allocator::set_target`, `Session::bandwidth`, `transport::Probe`) lands here, beside the sender that
Expand Down
3 changes: 1 addition & 2 deletions quest/m2/probe/rung-disable-js.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ lower renditions keep their share instead of every rung degrading together.

## Plan

Split from [native rung disable](/quest/m1/simulcast-rung-disable.md) by the
Split from the native rung disable by the
maintainer on 2026-10-20: the native publishers moved to m1 on native
probing, while a browser can only probe with
[padding](/quest/m2/probe/padding.md), which stays in m2.
Expand All @@ -34,7 +34,6 @@ Public API: whatever knob `@moq/publish` exposes for the rule. Wire: none.

## Required

- [Native rung disable](/quest/m1/simulcast-rung-disable.md) - the shared rule and constants this mirrors
- [Padding probes](/quest/m2/probe/padding.md) - the browser's sender, which raises the estimate so a disabled rung can resume

## Related
Expand Down
4 changes: 2 additions & 2 deletions quest/m2/quic-realtime/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ spike assumed no consumer; teleoperation uplinks are one):
`probe_inflight`, so moq-quic's native probing
([moq-dev/moq#6635](https://github.com/moq-dev/moq/pull/6635)) still
raises its estimate, and the bake-off measures probing alongside queuing
delay. Reason: the [native rung disable](/quest/m1/simulcast-rung-disable.md)
delay. Reason: the native rung disable (`moq_mux::rate::Policy::lower`)
only stops a rung on a session with a sender, so a `Realtime` that cannot
probe would silently leave moq-cli, OBS, and FFI simulcast publishers with
no rung disable or recovery. A candidate that cannot probe does not ship.
Expand Down Expand Up @@ -116,7 +116,7 @@ Remaining work once the candidates finish (this README's own job):
estimate is its reference window over the RTT, not a delivery rate, so each
keyframe burst grew it past the path: 241 kB/s on a 125 kB/s path in #7547,
which let a rung with keyframes recover without a probe. The
[native rung disable](/quest/m1/simulcast-rung-disable.md) could re-enable
native rung disable could re-enable
a rung the path can't carry on such an estimate, so the comparison reports
each candidate's estimate against the path's capacity under the encoder
model.
Expand Down
4 changes: 4 additions & 0 deletions rs/justfile
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,10 @@ quic-sim:
# Each realtime congestion controller against BBR3 over sim replicas of the cellular presets: queueing delay, throughput, reaction to the drop, and share beside CUBIC.
bash sh/rs/nextest.sh cargo nextest run --locked --release -p moq-quic --lib --run-ignored only --no-capture -E 'test(/^tests::realtime::/)'

# Prove the FFI simulcast publisher disables and resumes over a shaped BBR3 uplink.
rung-disable:
just rs test -p moq-ffi --lib --run-ignored only --no-capture -E 'test(/^test::rung::/)'

# Prove downstream futures are Send at the default recursion limit on the
# flake's pinned nightly. Nightly runs it; the land gate does not.
send-depth:
Expand Down
4 changes: 2 additions & 2 deletions rs/moq-congestion/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,8 @@ pub struct Metrics {
pub pacing_rate: Option<u64>,
/// Estimated sustainable path bandwidth (bytes/s)
pub bandwidth_estimate: Option<u64>,
/// Bytes in flight up to which an application-limited sender may resend in-flight data,
/// while the controller probes for bandwidth (bytes)
/// Bytes in flight an application-limited sender may fill by resending in-flight data, the
/// last packet crossing it, while the controller probes for bandwidth (bytes)
///
/// `None` when the controller is not probing, or cannot learn from a sender that fills its
/// pacing with redundant data.
Expand Down
1 change: 1 addition & 0 deletions rs/moq-ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ uniffi = { workspace = true }
url = { workspace = true }

[dev-dependencies]
moq-shaper = { path = "../moq-shaper" }
# The video tests encode with OpenH264, the one encoder a GPU-less host has, so
# they turn it on without the `openh264` feature.
moq-video = { path = "../moq-video", features = ["openh264"] }
Expand Down
2 changes: 2 additions & 0 deletions rs/moq-ffi/src/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ use std::future::Future;
use std::sync::Arc;
use std::time::Duration;

mod rung;

/// `value` microseconds.
fn us(value: u64) -> MoqTimestamp {
MoqTimestamp {
Expand Down
Loading
Loading