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
11 changes: 10 additions & 1 deletion doc/bin/cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,16 @@ moq --connect https://relay.example.com/rooms/1 --connect-token "$TOKEN" --broad
The `ts`, `fmp4`, and `flv` imports publish the input's own timestamps, mapped
to the wall time the first frame arrived. A timeline that rewinds, such as a
restarted encoder or a looping file wrapping to the top, ends the import with
an error; run it again to publish anew. A flagged MPEG-TS discontinuity that
an error; run it again to publish anew. `import ts` and `import srt` republish
instead when an MPEG-TS clock steps onto another timeline: the PCR and every
stream stepping back, flagged or not, or more than 10 s forward without a
`discontinuity_indicator`. The broadcast finishes there, and the rest of the
input publishes as a new instance under a new
[epoch](/concept/moq-lite#publisher-epochs), on the same SRT connection, which
`export ts --stitch --follow` carries on into. An unflagged step usually means
redundant encoders behind a changeover switch: time-lock their clocks, or have
the switch set `discontinuity_indicator`. `--program all` and `--passthrough`
still end at a rewind. A flagged MPEG-TS discontinuity that
jumps forward continues the broadcast and is declared on the exported clock.
MPEG-TS timestamps follow their source history across the 33-bit wrap
(every 26.5 hours), including files imported faster than real time and flagged
Expand Down
4 changes: 3 additions & 1 deletion doc/lib/rs/moq-mux.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ stream whose decoder identity changes, such as an SPS with a new profile or leve
or an audio header with a new sample rate, continues under a new track name
(`<name>/<n>` for the codec importers) while the old track ends; everything else,
such as the coded size, updates the rendition in place. A
timeline that rewinds ends the import. fMP4 export fixes its track
timeline that rewinds ends the import. The MPEG-TS import ends at a clock step
onto another timeline with `ts::Restart`, which carries the input from the step
for the caller to publish as a new broadcast. fMP4 export fixes its track
set at the init segment, so a new rendition or a changed configuration ends the
export. The [CLI page](/bin/cli#import) covers these and the MPEG-TS specifics:
one program per broadcast, private PES, damaged packets, and feed checks.
Expand Down
1 change: 0 additions & 1 deletion quest/m1/ts-reliability/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ catalog linger (#5305).

## Required

- [A timebase step restarts the TS import](/quest/m1/ts-reliability/step-restart.md) - an unflagged step or a rewind republishes under a new epoch instead of ending the import and every subscriber's export
- [A restart keeps its catalog](/quest/m1/ts-reliability/restart-catalog.md) - a restarted import publishes its catalog with its first media
- [PAT changes](/quest/m1/ts-reliability/pat-lifecycle.md) - a running export follows a moved PMT PID
- [A small step back keeps the TS export's video](/quest/m1/ts-reliability/step-back.md) - the export re-acquires on a sub-group step back from any source instead of dropping its video
Expand Down
4 changes: 0 additions & 4 deletions quest/m1/ts-reliability/restart-catalog.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,3 @@ Tests: replaying a step through the supervisor, the second epoch's catalog
is published with its first group.

Public API: none. Wire: none.

## Required

- [A timebase step restarts the TS import](/quest/m1/ts-reliability/step-restart.md) - the restart this speeds up
8 changes: 2 additions & 6 deletions quest/m1/ts-reliability/step-back.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,12 @@ The fix belongs where video decode time is reconstructed, not in the jitter
buffer: the step has to reach the jitter buffer as a regression it can act
on.

[A timebase step restarts the TS import](/quest/m1/ts-reliability/step-restart.md)
turns any rewind from a TS or SRT import into a new epoch, so this remains
Since [moq-dev/moq#7144](https://github.com/moq-dev/moq/pull/7144), a TS or SRT
import turns any rewind into a new epoch, so this remains
for every other source (fMP4, MKV, FLV, RTMP, hang publishers). Kept a
separate quest for that reason.

Tests: an end-to-end TS export of an H.264 + AAC source with the −560 ms
step, which fails on main and keeps video rendering with the fix.

Public API: none. Wire: none.

## Related

- [A timebase step restarts the TS import](/quest/m1/ts-reliability/step-restart.md) - handles a TS or SRT source's rewind at import
61 changes: 0 additions & 61 deletions quest/m1/ts-reliability/step-restart.md

This file was deleted.

3 changes: 1 addition & 2 deletions rs/moq-cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -751,8 +751,7 @@ fn spawn_import(
let name = require_broadcast(name, "import ts --program all")?;
Publish::ts_programs(origin.clone(), moq_net::Path::new(&name)?, config)
} else {
let broadcast = origin.create_broadcast(&name).context("failed to create broadcast")?;
Publish::from_publication(broadcast, &format, config)?
Publish::stdin(origin, &name, &format, config)?
}
.with_linger(linger);
publish.announce(epoch)?;
Expand Down
Loading
Loading