From f7b49f12078e14cdc401808edd4f217df8d24ce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81ngel?= Date: Sat, 14 Nov 2026 01:54:54 +0000 Subject: [PATCH] fix(core): free a preview clip's decoder when the playhead leaves it (#7679) * fix(core): free a preview clip's decoder when the playhead leaves it * fix(core): keep audio buffered when the playhead leaves it, free only video decoders * fix(core): leave Safari's loaded video alone when the playhead leaves it --- ...reCompositionFrame.browserFallback.test.ts | 9 --- .../src/capture/captureCompositionFrame.ts | 1 - packages/core/src/runtime/entry.test.ts | 55 +++++++++++-------- packages/core/src/runtime/init.ts | 27 ++++++--- packages/core/src/runtime/window.d.ts | 3 +- 5 files changed, 53 insertions(+), 42 deletions(-) diff --git a/packages/cli/src/capture/captureCompositionFrame.browserFallback.test.ts b/packages/cli/src/capture/captureCompositionFrame.browserFallback.test.ts index 6f7fb7ee4b..f2f93673c7 100644 --- a/packages/cli/src/capture/captureCompositionFrame.browserFallback.test.ts +++ b/packages/cli/src/capture/captureCompositionFrame.browserFallback.test.ts @@ -278,13 +278,4 @@ describe("openSettledCompositionPage when nothing may listen", () => { "window.__HF_REPLAY_SKIPPED_FRAMES = true", ); }); - - it("asks the page to free clips the playhead left, so a long film does not hold every decoder", async () => { - const opened = fakeBrowser(); - mocks.launch.mockResolvedValue(opened.browser); - await openSettledCompositionPage(HTML, "http://127.0.0.1:3000", OPTIONS); - expect(opened.page.evaluateOnNewDocument).toHaveBeenCalledWith( - "window.__HF_RELEASE_PASSED_MEDIA = true", - ); - }); }); diff --git a/packages/cli/src/capture/captureCompositionFrame.ts b/packages/cli/src/capture/captureCompositionFrame.ts index ea2ace7943..048bfa6da8 100644 --- a/packages/cli/src/capture/captureCompositionFrame.ts +++ b/packages/cli/src/capture/captureCompositionFrame.ts @@ -344,7 +344,6 @@ export async function openSettledCompositionPage( await installMediaRenderIdBridge(page); await page.evaluateOnNewDocument(forcePreservedDrawingBuffer); await page.evaluateOnNewDocument("window.__HF_REPLAY_SKIPPED_FRAMES = true"); - await page.evaluateOnNewDocument("window.__HF_RELEASE_PASSED_MEDIA = true"); await page.setViewport(viewport); if (answer) await answerPageInProcess(page, url, answer); await options.beforeNavigate?.(page); diff --git a/packages/core/src/runtime/entry.test.ts b/packages/core/src/runtime/entry.test.ts index 371b5c2e0d..341950d378 100644 --- a/packages/core/src/runtime/entry.test.ts +++ b/packages/core/src/runtime/entry.test.ts @@ -67,7 +67,6 @@ function resetRuntimeGlobals(): void { window.__timelines = {}; delete window.__player; delete window.__playerReady; - delete window.__HF_RELEASE_PASSED_MEDIA; delete window.__renderReady; delete window.__hfTimelinesBuilding; const win = window as { @@ -713,27 +712,37 @@ describe("runtime entry", () => { expect(loadsOf(queued)).toEqual([1]); }); - it.each([ - [true, 2], - [false, 1], - ])( - "with a capture page flag %s, a fully buffered clip the playhead left is reloaded %s times", - async (flag, loadCount) => { - spyLoad(); - servePreview(); - window.__HF_RELEASE_PASSED_MEDIA = flag; - const [now, later] = videos(mountRoot(), "0", "9"); - Object.defineProperty(now, "duration", { value: 5 }); - Object.defineProperty(now, "buffered", { - value: { length: 1, start: () => 0, end: () => 5 }, - }); + it("frees a fully buffered clip the playhead has left, so it holds no decoder", async () => { + spyLoad(); + servePreview(); + const [now, later] = videos(mountRoot(), "0", "9"); + Object.defineProperty(now, "duration", { value: 5 }); + Object.defineProperty(now, "buffered", { + value: { length: 1, start: () => 0, end: () => 5 }, + }); - await evaluateRuntime(); - window.__player?.seek(7.6); - expect(armed(now, later)).toEqual([false, true]); - expect(loadsOf(now)).toEqual([loadCount]); - }, - ); + await evaluateRuntime(); + window.__player?.seek(7.6); + expect(armed(now, later)).toEqual([false, true]); + expect(loadsOf(now)).toEqual([2]); + }); + + it("keeps a fully buffered audio clip's buffer when the playhead leaves it", async () => { + spyLoad(); + servePreview(); + const root = mountRoot(); + const now = timed(root, "audio", "0"); + const later = timed(root, "audio", "9"); + Object.defineProperty(now, "duration", { value: 5 }); + Object.defineProperty(now, "buffered", { + value: { length: 1, start: () => 0, end: () => 5 }, + }); + + await evaluateRuntime(); + window.__player?.seek(7.6); + expect(armed(now, later)).toEqual([false, true]); + expect(loadsOf(now)).toEqual([1]); + }); it("frees a clip the playhead has passed while it is still downloading, and keeps one that finished", async () => { spyLoad(); @@ -802,9 +811,11 @@ describe("runtime entry", () => { servePreview(); const [, next] = videos(mountRoot(), "0", "5"); next.setAttribute("data-media-start", "6"); - Object.defineProperty(next, "readyState", { value: 4 }); + let readyState = 0; + Object.defineProperty(next, "readyState", { get: () => readyState }); await evaluateRuntime(); + readyState = 4; window.__player?.seek(3.5); expect(next.currentTime).toBe(mediaElementTime(6)); expect(next.paused).toBe(true); diff --git a/packages/core/src/runtime/init.ts b/packages/core/src/runtime/init.ts index fb7616702b..010cf5225f 100644 --- a/packages/core/src/runtime/init.ts +++ b/packages/core/src/runtime/init.ts @@ -2735,6 +2735,16 @@ export function initSandboxRuntimeModular(): void { state.mediaForceSyncNextTick = true; syncMediaForCurrentState(); }; + // Chromium's software decoders cost threads per loaded video; WebKit's reload of a shared file stalls audio. + const freesBufferedVideo = (el: unknown): el is HTMLVideoElement => + isVideoElement(el) && !isWebKit(); + // A far clip can finish a load the parser started before its window was decided. + const onMediaLoadedWhileFar = (event: Event) => { + const el = event.currentTarget; + if (!freesBufferedVideo(el) || mediaNearPlayhead.get(el) !== false || el.readyState === 0) + return; + withoutOwnTimingRecords(el, () => releaseMedia(el, true)); + }; const onMediaErrorForProxy = (event: Event) => { if (isMediaElement(event.currentTarget)) { handleErrorForProxy(event.currentTarget); @@ -2765,6 +2775,7 @@ export function initSandboxRuntimeModular(): void { mediaEl.removeEventListener("durationchange", scheduleMetadataDurationHydration); mediaEl.removeEventListener("loadedmetadata", onMediaLoadedMetadataForProxy); mediaEl.removeEventListener("loadedmetadata", onMediaLoadedMetadataForPlayhead); + mediaEl.removeEventListener("loadedmetadata", onMediaLoadedWhileFar); mediaEl.removeEventListener("loadedmetadata", onMediaLoadedMetadataForRoute); mediaEl.removeEventListener("error", onMediaErrorForProxy); metadataBoundMedia.delete(mediaEl); @@ -2822,6 +2833,7 @@ export function initSandboxRuntimeModular(): void { // for