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
2 changes: 1 addition & 1 deletion rs/justfile
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ c-tests:
# Compile the workspace at the feature extremes.
features:
cargo check --locked --workspace {{ no_fuzz }} --all-targets --no-default-features
cargo hack check --locked -p moq-tokio --each-feature --features aws-lc-rs
cargo hack check --locked -p moq-tokio --each-feature --exclude-features _transport --features aws-lc-rs
cargo check --locked -p moq-relay --no-default-features
just rs relay-minimal
cargo check --locked -p moq-cli --no-default-features
Expand Down
2 changes: 1 addition & 1 deletion rs/moq-cli/src/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1717,7 +1717,7 @@ mod tests {
let Command::Play(play) = &cli.stages[0] else {
panic!("expected play")
};
assert_eq!(play.delay, Duration::from_millis(100));
assert_eq!(play.delay, Duration::from_millis(100).into());
assert_eq!(play.select.video_name.as_deref(), Some("hd"));
assert!(cli.moq.validate().is_ok());
assert!(play.validate().is_ok());
Expand Down
2 changes: 2 additions & 0 deletions rs/moq-relay/tests/lan_mesh.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
//! moq --connect http://127.0.0.1:4443 --connect-tls-insecure export ts > /dev/null
//! ```

#![cfg(feature = "cluster-lan")]

use std::time::Duration;

use moq_relay::cluster;
Expand Down
1 change: 1 addition & 0 deletions rs/moq-uring/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ harness = false
name = "echo_noq"
path = "benches/echo_noq.rs"
harness = false
required-features = ["noq"]

[[bench]]
name = "session_lite"
Expand Down
3 changes: 3 additions & 0 deletions rs/moq-uring/benches/echo_noq.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ mod linux {
// poll the endpoint again, leaving the peer to time out mid-CONNECT.
let (start_tx, start_rx) = std::sync::mpsc::channel::<tokio::sync::oneshot::Sender<()>>();
let client = std::thread::spawn(move || {
// Enabling `ring` beside `aws-lc-rs` (as `--all-features` does) leaves rustls no implicit
// default, and the builder would panic on this thread while the server waits forever.
let _ = rustls::crypto::aws_lc_rs::default_provider().install_default();
let runtime = tokio::runtime::Builder::new_current_thread()
.enable_all()
.build()
Expand Down
3 changes: 3 additions & 0 deletions rs/moq-uring/tests/echo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ fn echo_noq_peer() {
let (done_tx, done_rx) = tokio::sync::oneshot::channel();

let client = std::thread::spawn(move || {
// Enabling `ring` beside `aws-lc-rs` (as `--all-features` does) leaves rustls no implicit
// default, and the builder would panic on this thread while the server waits forever.
let _ = rustls::crypto::aws_lc_rs::default_provider().install_default();
let runtime = tokio::runtime::Builder::new_current_thread()
.enable_all()
.build()
Expand Down
2 changes: 1 addition & 1 deletion rs/moq-uring/tests/teardown.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
//! Kernel-gated: skips loudly below the Linux 6.12 floor (GitHub-hosted CI),
//! and runs everywhere else.

#![cfg(target_os = "linux")]
#![cfg(all(target_os = "linux", feature = "noq"))]

#[path = "support.rs"]
mod support;
Expand Down
2 changes: 1 addition & 1 deletion rs/moq-video/src/capture/mediafoundation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ impl Camera {
device = %device_name,
width,
height,
framerate,
framerate = ?framerate,
gpu = device.is_some(),
"opened Media Foundation capture"
);
Expand Down
4 changes: 2 additions & 2 deletions rs/moq-video/src/capture/pipewire.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1980,8 +1980,8 @@ mod tests {
.await
.unwrap_or_else(|error| panic!("read frame {i}: {error}"))
.unwrap_or_else(|| panic!("no frame {i}"));
assert_eq!(frame.width(), stream.width());
assert_eq!(frame.height(), stream.height());
assert_eq!(frame.surface.width(), stream.width());
assert_eq!(frame.surface.height(), stream.height());
}
eprintln!("captured 5 frames at {}x{}", stream.width(), stream.height());
}
Expand Down
5 changes: 2 additions & 3 deletions rs/moq-video/src/render/renderer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -583,12 +583,12 @@ mod tests {
let mut stream = crate::capture::open(&capture).await.expect("portal screen capture");

for index in 0..16 {
let surface = tokio::time::timeout(std::time::Duration::from_secs(5), stream.read())
let frame = tokio::time::timeout(std::time::Duration::from_secs(5), stream.read())
.await
.unwrap_or_else(|_| panic!("timed out waiting for frame {index}"))
.unwrap_or_else(|error| panic!("capture failed before frame {index}: {error}"))
.unwrap_or_else(|| panic!("capture ended before frame {index}"));
let Surface::DmaBuf(buffer) = &surface else {
let Surface::DmaBuf(buffer) = &frame.surface else {
panic!("frame {index} used shared memory instead of DMA-BUF");
};
assert!(
Expand All @@ -603,7 +603,6 @@ mod tests {
buffer.format().as_raw()
);

let frame = Frame::new(surface, Timestamp::ZERO);
let imported = renderer
.source
.import(&device, &frame.surface)
Expand Down
Loading