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: 3 additions & 0 deletions py/moq-rs/docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
suppress_warnings = ["autodoc.mocked_object"]

autosummary_generate = True
# The `moq.media.catalog` and `moq.media.Catalog` stubs collide on
# case-insensitive filesystems (macOS), so the function's stub gets its own name.
autosummary_filename_map = {"moq.media.catalog": "moq.media.catalog-function"}
autodoc_typehints = "description"
autodoc_member_order = "bysource"
napoleon_google_docstring = True
Expand Down
42 changes: 0 additions & 42 deletions quest/m0/macos-check.md

This file was deleted.

2 changes: 1 addition & 1 deletion rs/moq-audio/src/capture.rs
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ fn opening_error(error: cpal::Error, device: &str, layout: Layout) -> Error {
///
/// Backends stay private behind the shared capture producer.
#[cfg_attr(
test,
all(test, not(target_os = "macos")),
expect(
clippy::large_enum_variant,
reason = "a synthetic stream has no device allocation; one enum per capture"
Expand Down
4 changes: 0 additions & 4 deletions rs/moq-bench/src/host.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ impl std::str::FromStr for PositiveDuration {
/// Sample CPU, memory, context-switch and UDP socket counters for a running process.
#[derive(usage_rs::Args, Clone, Debug)]
#[usage(unknown_flags = "error", args_override_self = false)]
#[cfg_attr(
not(target_os = "linux"),
expect(dead_code, reason = "only the Linux sampler reads the arguments")
)]
pub struct Args {
/// Sample these PIDs. When set, --name is ignored.
#[usage(long)]
Expand Down
7 changes: 5 additions & 2 deletions rs/moq-c/src/video.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1466,8 +1466,11 @@ mod tests {
.with_catalog(moq_mux::catalog::hang::Catalog::<moq_mux::catalog::hang::Extra>::default());
let catalog = moq_mux::catalog::Producer::new(&mut broadcast, config).unwrap();
let consumer = broadcast.consume();
// Probed rather than hand-built, so the test track carries what a real one would.
let encode = moq_video::encode::Config::new(320, 240, moq_video::FrameRate::new(30, 1).unwrap());
// Probed rather than hand-built, so the test track carries what a real one would. Software,
// like the encoders the tests open: a hardware default (VideoToolbox on macOS) declares
// another profile, so the first software frame would already move to a new track.
let mut encode = moq_video::encode::Config::new(320, 240, moq_video::FrameRate::new(30, 1).unwrap());
encode.kind = moq_video::encode::Kind::Software;
let rendition = encode.probe().await.unwrap();
let reserved = catalog.reserve().with_interval(encode.effective_join());
let track = broadcast
Expand Down
8 changes: 5 additions & 3 deletions sh/cpp/check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,15 @@ if [[ "$(uname -s)" == MINGW* || "$(uname -s)" == MSYS* ]]; then
exit 0
fi

# The samples in doc/lib/cpp compile against the installed headers.
# The samples in doc/lib/cpp compile against the installed headers. These compile-only steps
# use -c rather than -fsyntax-only: the Nix cc-wrapper adds its link flags unless it sees -c,
# and clang -Werror rejects them as unused.
bash ../doc/lib/samples.sh cpp ../doc/lib/cpp/index.md >"$build/doc-samples.cpp"
"${CXX:-c++}" -std=c++17 -fsyntax-only -Wall -Werror -include moq/test/doc-samples.hpp \
"${CXX:-c++}" -std=c++17 -c -o /dev/null -Wall -Werror -include moq/test/doc-samples.hpp \
-I"$prefix/include" "$build/doc-samples.cpp"

# The nightly runs the binding benchmark; compiling it here catches wrapper drift per PR.
"${CXX:-c++}" -std=c++20 -fsyntax-only -Wall -Werror -I"$prefix/include" moq/bench/main.cpp
"${CXX:-c++}" -std=c++20 -c -o /dev/null -Wall -Werror -I"$prefix/include" moq/bench/main.cpp

if command -v pkg-config >/dev/null 2>&1; then
pc="$prefix/lib/pkgconfig/moq-cpp.pc"
Expand Down
3 changes: 2 additions & 1 deletion sh/js/audit.test.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
class Audit(unittest.TestCase):
def run_audit(self, failing):
with tempfile.TemporaryDirectory() as directory:
root = Path(directory)
# Resolved, since macOS's /tmp is a symlink and `bun` logs the shell's $PWD.
root = Path(directory).resolve()
for project in PROJECTS:
(root / project).mkdir(parents=True, exist_ok=True)
tools = root / "bin"
Expand Down