Skip to content

Commit 6b3e7a7

Browse files
fix(cli): check and snapshot free video clips the playhead left, halving memory on cut films (#6929)
* fix(cli): check and snapshot free video clips the playhead left, halving memory on cut films * fix(core): drop the releaseMedia doc comment that raised the file's comment share
1 parent 439d017 commit 6b3e7a7

7 files changed

Lines changed: 55 additions & 3 deletions

File tree

‎packages/cli/src/capture/captureCompositionFrame.browserFallback.test.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,4 +278,13 @@ describe("openSettledCompositionPage when nothing may listen", () => {
278278
"window.__HF_REPLAY_SKIPPED_FRAMES = true",
279279
);
280280
});
281+
282+
it("asks the page to free clips the playhead left, so a long film does not hold every decoder", async () => {
283+
const opened = fakeBrowser();
284+
mocks.launch.mockResolvedValue(opened.browser);
285+
await openSettledCompositionPage(HTML, "http://127.0.0.1:3000", OPTIONS);
286+
expect(opened.page.evaluateOnNewDocument).toHaveBeenCalledWith(
287+
"window.__HF_RELEASE_PASSED_MEDIA = true",
288+
);
289+
});
281290
});

‎packages/cli/src/capture/captureCompositionFrame.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,7 @@ export async function openSettledCompositionPage(
343343
await installMediaRenderIdBridge(page);
344344
await page.evaluateOnNewDocument(forcePreservedDrawingBuffer);
345345
await page.evaluateOnNewDocument("window.__HF_REPLAY_SKIPPED_FRAMES = true");
346+
await page.evaluateOnNewDocument("window.__HF_RELEASE_PASSED_MEDIA = true");
346347
await page.setViewport(viewport);
347348
if (answer) await answerPageInProcess(page, url, answer);
348349
await options.beforeNavigate?.(page);

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ function resetRuntimeGlobals(): void {
6262
window.__timelines = {};
6363
delete window.__player;
6464
delete window.__playerReady;
65+
delete window.__HF_RELEASE_PASSED_MEDIA;
6566
delete window.__renderReady;
6667
delete window.__hfTimelinesBuilding;
6768
const win = window as {
@@ -500,6 +501,28 @@ describe("runtime entry", () => {
500501
expect(loadsOf(queued)).toEqual([1]);
501502
});
502503

504+
it.each([
505+
[true, 2],
506+
[false, 1],
507+
])(
508+
"with a capture page flag %s, a fully buffered clip the playhead left is reloaded %s times",
509+
async (flag, loadCount) => {
510+
spyLoad();
511+
servePreview();
512+
window.__HF_RELEASE_PASSED_MEDIA = flag;
513+
const [now, later] = videos(mountRoot(), "0", "9");
514+
Object.defineProperty(now, "duration", { value: 5 });
515+
Object.defineProperty(now, "buffered", {
516+
value: { length: 1, start: () => 0, end: () => 5 },
517+
});
518+
519+
await evaluateRuntime();
520+
window.__player?.seek(7.6);
521+
expect(armed(now, later)).toEqual([false, true]);
522+
expect(loadsOf(now)).toEqual([loadCount]);
523+
},
524+
);
525+
503526
it("frees a clip the playhead has passed while it is still downloading, and keeps one that finished", async () => {
504527
spyLoad();
505528
servePreview();

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3145,7 +3145,10 @@ export function initSandboxRuntimeModular(): void {
31453145
if (el.preload !== "none") {
31463146
el.preload = "none";
31473147
// Frees a clip the window armed; on one the parser started, it would only restart the fetch.
3148-
if (decided) withoutOwnTimingRecords(el, () => releaseMedia(el));
3148+
if (decided)
3149+
withoutOwnTimingRecords(el, () =>
3150+
releaseMedia(el, window.__HF_RELEASE_PASSED_MEDIA === true),
3151+
);
31493152
}
31503153
} else if (!visible || decided === undefined) {
31513154
// Not a clip a jump lands on: the media sync arms that one, and load() would undo its seek.

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,20 @@ describe("releasing a clip's download", () => {
130130
expect(video.getAttribute("src")).toBe("a.mp4");
131131
});
132132

133+
it("frees a clip whose whole file is buffered when asked to", () => {
134+
const video = document.createElement("video");
135+
video.setAttribute("src", "a.mp4");
136+
Object.defineProperty(video, "duration", { value: 6.67 });
137+
Object.defineProperty(video, "buffered", {
138+
value: { length: 1, start: () => 0, end: () => 6.67 },
139+
});
140+
video.load = vi.fn();
141+
142+
releaseMedia(video, true);
143+
expect(video.load).toHaveBeenCalledTimes(1);
144+
expect(video.getAttribute("src")).toBe("a.mp4");
145+
});
146+
133147
it.each([
134148
[0, 15],
135149
[430, 2642],

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ function wholeFileBuffered(media: HTMLMediaElement): boolean {
8686
);
8787
}
8888

89-
export function releaseMedia(media: HTMLMediaElement): void {
90-
if (media.querySelector("source") || wholeFileBuffered(media)) return;
89+
export function releaseMedia(media: HTMLMediaElement, whenBuffered = false): void {
90+
if (media.querySelector("source") || (!whenBuffered && wholeFileBuffered(media))) return;
9191
const src = media.getAttribute("src");
9292
stopMediaDownload(media);
9393
if (src !== null) media.setAttribute("src", src);

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ declare global {
117117
__HF_PARITY_MODE?: boolean;
118118
/** Set by still-capture pages: seeks replay skipped frames at the composition fps, as a render does. */
119119
__HF_REPLAY_SKIPPED_FRAMES?: boolean;
120+
/** Set by check and snapshot, which seek through a film: a clip that leaves its window is freed. */
121+
__HF_RELEASE_PASSED_MEDIA?: boolean;
120122
/** Legacy debug-only fps hint. Render-mode runtime fps uses __HF_EXPORT_RENDER_SEEK_CONFIG.fps. */
121123
__HF_FPS?: number;
122124
__HF_MAX_DURATION_SEC?: number;

0 commit comments

Comments
 (0)