-
Notifications
You must be signed in to change notification settings - Fork 4.1k
fix: offset nested template video timing #2859
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 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
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
13 changes: 13 additions & 0 deletions
13
packages/producer/tests/nested-sequential-video-local-start/meta.json
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,13 @@ | ||
| { | ||
| "name": "Later nested template video stays visible", | ||
| "description": "Two template-mounted hosts play sequentially, and each template owns a scene-local video with data-start=0 that reads its half of one generated source. Before the fix, producer capture evaluated the later video's start against root time without its host offset, hid it for the entire second host window, and rendered black instead of the generated green half.", | ||
| "tags": ["video", "sub-composition", "regression"], | ||
| "minPsnr": 25, | ||
| "maxFrameFailures": 2, | ||
| "minAudioCorrelation": 0, | ||
| "maxAudioLagWindows": 1, | ||
| "renderConfig": { | ||
| "fps": 24, | ||
| "workers": 1 | ||
| } | ||
| } |
3 changes: 3 additions & 0 deletions
3
packages/producer/tests/nested-sequential-video-local-start/output/compiled.html
Git LFS file not shown
3 changes: 3 additions & 0 deletions
3
packages/producer/tests/nested-sequential-video-local-start/output/output.mp4
Git LFS file not shown
23 changes: 23 additions & 0 deletions
23
packages/producer/tests/nested-sequential-video-local-start/src/compositions/first.html
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,23 @@ | ||
| <template id="first-template"> | ||
| <div | ||
| data-composition-id="first-scene" | ||
| data-width="160" | ||
| data-height="90" | ||
| data-no-timeline | ||
| style="position: relative; width: 160px; height: 90px; overflow: hidden; background: #000" | ||
| > | ||
| <video | ||
| id="first-video" | ||
| class="clip" | ||
| data-start="0" | ||
| data-duration="1" | ||
| data-media-start="0" | ||
| data-track-index="0" | ||
| src="../media/source.mp4" | ||
| muted | ||
| playsinline | ||
| preload="auto" | ||
| style="display: block; width: 160px; height: 90px; object-fit: cover" | ||
| ></video> | ||
| </div> | ||
| </template> |
23 changes: 23 additions & 0 deletions
23
packages/producer/tests/nested-sequential-video-local-start/src/compositions/later.html
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,23 @@ | ||
| <template id="later-template"> | ||
| <div | ||
| data-composition-id="later-scene" | ||
| data-width="160" | ||
| data-height="90" | ||
| data-no-timeline | ||
| style="position: relative; width: 160px; height: 90px; overflow: hidden; background: #000" | ||
| > | ||
| <video | ||
| id="later-video" | ||
| class="clip" | ||
| data-start="0" | ||
| data-duration="1" | ||
| data-media-start="1" | ||
| data-track-index="0" | ||
| src="../media/source.mp4" | ||
| muted | ||
| playsinline | ||
| preload="auto" | ||
| style="display: block; width: 160px; height: 90px; object-fit: cover" | ||
| ></video> | ||
| </div> | ||
| </template> |
59 changes: 59 additions & 0 deletions
59
packages/producer/tests/nested-sequential-video-local-start/src/index.html
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,59 @@ | ||
| <!doctype html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="UTF-8" /> | ||
| <meta name="viewport" content="width=160, height=90" /> | ||
| <style> | ||
| html, | ||
| body, | ||
| #root { | ||
| width: 160px; | ||
| height: 90px; | ||
| margin: 0; | ||
| overflow: hidden; | ||
| background: #000; | ||
| } | ||
|
|
||
| .scene { | ||
| position: absolute; | ||
| inset: 0; | ||
| background: #000; | ||
| } | ||
| </style> | ||
| </head> | ||
| <body> | ||
| <div | ||
| id="root" | ||
| data-composition-id="main" | ||
| data-start="0" | ||
| data-duration="2" | ||
| data-width="160" | ||
| data-height="90" | ||
| data-no-timeline | ||
| > | ||
| <div | ||
| id="first-host" | ||
| class="scene" | ||
| data-composition-id="first-scene" | ||
| data-composition-src="compositions/first.html" | ||
| data-start="0" | ||
| data-duration="1" | ||
| data-track-index="0" | ||
| data-no-timeline | ||
| ></div> | ||
| <div | ||
| id="later-host" | ||
| class="scene" | ||
| data-composition-id="later-scene" | ||
| data-composition-src="compositions/later.html" | ||
| data-start="1" | ||
| data-duration="1" | ||
| data-track-index="1" | ||
| data-no-timeline | ||
| ></div> | ||
| </div> | ||
| <script> | ||
| window.__timelines = window.__timelines || {}; | ||
| </script> | ||
| </body> | ||
| </html> |
3 changes: 3 additions & 0 deletions
3
packages/producer/tests/nested-sequential-video-local-start/src/media/source.mp4
Git LFS file not shown
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
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.