Repository navigation
feat(studio): audio mixes, routing, meters, listening, and sync delay #32
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
1d9b3d7
chore(quest): claim quest/m0/mixes.md
kixelated 5191287
feat(studio): audio mixes, routing, meters, listening, and sync delay
kixelated 5d57e9e
fix(studio): pick a renamed mix to listen to under the same lock as t…
kixelated 4ccd107
fix(studio): a pick never replays a block already read
kixelated af02dce
feat(studio): pick the output Listen plays on, remembered per user
kixelated de8d47b
fix(studio): Listen moves outputs through the playback engine's switch
kixelated 9db9388
Merge remote-tracking branch 'origin/main' into HEAD
kixelated 2d8e973
quest: guest-return no longer waits on audio mixes
kixelated 04ef1ae
Merge remote-tracking branch 'origin/main' into HEAD
kixelated 1adab8a
fix(studio): Health grades a sound stall only for sources the program…
kixelated 87baf52
Merge remote-tracking branch 'origin/main' into quest/m0/mixes
kixelated 73f0e8a
fix(scene): a restarted source leaves every mix at once
kixelated f6713a7
Merge remote-tracking branch 'origin/main' into quest/m0/mixes
kixelated bd5a052
Merge remote-tracking branch 'origin/main' into HEAD
kixelated File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| # [S] A recording picks its mix | ||
|
|
||
| ## Goal | ||
|
|
||
| A recording in `moq-studio` picks any of the collection's mixes, so it can | ||
| keep what the stream leaves out, such as the creator's music, while the | ||
| broadcast carries the mix on program. A recording on the same mix as the | ||
| program records as it does today. | ||
|
|
||
| ## Plan | ||
|
|
||
| Split from [Audio mixes](https://github.com/moq-dev/studio/pull/32), which | ||
| landed the mixes, routing, meters, delay, listening, and the program's pick | ||
| (`[mixes] program`). | ||
|
|
||
| A recording reads the studio's broadcast the way a viewer does | ||
| (`rs/moq-studio/src/record.rs`), so a mix other than the program's needs an | ||
| Opus track of its own. Keep that track off the relay: a mix the creator left | ||
| off the stream must not be fetchable from it, as source tracks stay local | ||
| after [Live encode control](/quest/m0/encode-control.md). Encode it only while | ||
| a recording reads it, and record the program's video beside it in one file. | ||
| The pick lives in the scene file beside `[mixes] program`, and the Output | ||
| panel shows it. Update `README.md`. | ||
|
|
||
| ## Required | ||
|
|
||
| - [Live encode control](/quest/m0/encode-control.md) - the local broadcast a mix track stays off the relay in | ||
|
|
||
| ## Related | ||
|
|
||
| - [Destinations](/quest/m0/destinations.md) - each destination picks a mix the same way |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| # [S] Clap-to-measure sync delay | ||
|
|
||
| ## Goal | ||
|
|
||
| A clap in front of a camera, seen and heard, measures how far a microphone | ||
| leads that camera, and sets the microphone's `delay` to it, instead of the | ||
| creator guessing the number. | ||
|
|
||
| ## Plan | ||
|
|
||
| Split from [Audio mixes](https://github.com/moq-dev/studio/pull/32), which | ||
| landed the per-source `delay` the measurement sets. | ||
|
|
||
| Measure both onsets on the program clock: the clap's sound in the | ||
| microphone's audio before it is delayed, and the frame where the hands meet in | ||
| the camera's pictures. The difference, bounded by moq-audio's | ||
| `bus::MAX_DELAY`, becomes the delay, as one undoable edit. A clap that is not | ||
| found, or found in only one of the two, fails with the reason rather than | ||
| setting a guess. | ||
|
|
||
| The studio sees a source's audio only through its strip's level meter, read | ||
| once a frame, which is too coarse to time a clap. Timing it needs the | ||
| source's samples, or an onset, with their position on the bus clock, which is | ||
| moq-audio work: land it there first and pin it. | ||
|
|
||
| ## Related | ||
|
|
||
| - [Broadcast sources play in sync](/quest/m0/broadcast-sync.md) - broadcast sources align on the publisher's timestamps instead |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.