Skip to content
Closed
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
19 changes: 12 additions & 7 deletions rs/moq-rtc/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@ mod tests {

#[tokio::test]
async fn whip_and_whep_round_trip_opus() {
let source_origin = moq_net::Origin::random().produce();
let source_origin = moq_tokio::origin::spawn(moq_net::Hop::random());
let source_consumer = source_origin.consume();
let mut announcements = source_consumer.announced();
let mut source = source_origin
.create_broadcast("source", moq_net::broadcast::Route::new().with_announce(true))
.create_broadcast("source")
.expect("create source broadcast");
let catalog = moq_mux::catalog::Producer::new(&mut source).expect("create source catalog");
let mut opus = crate::codec::opus::Bridge::new(source, catalog, 48_000, 2).expect("create Opus bridge");
Expand All @@ -101,15 +101,20 @@ mod tests {
},
)
.expect("publish source packet");

// Create, populate, announce: the route goes out once the tracks exist.
let _source_route = source_origin
.announce("source", moq_net::origin::Route::default())
.expect("announce source");
let announcement = tokio::time::timeout(TIMEOUT, announcements.next())
.await
.expect("source announcement timed out")
.expect("source origin closed");
assert_eq!(announcement.path.as_str(), "source");
assert!(announcement.broadcast.is_some(), "source was unannounced");
assert_eq!(announcement.prefix.as_path().as_str(), "source");
assert!(announcement.active, "source was unannounced");
drop(announcements);

let server_origin = moq_net::Origin::random().produce();
let server_origin = moq_tokio::origin::spawn(moq_net::Hop::random());
let server = Server::new(
server::Config::default(),
server_origin.clone(),
Expand All @@ -131,9 +136,9 @@ mod tests {
.expect("WHIP negotiation timed out")
.expect("WHIP negotiation failed");

let output_origin = moq_net::Origin::random().produce();
let output_origin = moq_tokio::origin::spawn(moq_net::Hop::random());
let output = output_origin
.create_broadcast("output", moq_net::broadcast::Route::new().with_announce(true))
.create_broadcast("output")
.expect("create output broadcast");
let output_consumer = output.consume();
let whep = format!("http://{address}/whep/ingested").parse().expect("WHEP URL");
Expand Down
10 changes: 8 additions & 2 deletions rs/moq-video/src/encode/producer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -593,8 +593,14 @@ mod tests {
async fn idle_capture_publishes_a_discontinuity_before_resume() {
let mut broadcast = moq_net::broadcast::Info::new().produce();
let catalog = moq_mux::catalog::Producer::new(&mut broadcast).unwrap();
let track = broadcast.create_track("video", catalog.track_info()).unwrap();
let consumer = track.subscribe(None);
let track = broadcast
.create_track("video", catalog.track_info(hang::catalog::PRIORITY.video))
.unwrap();
// The test walks the finished track after the fact, so it needs a subscriber that tolerates
// a backlog. The default budget is `Duration::ZERO`, which sheds the empty marker the moment
// the resumed group stamps its reach; a live consumer takes it as the edge instead.
let subscription = moq_net::track::Subscription::default().with_max_age(std::time::Duration::from_secs(60));
let consumer = track.subscribe(subscription);

let mut config = Config::new(320, 240, 30);
config.kind = encoder::Kind::Software;
Expand Down
Loading