Skip to content

Commit 72174e8

Browse files
committed
fix: share canonical nested media timing
1 parent b8a15cf commit 72174e8

5 files changed

Lines changed: 161 additions & 54 deletions

File tree

‎packages/cli/src/commands/snapshot.test.ts‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,16 +160,25 @@ describe("resolveSnapshotVideoClipStart", () => {
160160
expect(
161161
resolveSnapshotVideoClipStart({
162162
authoredStart: 0,
163-
templateHostStart: 3,
163+
runtimeResolvedStart: 3,
164164
}),
165165
).toBe(3);
166166
});
167167

168-
it("keeps top-level video starts unchanged", () => {
168+
it("uses the runtime's recursively resolved start for deeply nested media", () => {
169+
expect(
170+
resolveSnapshotVideoClipStart({
171+
authoredStart: 1,
172+
runtimeResolvedStart: 8,
173+
}),
174+
).toBe(8);
175+
});
176+
177+
it("keeps authored starts as a compatibility fallback", () => {
169178
expect(
170179
resolveSnapshotVideoClipStart({
171180
authoredStart: 3,
172-
templateHostStart: null,
181+
runtimeResolvedStart: null,
173182
}),
174183
).toBe(3);
175184
});

‎packages/cli/src/commands/snapshot.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,13 @@ export function resolveSnapshotVideoFrameTime(input: {
9393
return Math.max(0, Math.min(relativeTime, sourceEnd - 1 / 30));
9494
}
9595

96-
/** Convert a video's scene-local authored start into root timeline time when
97-
* it lives inside a template-mounted composition host. Top-level videos have
98-
* no template host and therefore retain their authored start unchanged. */
96+
/** Prefer the runtime's canonical absolute media start. The authored value is
97+
* only a compatibility fallback for pages built with an older runtime. */
9998
export function resolveSnapshotVideoClipStart(input: {
10099
authoredStart: number;
101-
templateHostStart: number | null;
100+
runtimeResolvedStart: number | null;
102101
}): number {
103-
return input.authoredStart + (input.templateHostStart ?? 0);
102+
return input.runtimeResolvedStart ?? input.authoredStart;
104103
}
105104

106105
export function requireSnapshotFfmpeg(ffmpegPath: string | undefined): string {
@@ -410,15 +409,13 @@ async function captureSnapshots(
410409

411410
if (injectVideoFramesBatch && syncVideoFrameVisibility) {
412411
const candidates = await page.evaluate(() => {
413-
return Array.from(document.querySelectorAll("video[data-start]")).map((el) => {
412+
const runtimeWindow = window as Window & {
413+
__hfResolveMediaStartSeconds?: (element: Element) => number;
414+
};
415+
return Array.from(document.querySelectorAll("video")).map((el) => {
414416
const v = el as HTMLVideoElement;
415417
const authoredStart = parseFloat(v.dataset.start ?? "0") || 0;
416-
const templateHost = v.closest<HTMLElement>(
417-
"[data-composition-src], [data-composition-file]",
418-
);
419-
const templateHostStart = templateHost
420-
? parseFloat(templateHost.dataset.start ?? "0") || 0
421-
: null;
418+
const runtimeResolvedStart = runtimeWindow.__hfResolveMediaStartSeconds?.(v);
422419
const rawRate = v.defaultPlaybackRate;
423420
const playbackRate =
424421
Number.isFinite(rawRate) && rawRate > 0 ? Math.max(0.1, Math.min(5, rawRate)) : 1;
@@ -436,7 +433,10 @@ async function captureSnapshots(
436433
id: v.id,
437434
src: v.currentSrc || v.src,
438435
authoredStart,
439-
templateHostStart,
436+
runtimeResolvedStart:
437+
runtimeResolvedStart !== undefined && Number.isFinite(runtimeResolvedStart)
438+
? runtimeResolvedStart
439+
: null,
440440
duration,
441441
srcDuration: srcDur,
442442
playbackRate,

‎packages/core/src/runtime/init.test.ts‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -964,6 +964,81 @@ describe("initSandboxRuntimeModular", () => {
964964
expect(secondVideo.style.visibility).toBe("visible");
965965
});
966966

967+
it("resolves media starts through arbitrarily nested composition hosts", () => {
968+
const root = document.createElement("div");
969+
root.setAttribute("data-composition-id", "main");
970+
root.setAttribute("data-root", "true");
971+
root.setAttribute("data-duration", "10");
972+
document.body.appendChild(root);
973+
974+
const outerHost = document.createElement("div");
975+
outerHost.setAttribute("data-composition-id", "outer");
976+
outerHost.setAttribute("data-composition-file", "outer.html");
977+
outerHost.setAttribute("data-start", "2");
978+
outerHost.setAttribute("data-duration", "6");
979+
root.appendChild(outerHost);
980+
981+
const innerHost = document.createElement("div");
982+
innerHost.setAttribute("data-composition-id", "inner");
983+
innerHost.setAttribute("data-composition-file", "inner.html");
984+
innerHost.setAttribute("data-start", "3");
985+
innerHost.setAttribute("data-duration", "3");
986+
outerHost.appendChild(innerHost);
987+
988+
const video = document.createElement("video");
989+
video.setAttribute("data-start", "1");
990+
video.setAttribute("data-duration", "1");
991+
innerHost.appendChild(video);
992+
993+
window.__timelines = {
994+
main: createMockTimeline(10),
995+
outer: createMockTimeline(6),
996+
inner: createMockTimeline(3),
997+
};
998+
999+
initSandboxRuntimeModular();
1000+
1001+
expect(window.__hfResolveMediaStartSeconds?.(video)).toBe(6);
1002+
window.__player?.renderSeek(5.5);
1003+
expect(video.style.visibility).toBe("hidden");
1004+
window.__player?.renderSeek(6.5);
1005+
expect(video.style.visibility).toBe("visible");
1006+
});
1007+
1008+
it("uses the canonical resolver for reference starts, auto-start media, and inline hosts", () => {
1009+
const root = document.createElement("div");
1010+
root.setAttribute("data-composition-id", "main");
1011+
root.setAttribute("data-root", "true");
1012+
root.setAttribute("data-duration", "10");
1013+
document.body.appendChild(root);
1014+
1015+
const intro = document.createElement("section");
1016+
intro.id = "intro";
1017+
intro.setAttribute("data-start", "0");
1018+
intro.setAttribute("data-duration", "2");
1019+
root.appendChild(intro);
1020+
1021+
const inlineHost = document.createElement("div");
1022+
inlineHost.setAttribute("data-composition-id", "inline");
1023+
inlineHost.setAttribute("data-start", "intro + 1");
1024+
inlineHost.setAttribute("data-duration", "2");
1025+
root.appendChild(inlineHost);
1026+
1027+
const video = document.createElement("video");
1028+
video.setAttribute("data-hf-auto-start", "true");
1029+
video.setAttribute("data-duration", "2");
1030+
inlineHost.appendChild(video);
1031+
1032+
window.__timelines = {
1033+
main: createMockTimeline(10),
1034+
inline: createMockTimeline(2),
1035+
};
1036+
1037+
initSandboxRuntimeModular();
1038+
1039+
expect(window.__hfResolveMediaStartSeconds?.(video)).toBe(3);
1040+
});
1041+
9671042
it("updates visibility for timed elements inside nested compositions", () => {
9681043
const root = document.createElement("div");
9691044
root.setAttribute("data-composition-id", "main");
@@ -1480,6 +1555,7 @@ describe("initSandboxRuntimeModular", () => {
14801555

14811556
const host = document.createElement("div");
14821557
host.setAttribute("data-composition-id", "scene-pip");
1558+
host.setAttribute("data-composition-file", "compositions/pip.html");
14831559
host.setAttribute("data-start", "45.40");
14841560
host.setAttribute("data-duration", "7.06");
14851561
root.appendChild(host);
@@ -1509,6 +1585,8 @@ describe("initSandboxRuntimeModular", () => {
15091585

15101586
initSandboxRuntimeModular();
15111587

1588+
expect(window.__hfResolveMediaStartSeconds?.(pipVideo)).toBeCloseTo(45.4);
1589+
15121590
const player = (
15131591
window as Window & {
15141592
__player?: { seek: (timeSeconds: number) => void };

‎packages/core/src/runtime/init.ts‎

Lines changed: 52 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ import type { PlayerAPI } from "../core.types";
5353
import { swallow } from "./diagnostics";
5454
import { shouldAttemptPeriodicTimelineBind } from "./timelineRebindPolicy";
5555
import { installStudioCustomEase } from "./customEase";
56+
import { parseNumeric } from "./startExpression";
5657

5758
const AUTHORED_DURATION_ATTR = "data-hf-authored-duration";
5859
const AUTHORED_END_ATTR = "data-hf-authored-end";
@@ -606,37 +607,64 @@ export function initSandboxRuntimeModular(): void {
606607
return resolver.resolveDurationForElement(element);
607608
};
608609

609-
const resolveMediaStartSeconds = (element: Element, fallback = 0): number => {
610-
if (!element.hasAttribute("data-hf-auto-start") && element.hasAttribute("data-start")) {
611-
// `data-start` is authored relative to the media element's OWN sub-
612-
// composition, not the root timeline — `fallback` carries the host
613-
// composition's resolved absolute start (see syncMediaForCurrentState's
614-
// inheritedStart), so it must be added, not discarded. Skipping it made
615-
// a nested video play from root t=0 instead of holding until its
616-
// parent scene began (issue #1838) — resolveStartForElement's own
617-
// absolute-expression branch already adds this same host offset, this
618-
// fast literal-value path just didn't.
619-
const own = Math.max(0, Number(element.getAttribute("data-start") ?? 0) || 0);
620-
return own + fallback;
621-
}
622-
return resolveStartForElement(element, fallback);
610+
const resolveMediaCompositionContext = (element: Element) => {
611+
const compositionRoot = element.closest("[data-composition-id]");
612+
const inheritedStart = compositionRoot ? resolveStartForElement(compositionRoot, 0) : null;
613+
const inheritedDuration = compositionRoot
614+
? resolveDurationForElement(compositionRoot, { includeAuthoredTimingAttrs: true })
615+
: null;
616+
return { compositionRoot, inheritedStart, inheritedDuration };
623617
};
624618

619+
const resolveAbsoluteMediaStartSeconds = (element: Element): number => {
620+
const context = resolveMediaCompositionContext(element);
621+
const inheritedStart = context.inheritedStart ?? 0;
622+
const authoredStart = parseNumeric(element.getAttribute("data-start"));
623+
if (
624+
element.hasAttribute("data-hf-auto-start") ||
625+
authoredStart == null ||
626+
inheritedStart <= 0
627+
) {
628+
return resolveStartForElement(element, inheritedStart);
629+
}
630+
631+
// Both timing conventions exist in shipped projects:
632+
// - composition-local media, e.g. host@20 + video@0 => root@20
633+
// - legacy root-global PIP media, e.g. [email protected] + [email protected] => [email protected]
634+
// Preserve the global value when its authored window already intersects
635+
// the host's absolute window. Otherwise it is unambiguously local and
636+
// must inherit the recursively-resolved host start.
637+
const authoredDuration = parseNumeric(element.getAttribute("data-duration"));
638+
const hostDuration = context.inheritedDuration;
639+
const hostEnd = hostDuration != null && hostDuration > 0 ? inheritedStart + hostDuration : null;
640+
const authoredEnd =
641+
authoredDuration != null && authoredDuration > 0
642+
? authoredStart + authoredDuration
643+
: authoredStart;
644+
const overlapsHostWindow =
645+
hostEnd == null
646+
? authoredStart >= inheritedStart
647+
: authoredStart < hostEnd &&
648+
(authoredEnd > inheritedStart || authoredStart === inheritedStart);
649+
return overlapsHostWindow ? authoredStart : inheritedStart + authoredStart;
650+
};
651+
652+
window.__hfResolveMediaStartSeconds = resolveAbsoluteMediaStartSeconds;
653+
runtimeCleanupCallbacks.push(() => {
654+
if (window.__hfResolveMediaStartSeconds === resolveAbsoluteMediaStartSeconds) {
655+
delete window.__hfResolveMediaStartSeconds;
656+
}
657+
});
658+
625659
const isTimedElementVisibleAt = (rawNode: HTMLElement, currentTime: number): boolean => {
626660
const tag = rawNode.tagName.toLowerCase();
627661
if (tag === "script" || tag === "style" || tag === "link" || tag === "meta") {
628662
return false;
629663
}
630664

631665
const isMedia = tag === "video" || tag === "audio";
632-
const mediaCompositionHost = isMedia
633-
? rawNode.closest("[data-composition-src], [data-composition-file]")
634-
: null;
635-
const mediaCompositionStart = mediaCompositionHost
636-
? resolveStartForElement(mediaCompositionHost, 0)
637-
: 0;
638666
const start = isMedia
639-
? resolveMediaStartSeconds(rawNode, mediaCompositionStart)
667+
? resolveAbsoluteMediaStartSeconds(rawNode)
640668
: resolveStartForElement(rawNode, 0);
641669
let duration = resolveDurationForElement(rawNode);
642670
const compId = rawNode.getAttribute("data-composition-id");
@@ -736,7 +764,7 @@ export function initSandboxRuntimeModular(): void {
736764
if (mediaNodes.length === 0) return null;
737765
let maxWindowEndSeconds = 0;
738766
for (const node of mediaNodes) {
739-
const start = resolveMediaStartSeconds(node, 0);
767+
const start = resolveAbsoluteMediaStartSeconds(node);
740768
if (!Number.isFinite(start)) continue;
741769
const duration = resolveMediaElementDurationSeconds(node);
742770
if (duration == null || duration <= MIN_VALID_TIMELINE_DURATION_SECONDS) continue;
@@ -1951,30 +1979,16 @@ export function initSandboxRuntimeModular(): void {
19511979
};
19521980

19531981
const syncMediaForCurrentState = () => {
1954-
const resolveMediaCompositionContext = (element: HTMLVideoElement | HTMLAudioElement) => {
1955-
const compositionRoot = element.closest("[data-composition-id]");
1956-
const inheritedStart = compositionRoot ? resolveStartForElement(compositionRoot, 0) : null;
1957-
// Media sync follows the authored host window, matching visibility for
1958-
// authored composition hosts. Live child timeline duration only fills in
1959-
// when no authored timing exists, so seeks clamp against host clip timing.
1960-
const inheritedDuration = compositionRoot
1961-
? resolveDurationForElement(compositionRoot, { includeAuthoredTimingAttrs: true })
1962-
: null;
1963-
return { compositionRoot, inheritedStart, inheritedDuration };
1964-
};
19651982
const cache = refreshRuntimeMediaCache({
19661983
shouldIncludeElement: (element) =>
19671984
element.hasAttribute("data-start") ||
19681985
Boolean(resolveMediaCompositionContext(element).compositionRoot),
19691986
resolveStartSeconds: (element) => {
1970-
const context = resolveMediaCompositionContext(
1971-
element as HTMLVideoElement | HTMLAudioElement,
1972-
);
1973-
return resolveMediaStartSeconds(element, context.inheritedStart ?? 0);
1987+
return resolveAbsoluteMediaStartSeconds(element);
19741988
},
19751989
resolveDurationSeconds: (element) => {
19761990
const context = resolveMediaCompositionContext(element);
1977-
const start = resolveMediaStartSeconds(element, context.inheritedStart ?? 0);
1991+
const start = resolveAbsoluteMediaStartSeconds(element);
19781992
const mediaStart =
19791993
Number.parseFloat(element.dataset.playbackStart ?? element.dataset.mediaStart ?? "0") ||
19801994
0;

‎packages/core/src/runtime/window.d.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,12 @@ declare global {
7272
* freshly-injected `__render_frame__` images. See `forceDispatchSeekEvent`.
7373
*/
7474
__hfReseekGpu?: (time: number) => void;
75+
/**
76+
* Canonical root-timeline start for a media element. Snapshot capture uses
77+
* this runtime-owned resolver so reference expressions, authored timing
78+
* restoration, and arbitrary composition nesting cannot drift.
79+
*/
80+
__hfResolveMediaStartSeconds?: (element: Element) => number;
7581
__HF_PICKER_API?: HyperframePickerApi;
7682
gsap?: {
7783
timeline: (params?: { paused?: boolean }) => RuntimeTimelineLike;

0 commit comments

Comments
 (0)