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
7 changes: 7 additions & 0 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ jobs:
timeout-minutes: 60
env:
NEXTEST_PROFILE: ci
# No auto maintenance in this throwaway checkout. Checkout disables gc
# only in the superproject, so the moq submodule's fetch leaves a
# detached maintenance that rewrites its shallow file mid-unshallow,
# failing the pin check.
GIT_CONFIG_COUNT: 1
GIT_CONFIG_KEY_0: maintenance.auto
GIT_CONFIG_VALUE_0: false

steps:
- name: Checkout
Expand Down
63 changes: 38 additions & 25 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions bun.lock

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

2 changes: 1 addition & 1 deletion moq
Submodule moq updated 1472 files
45 changes: 45 additions & 0 deletions quest/m0/pin-moq-tip.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# [M] The studio catches up to moq's main

## Goal

The `moq` submodule points at moq's current `main`, past
[moq-dev/moq#8931](https://github.com/moq-dev/moq/pull/8931), with the
studio building on it: the health grade and failover keep working, through
public moq APIs rather than a workaround.

## Plan

Decided 2026-11-18 (maintainer, on
[moq-dev/studio#208](https://github.com/moq-dev/studio/pull/208)): ✅ land
#208's pin at `81e43217c` and catch up to the tip here (rejected: holding
#208 for the tip).

Once the wait clears, run `just upgrade-moq` in its own PR and absorb the
tip's breaks, as tried on #208:

- `encode::Producer` became `encode::Publisher`
([moq-dev/moq#8964](https://github.com/moq-dev/moq/pull/8964)).
- `Info::with_refresh` became a `Refresh`
([moq-dev/moq#9054](https://github.com/moq-dev/moq/pull/9054)), so
`ladder::Joins` is rewritten on `Demand::poll_refresh`.
- Route `Preference` became `Priority`, `Key::to_public` became `public`, and
`Demand::wanted` became a bool.
- `Stream::check_failover` (`rs/moq-studio/src/stream.rs`) moves to moq's
public `lite::Version` instance query, and the health grade
(`health.rs`, `engine/air.rs`, `setup.rs`, `fx.rs`) to the republished
`hang::health`.

Matching the version string instead of the instance query is rejected: it
hard-codes `moq-lite-07-wip`.

## Waiting

- moq-dev/moq: `hang::health` is public again, as
[Client health in use](https://github.com/moq-dev/moq/blob/main/quest/m3/stats/health-consumers.md)
plans ([moq-dev/moq#8956](https://github.com/moq-dev/moq/pull/8956) made it
private). Check: `rs/hang/src/lib.rs` on moq's `main` exports `health`.
- moq-dev/moq: a public way to ask whether a `lite::Version` carries
instances ([moq-dev/moq#8931](https://github.com/moq-dev/moq/pull/8931) made
`has_instance` crate-private). Its quest is pending planning in moq's m1, so
it does not gate moq's 0.22.0 cut. Check: moq's `main` has a public query
`Stream::check_failover` can call.
16 changes: 8 additions & 8 deletions rs/moq-scene/src/publish.rs
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ async fn copy(
// The group ends at what it holds, where the source
// has not said.
_ = stop.changed() => {
drop(copy.close()?);
drop(copy.finish()?);
break 'groups;
}
};
Expand All @@ -575,8 +575,8 @@ async fn copy(
// The copy ends where the source ended its group, when it said,
// so a paused source's last picture ages out of the copy too.
match group.end() {
Some(end) => drop(copy.finish(end)?),
None => drop(copy.close()?),
Some(end) => drop(copy.finish_at(end)?),
None => drop(copy.finish()?),
}
}
out.clone().finish().map(drop)
Expand Down Expand Up @@ -664,7 +664,7 @@ impl<'a> Listing<'a> {
while let Some(mut catalog) = updates.next().await? {
// Media timing is the root's: the one clock, and the join interval an
// HLS export numbers its segments on.
catalog.media = Default::default();
catalog.sync = Default::default();
// The claim is checked inside the mutation, so a newer source's
// writes, made under the same lock, are never overwritten.
studio.mutate(|root| {
Expand Down Expand Up @@ -1449,7 +1449,7 @@ mod tests {
let snapshot = listed(&catalog, |sources| sources.len() == 2).await;
assert!(snapshot.video.renditions.is_empty(), "no source is a program rendition");
let published = &snapshot.ext.studio.sources;
assert!(published["red"].media.is_empty(), "the root carries the media timing");
assert!(published["red"].sync.is_empty(), "the root carries the media timing");
assert_eq!(sources.get("red").unwrap().track(), Some(Status::Live));
assert_eq!(sources.get("guest").unwrap().track(), None);
assert!(sources.get("red copy").is_none(), "a clone opens no feed, so no track");
Expand Down Expand Up @@ -1578,15 +1578,15 @@ mod tests {
for (start, appended) in [(1_000, true), (3_000, true), (5_000, false)] {
// Nothing says what lies between 3 000 and 5 000.
let group = match appended {
true => source.append_group(start),
true => source.append_group(moq_net::Timestamp::from_micros(start).unwrap()),
false => source.create_group(moq_net::group::Info { start }),
};
// The first group says where it ends; the others only close.
let group = group.unwrap();
drop(
match start {
1_000 => group.finish(2_000),
_ => group.close(),
1_000 => group.finish_at(2_000),
_ => group.finish(),
}
.unwrap(),
);
Expand Down
Loading