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
3 changes: 2 additions & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ jobs:
# 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.
# `rs cli-export` runs moq-cli's export process tests, which take tens of seconds of real time.
# `rs hls-conformance` probes every segment moq-hls serves with ffprobe, against its playlists and manifest.
# `gate` runs the queue's Check over every package, catching what a
# diff-scoped queue run let into main.
# `rs send-depth` proves moq-net's futures Send at the default recursion
Expand All @@ -351,7 +352,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 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", "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
2 changes: 2 additions & 0 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ moq-vaapi = "0.1.0"
# that argument, so moq-ffi and moq-c opt NVIDIA and VAAPI back in (OpenH264
# through their own `openh264` feature, which release builds enable).
moq-video = { version = "0.1.10", path = "rs/moq-video", default-features = false }
mp4-atom = "0.17.0"
nix = { version = "0.31.3", features = ["net", "socket", "uio"] }
# Upstream noq-proto, only for iroh's controller factory types.
noq-proto = { version = "1.2", default-features = false }
Expand Down
7 changes: 6 additions & 1 deletion quest/m0/hls-media-grid.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ start, consumers.md swaps the first-frame pts for the group start.
`moq import capture`, whose audio has been on demand since
[moq-dev/moq#7238](https://github.com/moq-dev/moq/pull/7238)) starts capture
and gets a playlist with both renditions.
- Convert the nightly segment conformance test
(`rs/moq-hls/tests/integration/conformance.rs`, `just rs hls-conformance`),
which declares its segment duration with `with_hls`. Extend it to check that
every rendition of its unaligned ladder shares the grid's segment numbers
while its segment boundaries follow its own keyframes (moved here from the
conformance quest when that test landed, 2026-11-02).
- Convert the HLS recorder (`rs/moq-cli/src/hls/record.rs`). Update the hang
draft and the HLS, CLI, and archive docs this makes stale, including
`doc/concept/archives.md`, whose HLS paragraph says a recording needs its
Expand All @@ -79,5 +85,4 @@ tracks, adds `media.join.interval`, and moves `clock` to `media.clock`.
## Related

- [Consumers by start](/quest/m1/time-addressing/consumers.md) - later swaps the first-frame pts for group starts
- [HLS and DASH segment conformance](/quest/m1/hls-conformance.md) - the nightly probes validate this segmentation
- [HLS export follows a resolution change](/quest/m1/hls-reinit-same-codec.md) - its hand-over race is reconsidered without records
1 change: 0 additions & 1 deletion quest/m1/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ per-frame CPU growth since #5926.
- [Main is no slower than release](/quest/m1/release-perf/README.md) - every benchmark where main is slower than release is fixed or accepted with a reason, checked by a final paired run before the cut
- [Interop coverage](/quest/m1/interop-coverage/README.md) - the riskiest moq-transport features moq-net exposes get cross-implementation tests over drafts 18, 20, and 22
- [Calibrate the paired nightly benchmarks](/quest/m1/bench-ci.md) - A/A and deliberately slowed Nightly runs set the paired comparison's threshold, so its regression alerts can be trusted
- [HLS and DASH segment conformance](/quest/m1/hls-conformance.md) - nightly ffprobe checks that advertised timing, sync flags, and bytes match the media served
- [Unbounded groups](/quest/m1/unbounded-groups/README.md) - groups and frames lose their size caps; a group keeps a 32 MB tail, and readers behind it replay through paced flights or refresh
- [A follower is told when the serving instance's route leaves](/quest/m1/instance-leave-restart.md) - wire-level tests pin the restart a follower gets when the serving instance's route is withdrawn or dies while another instance's remains
- [Poll-first async](/quest/m1/poll-first/README.md) - library crates compile no coroutines by default: async wrappers are generated from `poll_*` and gated behind an `async` feature
Expand Down
51 changes: 0 additions & 51 deletions quest/m1/hls-conformance.md

This file was deleted.

8 changes: 3 additions & 5 deletions quest/m1/hls-reinit-same-codec.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

When a rendition changes resolution (or any other decoder-affecting field) while keeping its codec string, the first group after the change is listed under the new init and segment tag, whichever of the catalog and the HLS records reaches the export first.

The conformance test in [moq-dev/moq#7387](https://github.com/moq-dev/moq/pull/7387) is the end-to-end regression test: its `video1` same-codec switch must pass.
A regression test delivers the new config's first group to the export ahead of the catalog update and finds it under the new init.

## Plan

Expand All @@ -14,12 +14,10 @@ What remains is the hand-over race. The catalog and the records are separate tra

The maintainer decided on 2026-11-02 to remove the catalog's `hls` field (`rs/hang/src/catalog/hls.rs` and the JS zod schema); that removal is now [HLS export on a declared grid](/quest/m0/hls-media-grid.md). It changes how the export finds a rendition's records, so the hand-over pick is designed after it lands, not with a catalog `start` field, a record track per config, or a marker in each record (all three dropped the same day).

The nightly conformance test (`rs/moq-hls/tests/integration/conformance.rs`, from [moq-dev/moq#7387](https://github.com/moq-dev/moq/pull/7387)) passes its `video1` same-codec switch, but it neither forces nor observes which of the catalog update and the new config's first group reaches the export first. It is not a test of the race, so the fix needs its own test that forces that order.

Public API: none expected. Wire: decided by the removal plan.

## Required

- [HLS export on a declared grid](/quest/m0/hls-media-grid.md) - the catalog's `hls` field and record tracks go away first

## Related

- [HLS and DASH segment conformance](/quest/m1/hls-conformance.md) - the test that found it, which waits on this
7 changes: 4 additions & 3 deletions quest/m2/dash-reconfigure.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ Choose during implementation by which dash.js and the conformance test
accept without a reload, and record the choice in the PR. Reuse the
predecessor window #7436 adds rather than tracking a second one, and update
`doc/bin/hls.md`. Test that a reconfigure keeps the old segments listed in
the manifest, and extend the DASH checks of
[HLS and DASH segment conformance](/quest/m1/hls-conformance.md) if it has
landed.
the manifest. The segment conformance test
(`rs/moq-hls/tests/integration/conformance.rs`) compares each DASH timeline
with the recorded segments but exempts a retired instance's last segment,
which the manifest never lists today; drop that exemption.

Public API: none. Wire: none.

Expand Down
4 changes: 0 additions & 4 deletions quest/m2/fmp4-declared-clock.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,3 @@ Decided 2026-11-01 (maintainer, follow-up planning after the 2026-11-01 /quest-a
- Keep #7491's tests (`tfdt` never steps back across sub-GOP fragments, ffprobe reads every fragment) and add a variable-rate B-frame case with a stall longer than the cadence, whose decode times follow the presentation slots across the stall. `DeclaredClock` derives DTS from PTS and depth alone, so a gap that only the encoder's own decode times would show is out of reach and not a goal.

Public API: none. Wire: none.

## Related

- [HLS and DASH segment conformance](/quest/m1/hls-conformance.md) - its nightly ffprobe checks would catch a regression here
8 changes: 2 additions & 6 deletions quest/m2/hls-player-test.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,9 @@ advancing at real time.
## Plan

From the 2026-10-24 moq-hls audit. Decided with the maintainer on 2026-10-24:
it follows [segment conformance](/quest/m1/hls-conformance.md), reusing its
broadcast fixture, and stays nightly since a browser run is slow. Impair the
it follows segment conformance (`rs/moq-hls/tests/integration/conformance.rs`),
reusing its broadcast fixture, and stays nightly since a browser run is slow. Impair the
path with bufferbloat (a rate limit below the media bitrate behind a deep,
finite queue) to drive a down-switch.

Public API: none. Wire: none.

## Required

- [Segment conformance](/quest/m1/hls-conformance.md) - the fixture and manifest-to-media agreement this builds on
4 changes: 0 additions & 4 deletions quest/m2/hls-trailing-gap.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,3 @@ A media playlist that ends with `EXT-X-ENDLIST` no longer lists a zero-duration
Found by the conformance test in [moq-dev/moq#7387](https://github.com/moq-dev/moq/pull/7387), which allows the gap because the export writes it by design: a track's end writes a zero-duration stop record. Decided 2026-10-30 (maintainer, follow-up planning after the /quest-afk run). Keep the stop record; omit it from the rendered playlist when `EXT-X-ENDLIST` follows, and drop the conformance test's allowance.

Public API: none. Wire: none.

## Related

- [HLS and DASH segment conformance](/quest/m1/hls-conformance.md) - the test that allows the gap today
5 changes: 5 additions & 0 deletions rs/justfile
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,11 @@ send-depth:
cli-export *args:
just rs test -p moq-cli --test integration --run-ignored only -E 'test(/^export::/)' "$@"

# Probe every segment moq-hls serves with ffprobe against its HLS playlists and DASH manifest.
[positional-arguments]
hls-conformance *args:
just rs test -p moq-hls --test integration --run-ignored only -E 'test(/^conformance::/)' "$@"

# Exercise small connection and stream receive windows over real QUIC sockets.
quic-stress:
just rs test -p moq-tokio --lib --run-ignored only -E 'test(/^quic::driver::tests::stress_/)'
Expand Down
2 changes: 2 additions & 0 deletions rs/moq-hls/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ futures = { workspace = true }
moq-archive = { path = "../moq-archive" }
moq-json = { path = "../moq-json" }
moq-tokio = { path = "../moq-tokio", default-features = false, features = ["tcp", "quic", "aws-lc-rs"] }
mp4-atom = { workspace = true }
tempfile = { workspace = true }
tokio = { workspace = true, features = ["test-util"] }
tower = { version = "0.5", features = ["util"] }
tracing-test = { workspace = true }
Expand Down
Loading
Loading