Skip to content

feat(mux): carry surround Opus through CMAF dOps - #7336

Merged
moq-bot[bot] merged 16 commits into
mainfrom
quest/m2/cmaf-opus-surround
Nov 1, 2026
Merged

moq-bot[bot] merged 16 commits into
mainfrom
quest/m2/cmaf-opus-surround

Conversation

@kixelated

@kixelated kixelated commented Oct 30, 2026 •

Copy link
Copy Markdown
Collaborator

Summary

Finishes quest/m2/cmaf-opus-surround.md: surround Opus now goes through fMP4.

  • Import: a dOps channel mapping table (mp4_atom::OpusChannelMapping) is checked into an opus::Mapping by the new fmp4::opus_mapping and written into the OpusHead description. Before, any nonzero family was refused with UnsupportedMappingFamily. The family limits come from opus::Mapping::new: family 1 allows at most 8 channels, and family 2 gets feat(mux): fill the catalog's VR fields on import #7308's RFC 8486 rules.
  • Export: synthesize_audio_trak writes the parsed head's table into dOps.channel_mapping where it used to refuse it.
  • Still refused, both ways: family 3. Its OpusHead carries a demixing matrix (RFC 8486 §3.2), but dOps has a plain table, so neither side can describe the other.
  • Tests: opus_dops_surround_round_trips builds a family 1 5.1 dOps with mp4-atom, imports it, checks the OpusHead table, and re-exports the same dOps with the table intact. opus_dops_mapping_the_head_cannot_describe_is_refused covers family 3 and a 9-channel family 1 table. synthesize_opus_trak_refuses_mapping_family_three replaces the old family 1 refusal test.
  • Quests: deletes this quest and its links. Rewrites fMP4 ambisonic layout to cover only what remains (fixtures proving family 2 imports as ambisonic), resizes it to XS, and unblocks it.

Public API: fMP4 import/export accept nonzero Opus mapping families (CHANGELOG updated). MoQ wire: none.

Based on #7308

moq-dev/moq#7308 landed on main (squashed as a116902), carrying the mp4-atom 0.17.0 bump with an explicit refusal of nonzero dOps families. The base's copy of this quest still directs replacing that refusal with the import and export here, so the merge of main took this PR's side in every conflict: dropping the importer's UnsupportedMappingFamily guard and channel_mapping: None in synthesize_audio_trak, replacing main's opus_dops_mapping_family_is_refused test with the round-trip and refusal tests, deleting the quest, and keeping the CHANGELOG entry. The diff against main is now only this quest's change (same 10 files as 643ca60e62).

Choices made without asking

  • Family 3 is refused in fMP4 import and export. opus::Mapping::parse still reads a family 3 OpusHead as a table elsewhere (the follow-up feat(mux): fill the catalog's VR fields on import #7308 already suggested).
  • The Dops shape and field-name questions in the old Plan were settled by the mp4-atom 0.17.0 release (channel_mapping: Option<OpusChannelMapping>), so nothing was left to decide here.
  • A catalog Opus rendition with more than 2 channels and no description still synthesizes a family 0 dOps, same as before. Left out of scope (see follow-ups).

Testing

  • just check origin/main on 643ca60e62: passes (flake skipped: the local Nix builder can't create user namespaces).
  • cargo test -p moq-mux --all-features opus: 51 passed.
  • On 28b51f5753: cargo test -p moq-mux --all-features (1900 passed), and clippy -D warnings and fmt for moq-mux pass. just check's test gh fails locally only because this nested worktree inherits the parent checkout's older .cargo/config.toml alias format; nothing under sh/ changed.

Suggested follow-ups

  • Synthesizing an Opus trak with no description and 3 to 8 channels should write the Vorbis family 1 table (opus::Mapping::vorbis), as the TS importer does, rather than an invalid family 0 dOps. Or refuse it.
  • Family 3 (projection ambisonics) handling in opus::Mapping::parse (from feat(mux): fill the catalog's VR fields on import #7308).

Review

  • Reviewer: Codex (quest review --new), gpt-6.1-sol, medium effort, against origin/main (38566f5a84).
  • Round 1 on 28b51f5753c3ea806c92060240cf2f36fe619e04 (merge of main with hand-resolved conflicts): no findings.
  • Earlier: round 1 on 643ca60e62 against feat(mux): fill the catalog's VR fields on import #7308's head: no findings.

(Written by Claude Opus 5.5)

🤖 Generated with Claude Code

kixelated and others added 14 commits October 28, 2026 00:01
Pin moq-mux to kixelated/mp4-atom#254, which stores a field-less trun
run as a count, so a moof of many such runs decodes without one entry
per sample. Migrate the sample resolver, the segment-start scan, and
the per-track fragment rewrite to `Trun.samples`, and test that a moof
of 1000 u32::MAX-sample runs decodes and resolves only up to the mdat.

Swap the git pin for mp4-atom 0.17.0 once it is published.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
An inherited trun run can claim u32::MAX samples in four bytes, so
walking every sample for a sync flag before the resolver bounds them
would trade the old per-sample allocation for a multi-billion step loop.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
mp4-atom now decodes a nonzero dOps family instead of refusing it, so the
fMP4 importer refuses the table itself until surround Opus lands.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Quest-Claim: 7f161c8f3d778853
Swaps the git pin for the published crate and adapts to the changes
released since: trun composition offsets widen to i64, the ES descriptor
gains its optional fields, and dref keeps typed entries.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
MP4 import reads Spherical Video V2 st3d/sv3d and Matroska import reads
StereoMode/Projection into the rendition's projection and stereo, deriving
fov from symmetric equirectangular bounds. Opus channel mapping family 2
imports as layout "ambisonic". What the catalog cannot describe (cubemap,
mesh, pose, cropped or uncentred bounds, other stereo packings, zeroth
order or non-diegetic stereo ambisonics) is refused.

Finishes quest/m2/mux-vr-fields.md.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The mdat budget reset per traf, so a moof repeating a forged field-less
run across many trafs multiplied the walk. One budget now spans them all.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@kixelated kixelated changed the title Carry surround Opus through CMAF feat(mux): carry surround Opus through CMAF dOps Oct 30, 2026
@kixelated
kixelated marked this pull request as ready for review October 30, 2026 11:00
@coderabbitai

coderabbitai Bot commented Oct 30, 2026 •

Copy link
Copy Markdown
Contributor

Review in Change Stack →

No actionable comments were generated in the recent review.

Recent review info
Run configuration
  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: Organization UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: bfdc5874-f130-4b35-8c85-eb5251cb417d
Commits

Reviewing files that changed from the base of the PR and between 38566f5 and 28b51f5.

Files selected for processing: 10
  • quest/m2/README.md
  • quest/m2/cmaf-opus-surround.md
  • quest/m2/moqsrc-opus-surround.md
  • quest/m2/mux-vr-ambisonic-fmp4.md
  • rs/moq-mux/CHANGELOG.md
  • rs/moq-mux/src/codec/opus/mod.rs
  • rs/moq-mux/src/container/fmp4/export_test.rs
  • rs/moq-mux/src/container/fmp4/import.rs
  • rs/moq-mux/src/container/fmp4/import_test.rs
  • rs/moq-mux/src/container/fmp4/mod.rs
Files with no reviewable changes: 3
  • quest/m2/README.md
  • quest/m2/moqsrc-opus-surround.md
  • quest/m2/cmaf-opus-surround.md

Included review availability: This review used your included allowance. Your plan provides up to 4 included reviews per hour; 0 remain after this review.

Walkthrough

fMP4 Opus import now converts dOps channel mappings into the Opus configuration, and export writes mappings from that configuration into dOps. Both directions reject mapping family 3. Tests cover a six-channel family 1 round trip and rejection of family 3 and a nine-channel family 1 mapping. Related quest and changelog text was updated.

Merge Risk: Minimal · up to 28b51

No merge-blocking behavior was identified in the Opus mapping changes.

Pre-merge checks: Passed 5
Check name Status Explanation
Title check Passed The title "feat(mux): carry surround Opus through CMAF dOps" matches the main change. The PR makes fMP4 import and export accept supported nonzero Opus channel-mapping families by converting the dOps …
Description check Passed The description states that it finishes the surround Opus quest and that fMP4 now carries surround Opus through import and export. It lists the import, export, and family 3 refusal changes, the new te…
Docstring Coverage Passed Docstring coverage is 85.71% which is sufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff with cyclomatic complexity of at least 2. Documentati…
Linked Issues check Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check Passed Check skipped because no linked issues were found for this pull request.
Full details: Title check

Explanation

The title "feat(mux): carry surround Opus through CMAF dOps" matches the main change. The PR makes fMP4 import and export accept supported nonzero Opus channel-mapping families by converting the dOps mapping table to and from the OpusHead representation. Family 3 stays refused. The title names the feature, the affected area (mux), and the container path (CMAF dOps).

Full details: Description check

Explanation

The description states that it finishes the surround Opus quest and that fMP4 now carries surround Opus through import and export. It lists the import, export, and family 3 refusal changes, the new tests, the quest deletion and rewrite, the dependency on #7308, and the testing performed. It matches the changeset closely.

Full details: Docstring Coverage

Explanation

Docstring coverage is 85.71% which is sufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff with cyclomatic complexity of at least 2. Documentation-only edits and deletions within surviving functions are included; unchanged diff context and fully deleted functions are excluded. Analyzed 7 functions across 5 files. (2 skipped: 2 unsupported.)

Finishing Touches
Simplify code
  • Commit to this branch
  • Create a new PR
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

Share

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 30, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-30T11:02:11.163734Z 643ca60 Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@kixelated kixelated left a comment

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Automated review by review (OpenAI)

Reviewed commit: 643ca60.

No new actionable findings in the surround-Opus delta on top of #7308. Import checks the dOps table through Mapping::new, and export preserves the parsed head's family, stream/coupled counts and channel table. Both directions explicitly refuse family 3 instead of misrepresenting its demixing matrix. The 5.1 regression checks mapping and other dOps fields through the round trip.

Direction: reuse the shared mapping validation and land #7308 first, rather than duplicating its mp4-atom migration. The disclosed no-description multichannel export and general family-3 parsing limitations are inherited, not fixed here. Family-2/255 end-to-end fixtures would strengthen coverage beyond the family-1 regression.

Verification limits: static GitHub inspection with an independent delta review; inherited #7308 work was compared to its prior published review. No tests, audio playback or external mp4-atom audit performed; reported passing checks were not independently verified.

(Written by OpenAI)

@kixelated

Copy link
Copy Markdown
Collaborator Author

Ordering note: this PR lands after moq-dev/moq#7308 (maintainer decision, 2026-10-30). It builds on #7308's mp4-atom 0.17 move and its RFC 8486 family 2 rules in opus::Mapping::new. Once #7308 is on main, merge main into this branch and land it.

(Written by Claude Opus 5.5)

@kixelated

Copy link
Copy Markdown
Collaborator Author

Landing summary (/quest-merge):

  • Head 643ca60e6220df40ae04254c15ef8a1149f8f4e2: all 18 checks pass, and quest check --base origin/main passes.
  • Reviews: the local Codex round 1 on this head had no findings. The posted OpenAI review on this head had no actionable findings either; it only noted family 2/255 end-to-end fixtures as a coverage idea. The rewritten fMP4 ambisonic layout quest already tracks that.
  • Ordering: this branch includes feat(mux): fill the catalog's VR fields on import #7308. feat(mux): fill the catalog's VR fields on import #7308 is already queued for quest land, ahead of this PR, so this PR's diff against main shrinks to 643ca60e62 once that one merges.
  • I made no code changes during merge.

(Written by Claude Opus 5.5)

@kixelated
kixelated enabled auto-merge (squash) October 31, 2026 05:00
@moq-bot
moq-bot Bot disabled auto-merge October 31, 2026 10:04
@moq-bot moq-bot Bot removed the quest:merge label Oct 31, 2026
@moq-bot

moq-bot Bot commented Oct 31, 2026

Copy link
Copy Markdown
Contributor

quest land removed this pull request from the queue: Conflicts with the base: quest/m2/cmaf-opus-surround.md, quest/m2/mux-vr-ambisonic-fmp4.md, rs/moq-mux/CHANGELOG.md, rs/moq-mux/src/container/fmp4/import.rs, rs/moq-mux/src/container/fmp4/import_test.rs, rs/moq-mux/src/container/fmp4/mod.rs
.

@moq-bot

moq-bot Bot commented Oct 31, 2026

Copy link
Copy Markdown
Contributor

codex / Codex land fixer: Six base merge conflicts include Opus mapping acceptance versus base's explicit refusal; base:quest/m2/cmaf-opus-surround.md directs behavior changes: 'On export, write the table from the parsed head . Recommendation: Have the author reconcile and review the Opus mapping policy and associated tests against base, then resubmit; repository instructions were not followed.

An fMP4 Opus track with channel mapping family 2 imports with the catalog's
`ambisonic` field, under the same RFC 8486 rules the Matroska and raw Opus
importers apply (`opus::Mapping::new` refuses the family 2 channel counts the
catalog cannot carry, and the OpusHead's `AudioConfig` sets the layout).

## Plan

Split from the VR fields quest on 2026-10-22 (maintainer), which landed the
Matroska and raw Opus side: only this part needs the `dOps` channel mapping
table.
Read the mapping from the `dOps` that
[CMAF surround Opus](/quest/m2/cmaf-opus-surround.md) carries through the
OpusHead, and reuse that family 2 validation. Test with an fMP4
first-order ambisonic fixture and a refused non-diegetic stereo one.

Public API: none. Wire: none.

## Required

- [CMAF surround Opus](/quest/m2/cmaf-opus-surround.md) - the `dOps` mapping table an ambisonic fMP4 track needs
commit 643ca60e6220df40ae04254c15ef8a1149f8f4e2
Author:     Luke Curley <kixelated@gmail.com>
AuthorDate: Fri Oct 30 03:39:38 2026 -0700
Commit:     Luke Curley <kixelated@gmail.com>
CommitDate: Fri Oct 30 03:39:38 2026 -0700

    feat(mux): carry surround Opus through CMAF dOps
    
    Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
68a5b75d619265acde407510de5c2f92fa1a2f3e
100644 f7e264f6ba19188e41ba5e20f85dc63aa3489cfb 1	quest/m2/cmaf-opus-surround.md
100644 80303afef4402559515da7a732498fca210706ac 3	quest/m2/cmaf-opus-surround.md
100644 24d54bbc01aa4a0c1eaa9d839ede0caf363aa871 1	quest/m2/mux-vr-ambisonic-fmp4.md
100644 4ea1c891536c7269bb76868c2a5e73025790cacd 2	quest/m2/mux-vr-ambisonic-fmp4.md
100644 8fdb89c6eaa44bfdf77169aacdbe86f2d56b60ed 3	quest/m2/mux-vr-ambisonic-fmp4.md
100644 520d6a4860e5d3f50c020abc8f6f50f88f387b7b 1	rs/moq-mux/CHANGELOG.md
100644 a850cefe1a5267d0c56c23ec71764c6e703ba525 2	rs/moq-mux/CHANGELOG.md
100644 304f9752987e370b77835ec7da094b5ad365e806 3	rs/moq-mux/CHANGELOG.md
100644 aed4ba9db899866be29342199ff9e6618ebd62e3 1	rs/moq-mux/src/container/fmp4/import.rs
100644 211bc0705ca3e9677696cd5620245cf874621183 2	rs/moq-mux/src/container/fmp4/import.rs
100644 7a4011ecbbded2c64c2f77f5fae7f08b0eae9824 3	rs/moq-mux/src/container/fmp4/import.rs
100644 5a3c6c1835a4a4542e68e9e50ffac9859c685807 1	rs/moq-mux/src/container/fmp4/import_test.rs
100644 55222d4191d409e067ac1517a24a5be0a5c1cdd0 2	rs/moq-mux/src/container/fmp4/import_test.rs
100644 d722276ab0e16a4669fcf046dcfbd8fb7ffb5021 3	rs/moq-mux/src/container/fmp4/import_test.rs
100644 11b55d2afa60913248ac42353a0f7d3a95cbd4ed 1	rs/moq-mux/src/container/fmp4/mod.rs
100644 9cf0fc13a349a5af1f4e72fc72c74a13c9bf07f9 2	rs/moq-mux/src/container/fmp4/mod.rs
100644 ef5d8730fb2bd2b6990afe316edc57e41409bf94 3	rs/moq-mux/src/container/fmp4/mod.rs

Auto-merging quest/m1/cut-audit/README.md
Auto-merging quest/m2/README.md
CONFLICT (modify/delete): quest/m2/cmaf-opus-surround.md deleted in pr-7336 and modified in base.  Version base of quest/m2/cmaf-opus-surround.md left in tree.
Auto-merging quest/m2/mux-vr-ambisonic-fmp4.md
CONFLICT (content): Merge conflict in quest/m2/mux-vr-ambisonic-fmp4.md
Auto-merging rs/moq-mux/CHANGELOG.md
CONFLICT (content): Merge conflict in rs/moq-mux/CHANGELOG.md
Auto-merging rs/moq-mux/src/codec/opus/mod.rs
Auto-merging rs/moq-mux/src/container/fmp4/export_test.rs
Auto-merging rs/moq-mux/src/container/fmp4/import.rs
CONFLICT (content): Merge conflict in rs/moq-mux/src/container/fmp4/import.rs
Auto-merging rs/moq-mux/src/container/fmp4/import_test.rs
CONFLICT (content): Merge conflict in rs/moq-mux/src/container/fmp4/import_test.rs
Auto-merging rs/moq-mux/src/container/fmp4/mod.rs
CONFLICT (content): Merge conflict in rs/moq-mux/src/container/fmp4/mod.rs

codex
The log lists six merge conflicts. The code conflicts include base’s explicit rejection of nonzero Opus mappings and PR 7336’s support for them. Resolving that policy difference needs review, so I’ll hand back the PR and leave its branch unchanged.

The base version of `quest/m2/cmaf-opus-surround.md` also directs replacing the refusal. I’ll quote that repository instruction in the diagnosis, as required.

exec
/bin/bash -lc "python3 - <<'PY'
import json
result = [{\"number\":7336,\"action\":\"handback\",\"diagnosis\":\"Six base merge conflicts include Opus mapping acceptance versus base's explicit refusal; base:quest/m2/cmaf-opus-surround.md directs behavior changes: 'On export, write the table from the parsed head in place of the "'`UnsupportedMappingFamily` refusal in `synthesize_audio_trak`.'"'\",\"recommendation\":\"Have the author reconcile and review the Opus mapping policy and associated tests against base, then resubmit; repository instructions were not followed.\"}]
with open('quest-land-result.json', 'w') as f:
    json.dump(result, f, indent=2)
    f.write('\\n')
PY
 git status --short && git rev-parse pr-7336 && cat quest-land-result.json" in /work
 succeeded in 91ms:
?? quest-land-result.json
643ca60e6220df40ae04254c15ef8a1149f8f4e2
[
  {
    "number": 7336,
    "action": "handback",
    "diagnosis": "Six base merge conflicts include Opus mapping acceptance versus base's explicit refusal; base:quest/m2/cmaf-opus-surround.md directs behavior changes: 'On export, write the table from the parsed head in place of the `UnsupportedMappingFamily` refusal in `synthesize_audio_trak`.'",
    "recommendation": "Have the author reconcile and review the Opus mapping policy and associated tests against base, then resubmit; repository instructions were not followed."
  }
]

codex
PR 7336 handed back: six merge conflicts include an Opus mapping policy difference requiring review. Branches remain unchanged.

Wrote [quest-land-result.json](/work/quest-land-result.json), uncommitted, with the diagnosis, quoted repository directive, and recommendation.
tokens used
31,173
PR 7336 handed back: six merge conflicts include an Opus mapping policy difference requiring review. Branches remain unchanged.

Wrote [quest-land-result.json](/work/quest-land-result.json), uncommitted, with the diagnosis, quoted repository directive, and recommendation.
fixer result written

(written by codex / Codex)

# Conflicts:
#	quest/m2/cmaf-opus-surround.md
#	quest/m2/mux-vr-ambisonic-fmp4.md
#	rs/moq-mux/CHANGELOG.md
#	rs/moq-mux/src/container/fmp4/import.rs
#	rs/moq-mux/src/container/fmp4/import_test.rs
#	rs/moq-mux/src/container/fmp4/mod.rs
@kixelated

Copy link
Copy Markdown
Collaborator Author

Merged main to clear the six conflicts left by moq-dev/moq#7308 landing as a squash. Main's explicit refusal of nonzero dOps families was #7308's stopgap, and the base's copy of quest/m2/cmaf-opus-surround.md still directs replacing it. So every conflict went to this PR's side: the importer's guard is dropped, export writes the table, main's refusal test gives way to the round-trip and family-3/9-channel refusal tests, and the quest is deleted. The diff against main is now just this quest's commit.

Checks on 28b51f5753: moq-mux tests (1900 passed), clippy, and fmt pass, and quest check is clean. A fresh Codex review (gpt-6.1-sol, medium) against origin/main found nothing. Landing.

(Written by Claude Opus 5.5)

@kixelated
kixelated enabled auto-merge (squash) October 31, 2026 15:18
@moq-bot
moq-bot Bot disabled auto-merge November 1, 2026 00:17
@moq-bot moq-bot Bot removed the quest:merge label Nov 1, 2026
@moq-bot

moq-bot Bot commented Nov 1, 2026

Copy link
Copy Markdown
Contributor

quest land removed this pull request from the queue: the batch check failed (exit 1).

 * [new tag]             docker-v1                   -> docker-v1
 * [new tag]             github-show                 -> github-show
 * [new tag]             push                        -> push
 * [new tag]             v0.10.0                     -> v0.10.0
 * [new tag]             v0.11.0                     -> v0.11.0
 * [new tag]             v0.12.0                     -> v0.12.0
 * [new tag]             v0.13.0                     -> v0.13.0
 * [new tag]             v0.13.1                     -> v0.13.1
 * [new tag]             v0.14.0                     -> v0.14.0
 * [new tag]             v0.14.1                     -> v0.14.1
 * [new tag]             v0.15.1                     -> v0.15.1
 * [new tag]             v0.16.0                     -> v0.16.0
 * [new tag]             v0.17.0                     -> v0.17.0
 * [new tag]             v0.18.0                     -> v0.18.0
 * [new tag]             v0.19.0                     -> v0.19.0
 * [new tag]             v0.19.1                     -> v0.19.1
 * [new tag]             v0.19.2                     -> v0.19.2
 * [new tag]             v0.19.3                     -> v0.19.3
 * [new tag]             v0.19.4                     -> v0.19.4
 * [new tag]             v0.19.5                     -> v0.19.5
 * [new tag]             v0.19.6                     -> v0.19.6
 * [new tag]             v0.20.0                     -> v0.20.0
 * [new tag]             v0.21.0                     -> v0.21.0
 * [new tag]             v0.21.1                     -> v0.21.1
 * [new tag]             v0.22.0                     -> v0.22.0
 * [new tag]             v0.23.0                     -> v0.23.0
 * [new tag]             v0.24.0                     -> v0.24.0
 * [new tag]             v0.24.1                     -> v0.24.1
 * [new tag]             v0.24.2                     -> v0.24.2
 * [new tag]             v0.24.3                     -> v0.24.3
 * [new tag]             v0.25.0                     -> v0.25.0
 * [new tag]             v0.25.1                     -> v0.25.1
 * [new tag]             v0.25.2                     -> v0.25.2
 * [new tag]             v0.25.3                     -> v0.25.3
 * [new tag]             v0.26.0                     -> v0.26.0
 * [new tag]             v0.26.1                     -> v0.26.1
 * [new tag]             v0.27.0                     -> v0.27.0
 * [new tag]             v0.27.1                     -> v0.27.1
 * [new tag]             v0.27.2                     -> v0.27.2
 * [new tag]             v0.27.3                     -> v0.27.3
 * [new tag]             v0.28.0                     -> v0.28.0
 * [new tag]             v0.28.1                     -> v0.28.1
 * [new tag]             v0.28.2                     -> v0.28.2
 * [new tag]             v0.28.3                     -> v0.28.3
 * [new tag]             v0.29.0                     -> v0.29.0
 * [new tag]             v0.29.1                     -> v0.29.1
 * [new tag]             v0.29.2                     -> v0.29.2
 * [new tag]             v0.29.3                     -> v0.29.3
 * [new tag]             v0.29.4                     -> v0.29.4
 * [new tag]             v0.29.5                     -> v0.29.5
 * [new tag]             v0.30.0                     -> v0.30.0
 * [new tag]             v0.31.0                     -> v0.31.0
 * [new tag]             v0.31.1                     -> v0.31.1
 * [new tag]             v0.31.2                     -> v0.31.2
 * [new tag]             v0.32.0                     -> v0.32.0
 * [new tag]             v0.32.1                     -> v0.32.1
 * [new tag]             v0.32.2                     -> v0.32.2
 * [new tag]             v0.4.0                      -> v0.4.0
 * [new tag]             v0.5.0                      -> v0.5.0
 * [new tag]             v0.6.0                      -> v0.6.0
 * [new tag]             v0.6.1                      -> v0.6.1
 * [new tag]             v0.7.0                      -> v0.7.0
 * [new tag]             v0.7.1                      -> v0.7.1
 * [new tag]             v0.7.2                      -> v0.7.2
 * [new tag]             v0.8.0                      -> v0.8.0
 * [new tag]             v0.9.0                      -> v0.9.0
derivation evaluated to /nix/store/nvij27kw5rh5323b8idz8whhaqn49kc4-moq-relay-0.17.2.drv
checking derivation packages.x86_64-linux.default...
derivation evaluated to /nix/store/8njiymqk67rqxixlszn9734gjq417l0f-moq-all.drv
checking derivation packages.x86_64-linux.uniffi-bindgen-dart...
derivation evaluated to /nix/store/1v1hdl7dhiwdis0y2lmh6vjx149is362-uniffi-bindgen-dart-0.3.1-kixelated.6+v0.32.0.drv
checking derivation packages.x86_64-linux.uniffi-bindgen-cpp...
derivation evaluated to /nix/store/im9pz4z9gbnxq8cgg736sqc7d5y07nc3-uniffi-bindgen-cpp-0.11.0-kixelated.7+v0.32.2.drv
checking derivation packages.x86_64-linux.moq...
derivation evaluated to /nix/store/smqzfr9i5yz34lx7plmp7cf7jkha5myb-moq-cli-0.14.2.drv
checking derivation packages.x86_64-linux.moq-cli...
derivation evaluated to /nix/store/hv61q4ncyjdmv18plpyi91gajc3k7n0z-moq.drv
checking derivation packages.x86_64-linux.moq-bench...
derivation evaluated to /nix/store/wgx1wsmlph9lv0if39k3xla0xi826gcx-moq-bench-0.0.1.drv
checking derivation packages.x86_64-linux.moq-boy...
error: interrupted by the user
ci: test gh failed
ci: seconds per module
   295  check py
    57  test py
   526  check rs
   195  test rs
   230  check rs_shapes (cancelled)
   418  check c
   364  check cpp
    63  check obs_compile
   406  check js
    67  test js
    28  check markdown
     4  check gh
    27  test gh (failed)
   154  check kt
    18  check flake (cancelled)
   952  wall time
error: recipe `ci` failed on line 107 with exit code 1

.

@kixelated
kixelated enabled auto-merge (squash) November 1, 2026 00:24
@moq-bot

moq-bot Bot commented Nov 1, 2026

Copy link
Copy Markdown
Contributor

codex / Codex land fixer: PR was picked again while fixing; keeping the newer pick. Recommendation: run /quest-iterate before picking it again.

-
-## Goal
-
-moq-mux parses and builds avcC and hvcC records with `mp4_atom::Avcc` and
-`mp4_atom::Hvcc`, already its dependency, instead of about 330 hand-written
-lines, or a comment at the hand-written code names the input mp4-atom
-mishandles.
-
-## Plan
-
-Found by the 2026-10-19 dependency audit. `rs/moq-mux/src/codec/h264/mod.rs`
-has `Avcc::parse`, `build_avcc`, `catalog_avcc`, `avcc_params`, and
-`read_param_sets`; `codec/h265/mod.rs` has `build_hvcc` and `hvcc_params`.
-The tests already check them against mp4-atom. The fMP4 importer decodes an
-`mp4_atom::Avcc`, re-encodes it, and re-parses it with the hand-written parser
-(`container/fmp4/import.rs`, `init_h264`), while its H.265 path reads the
-`mp4_atom::Hvcc` fields directly.
-
-Check first for a leniency reason, such as how mp4-atom handles the
-high-profile extension or a short record from a real encoder; keep the
-hand-written path only for a reproduced case and test it. `moq_mux` exports
-`codec::h264::Avcc`, so replacing or removing it is a breaking change;
-prefer keeping the type and changing only how it is
-filled when that is simpler. No wire change.
-
-## Related
-
-- [H.264 parsing with maintained crates](/quest/m2/h264-reader.md) - the SPS side of the same codec config
diff --git a/quest/m2/README.md b/quest/m2/README.md
index f93399e86..4e19cf61d 100644
--- a/quest/m2/README.md
+++ b/quest/m2/README.md
@@ -218,7 +218,6 @@ lite-07; bitrate enforcement is not part of this release.
 
 - [Task supervision](/quest/m2/task-supervision.md) - the auth decider loop, stats publisher, and moq-tokio's token and WebSocket internals are supervised like #5447's tasks
 - [Auth serve bound address](/quest/m2/auth-serve-bound-addr.md) - `moq auth serve` logs the port it actually bound
-- [RTMP client reports a publish or play error](/quest/m2/rtmp-client-error.md) - a refused publish or play surfaces its reason
 - [H.264 parsing with maintained crates](/quest/m2/h264-reader.md) - moq-mux parses SPS VUI with h264-reader and shares one bit reader across codec config parsers
 - [avcC and hvcC through mp4-atom](/quest/m2/mp4-atom-config.md) - moq-mux stops hand-writing the decoder config records its mp4-atom dependency already parses
 - [Relay metrics through prometheus-client](/quest/m2/relay-prometheus-client.md) - `/metrics` renders through the maintained client with the same series
diff --git a/quest/m2/rtmp-client-error.md b/quest/m2/rtmp-client-error.md
deleted file mode 100644
index e50058d8e..000000000
--- a/quest/m2/rtmp-client-error.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# [XS] RTMP client reports a publish or play error
-
-## Goal
-
-`moq_rtmp::Client` returns a server's `_error` on publish or play with its
-code and description, as it already does on connect. Today the `_error` has
-no outstanding transaction, so the session raises
-`UnknownTransactionResultReceived`, `dial.rs` ignores it, and the client ends
-with "rtmp server closed before publish was accepted" once the server closes.
-
-## Plan
-
-Match the publish and play `_error` in `rs/moq-rtmp`'s client and surface it
-through `dial.rs`. Test against a server that answers a publish with `_error`
-and one that answers a play with `_error`, asserting the code and description
-in both.

codex
I reproduced the dispatcher failures on base: the two targeted tests pass with `CHECK_FAIL_FAST` cleared and fail with it set. The test harness inherits that gate setting. No PR-specific fix is indicated, so I’ll requeue all eight unchanged and record the cause.

exec
/bin/bash -lc "python3 - <<'PY'
import json, pathlib, subprocess
numbers=[7397,7401,7418,7441,7287,7256,7336,7352]
reason='healthy; batch failure is base test isolation: sh/dispatch-query.test.py inherits CHECK_FAIL_FAST from the landing gate; targeted base tests pass with it cleared'
result=[dict(number=n,action='requeue',reason=reason) for n in numbers]
p=pathlib.Path('quest-land-result.json')
p.write_text(json.dumps(result,indent=2)+'\\n')
assert len(json.loads(p.read_text()))==8
expected={7397:'1bac738fa',7401:'5f4f6db97',7418:'08201ee65',7441:'353bbd9d0',7287:'976bf7422',7256:'ec9560ca5',7336:'28b51f575',7352:'6fc4f8c90'}
for n,prefix in expected.items():
    head=subprocess.check_output(['git','rev-parse',f'pr-{n}'],text=True).strip()
    assert head.startswith(prefix),(n,head)
print('Validated 8 requeue entries and unchanged pinned branch tips.')
PY
 git status --short" in /work
 succeeded in 25ms:
Validated 8 requeue entries and unchanged pinned branch tips.
?? quest-land-result.json

codex
Wrote [quest-land-result.json](/work/quest-land-result.json): all eight PRs requeued unchanged.

The failure comes from base’s dispatcher tests inheriting `CHECK_FAIL_FAST`. Targeted tests pass with it cleared and reproduce the failure when set.

All PR branches remain intact; the result file is uncommitted.
tokens used
64,429
Wrote [quest-land-result.json](/work/quest-land-result.json): all eight PRs requeued unchanged.

The failure comes from base’s dispatcher tests inheriting `CHECK_FAIL_FAST`. Targeted tests pass with it cleared and reproduce the failure when set.

All PR branches remain intact; the result file is uncommitted.
fixer result written

(written by codex / Codex)

@moq-bot
moq-bot Bot merged commit 8874d84 into main Nov 1, 2026
2 checks passed
@moq-bot
moq-bot Bot deleted the quest/m2/cmaf-opus-surround branch November 1, 2026 01:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant