Skip to content

Commit 9058fd1

Browse files
fix(core): skip a video the browser can't decode instead of freezing the film (#7355)
* fix(core): skip a video the browser can't decode instead of freezing the film * fix(core): keep waiting on a clip whose play the browser refused; drop the codec-map skip
1 parent cf75dfd commit 9058fd1

2 files changed

Lines changed: 90 additions & 5 deletions

File tree

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

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
// fallow-ignore-file code-duplication
2-
import { describe, it, expect, vi, afterEach } from "vitest";
2+
import { describe, it, expect, vi, afterEach, onTestFinished } from "vitest";
33
import { mediaElementTime } from "./mediaClock";
44
import {
55
evictMediaSyncState,
66
hasMediaSyncStateForTest,
7+
isUnplayable,
78
primeMediaForLaterStarts,
89
readElementPlaybackRate,
910
readElementPlaybackStart,
@@ -1052,6 +1053,48 @@ describe("syncRuntimeMedia", () => {
10521053
expect(clip.el.play).not.toHaveBeenCalled();
10531054
});
10541055

1056+
function askedToPlayAtHeader(networkState: number, play?: () => Promise<void>) {
1057+
vi.useFakeTimers({ toFake: ["performance"] });
1058+
onTestFinished(() => vi.useRealTimers());
1059+
const warn = vi.spyOn(console, "warn").mockImplementation(() => {});
1060+
onTestFinished(() => warn.mockRestore());
1061+
const clip = createMockClip({ start: 0, end: 10 });
1062+
clip.el.src = "/alpha.webm";
1063+
if (play) clip.el.play = vi.fn(play);
1064+
Object.defineProperty(clip.el, "readyState", { value: 1, configurable: true });
1065+
Object.defineProperty(clip.el, "networkState", { value: networkState, configurable: true });
1066+
syncRuntimeMedia({ clips: [clip], timeSeconds: 1, playing: true, playbackRate: 1 });
1067+
expect(clip.el.play).toHaveBeenCalledTimes(1);
1068+
return { el: clip.el, warn };
1069+
}
1070+
1071+
it("skips a clip whose fetch stopped at its header 5 s after it was asked to play", () => {
1072+
const { el, warn } = askedToPlayAtHeader(HTMLMediaElement.NETWORK_IDLE);
1073+
vi.advanceTimersByTime(4999);
1074+
expect(isUnplayable(el)).toBe(false);
1075+
vi.advanceTimersByTime(1);
1076+
expect(isUnplayable(el)).toBe(true);
1077+
expect(isUnplayable(el)).toBe(true);
1078+
expect(warn).toHaveBeenCalledTimes(1);
1079+
expect(String(warn.mock.calls[0]?.[0])).toContain("/alpha.webm");
1080+
});
1081+
1082+
it("keeps waiting on a clip still loading at its header 5 s after it was asked to play", () => {
1083+
const { el, warn } = askedToPlayAtHeader(HTMLMediaElement.NETWORK_LOADING);
1084+
vi.advanceTimersByTime(60_000);
1085+
expect(isUnplayable(el)).toBe(false);
1086+
expect(warn).not.toHaveBeenCalled();
1087+
});
1088+
1089+
it("keeps waiting on a clip at its header whose play() the browser refused", async () => {
1090+
const refused = () => Promise.reject(new DOMException("needs a tap", "NotAllowedError"));
1091+
const { el, warn } = askedToPlayAtHeader(HTMLMediaElement.NETWORK_IDLE, refused);
1092+
await Promise.resolve();
1093+
vi.advanceTimersByTime(5000);
1094+
expect(isUnplayable(el)).toBe(false);
1095+
expect(warn).not.toHaveBeenCalled();
1096+
});
1097+
10551098
it("plays again once the element recovers (error clears)", () => {
10561099
const clip = createMockClip({ start: 0, end: 10 });
10571100
Object.defineProperty(clip.el, "error", { value: { code: 4 }, configurable: true });

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

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ const seekLoadRetried = new WeakSet<HTMLMediaElement>();
208208
const playRequested = new WeakSet<HTMLMediaElement>();
209209
const startedEarly = new WeakSet<HTMLMediaElement>();
210210
function markPlayRequested(el: HTMLMediaElement): void {
211+
noteFirstPlayAsk(el);
211212
if (playRequested.has(el)) return;
212213
playRequested.add(el);
213214
const clear = () => playRequested.delete(el);
@@ -229,10 +230,48 @@ export function primeMediaForLaterStarts(els: Iterable<HTMLMediaElement>): void
229230

230231
// HTMLMediaElement.NETWORK_NO_SOURCE — no usable source (404 / unsupported).
231232
const MEDIA_NETWORK_NO_SOURCE = 3;
232-
// An element that errored or has no source can't play; re-issuing play() every
233-
// tick just floods rejections. Skip it until its state changes (src reload).
233+
const MEDIA_NETWORK_IDLE = 1;
234+
const MEDIA_HAVE_METADATA = 1;
235+
const STOPPED_AT_METADATA_MS = 5000;
236+
const firstPlayAskedAt = new WeakMap<HTMLMediaElement, number | null>();
237+
const watchedForFirstFrame = new WeakSet<HTMLMediaElement>();
238+
const warnedSkipped = new WeakSet<HTMLMediaElement>();
239+
240+
const sourceOf = (el: HTMLMediaElement): string => el.currentSrc || el.src;
241+
242+
function noteFirstPlayAsk(el: HTMLMediaElement): void {
243+
if (!watchedForFirstFrame.has(el)) {
244+
watchedForFirstFrame.add(el);
245+
el.addEventListener("loadeddata", () => firstPlayAskedAt.set(el, null));
246+
el.addEventListener("emptied", () => firstPlayAskedAt.delete(el));
247+
}
248+
if (!firstPlayAskedAt.has(el)) {
249+
firstPlayAskedAt.set(el, el.readyState > MEDIA_HAVE_METADATA ? null : performance.now());
250+
}
251+
}
252+
253+
function stoppedAtMetadata(el: HTMLMediaElement): boolean {
254+
const askedAt = firstPlayAskedAt.get(el);
255+
return (
256+
askedAt != null &&
257+
performance.now() - askedAt >= STOPPED_AT_METADATA_MS &&
258+
el.readyState === MEDIA_HAVE_METADATA &&
259+
el.networkState === MEDIA_NETWORK_IDLE
260+
);
261+
}
262+
263+
// Errored, sourceless, or stopped loading at its header since first asked to play: it can't play, and
264+
// re-issuing play() every tick just floods rejections. Skip it until its state changes (src reload).
234265
export function isUnplayable(el: HTMLMediaElement): boolean {
235-
return el.error != null || el.networkState === MEDIA_NETWORK_NO_SOURCE;
266+
if (el.error != null || el.networkState === MEDIA_NETWORK_NO_SOURCE) return true;
267+
if (!stoppedAtMetadata(el)) return false;
268+
if (!warnedSkipped.has(el)) {
269+
warnedSkipped.add(el);
270+
console.warn(
271+
`[hyperframes] skipping "${sourceOf(el)}": the browser stopped loading it after its header; the rest plays`,
272+
);
273+
}
274+
return true;
236275
}
237276

238277
const lastRuntimeAppliedVolume = new WeakMap<HTMLMediaElement, number>();
@@ -815,7 +854,10 @@ export function syncRuntimeMedia(params: {
815854
err && typeof err === "object" && "name" in err
816855
? String((err as { name?: unknown }).name ?? "")
817856
: "";
818-
if (name === "NotAllowedError") params.onAutoplayBlocked?.();
857+
if (name === "NotAllowedError") {
858+
firstPlayAskedAt.delete(el);
859+
params.onAutoplayBlocked?.();
860+
}
819861
});
820862
} else if (!playing && !el.paused) {
821863
el.pause();

0 commit comments

Comments
 (0)