Skip to content

Commit 12cfb9b

Browse files
committed
fix(core): keep waiting on a clip whose play the browser refused; drop the codec-map skip
1 parent c19b28f commit 12cfb9b

4 files changed

Lines changed: 25 additions & 53 deletions

File tree

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1053,13 +1053,14 @@ describe("syncRuntimeMedia", () => {
10531053
expect(clip.el.play).not.toHaveBeenCalled();
10541054
});
10551055

1056-
function askedToPlayAtHeader(networkState: number) {
1056+
function askedToPlayAtHeader(networkState: number, play?: () => Promise<void>) {
10571057
vi.useFakeTimers({ toFake: ["performance"] });
10581058
onTestFinished(() => vi.useRealTimers());
10591059
const warn = vi.spyOn(console, "warn").mockImplementation(() => {});
10601060
onTestFinished(() => warn.mockRestore());
10611061
const clip = createMockClip({ start: 0, end: 10 });
10621062
clip.el.src = "/alpha.webm";
1063+
if (play) clip.el.play = vi.fn(play);
10631064
Object.defineProperty(clip.el, "readyState", { value: 1, configurable: true });
10641065
Object.defineProperty(clip.el, "networkState", { value: networkState, configurable: true });
10651066
syncRuntimeMedia({ clips: [clip], timeSeconds: 1, playing: true, playbackRate: 1 });
@@ -1085,6 +1086,15 @@ describe("syncRuntimeMedia", () => {
10851086
expect(warn).not.toHaveBeenCalled();
10861087
});
10871088

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+
10881098
it("plays again once the element recovers (error clears)", () => {
10891099
const clip = createMockClip({ start: 0, end: 10 });
10901100
Object.defineProperty(clip.el, "error", { value: { code: 4 }, configurable: true });

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

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -233,17 +233,12 @@ const MEDIA_NETWORK_NO_SOURCE = 3;
233233
const MEDIA_NETWORK_IDLE = 1;
234234
const MEDIA_HAVE_METADATA = 1;
235235
const STOPPED_AT_METADATA_MS = 5000;
236-
const codecRejectedSrc = new WeakMap<HTMLMediaElement, string>();
237236
const firstPlayAskedAt = new WeakMap<HTMLMediaElement, number | null>();
238237
const watchedForFirstFrame = new WeakSet<HTMLMediaElement>();
239238
const warnedSkipped = new WeakSet<HTMLMediaElement>();
240239

241240
const sourceOf = (el: HTMLMediaElement): string => el.currentSrc || el.src;
242241

243-
export function noteCodecRejected(el: HTMLMediaElement): void {
244-
codecRejectedSrc.set(el, sourceOf(el));
245-
}
246-
247242
function noteFirstPlayAsk(el: HTMLMediaElement): void {
248243
if (!watchedForFirstFrame.has(el)) {
249244
watchedForFirstFrame.add(el);
@@ -265,21 +260,18 @@ function stoppedAtMetadata(el: HTMLMediaElement): boolean {
265260
);
266261
}
267262

268-
// Errored, sourceless, codec-rejected, or stopped loading at its header since first asked to play: it can't play, and
263+
// Errored, sourceless, or stopped loading at its header since first asked to play: it can't play, and
269264
// re-issuing play() every tick just floods rejections. Skip it until its state changes (src reload).
270265
export function isUnplayable(el: HTMLMediaElement): boolean {
271266
if (el.error != null || el.networkState === MEDIA_NETWORK_NO_SOURCE) return true;
272-
const reason =
273-
codecRejectedSrc.get(el) === sourceOf(el)
274-
? "this browser can't decode its codec"
275-
: stoppedAtMetadata(el)
276-
? "the browser stopped loading it after its header"
277-
: null;
278-
if (reason !== null && !warnedSkipped.has(el)) {
267+
if (!stoppedAtMetadata(el)) return false;
268+
if (!warnedSkipped.has(el)) {
279269
warnedSkipped.add(el);
280-
console.warn(`[hyperframes] skipping "${sourceOf(el)}": ${reason}; the rest plays`);
270+
console.warn(
271+
`[hyperframes] skipping "${sourceOf(el)}": the browser stopped loading it after its header; the rest plays`,
272+
);
281273
}
282-
return reason !== null;
274+
return true;
283275
}
284276

285277
const lastRuntimeAppliedVolume = new WeakMap<HTMLMediaElement, number>();
@@ -862,7 +854,10 @@ export function syncRuntimeMedia(params: {
862854
err && typeof err === "object" && "name" in err
863855
? String((err as { name?: unknown }).name ?? "")
864856
: "";
865-
if (name === "NotAllowedError") params.onAutoplayBlocked?.();
857+
if (name === "NotAllowedError") {
858+
firstPlayAskedAt.delete(el);
859+
params.onAutoplayBlocked?.();
860+
}
866861
});
867862
} else if (!playing && !el.paused) {
868863
el.pause();

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

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import { afterEach, beforeEach, describe, expect, it, onTestFinished, vi } from "vitest";
1+
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
22
import {
33
hasMediaSyncStateForTest,
4-
isUnplayable,
54
syncRuntimeMedia as syncRuntimeMediaWithDuration,
65
} from "./media";
76
// Most cases predate the terminal rule and run with no composition end to hold at.
@@ -1420,30 +1419,3 @@ describe("describeVideoSources", () => {
14201419
delete window.__HF_MEDIA_SOURCE_FACTS__;
14211420
});
14221421
});
1423-
1424-
describe("a source the codec map says this browser can't decode", () => {
1425-
const VP9: MediaCodecMapEntry = {
1426-
codecName: "vp9",
1427-
browserHostile: false,
1428-
representativeMime: 'video/webm; codecs="vp9"',
1429-
hasAlpha: true,
1430-
};
1431-
1432-
it("is skipped with one warning naming it, and a decodable one is not", () => {
1433-
const warn = vi.spyOn(console, "warn").mockImplementation(() => {});
1434-
onTestFinished(() => warn.mockRestore());
1435-
window.__HF_MEDIA_CODEC_MAP__ = { "/alpha.webm": VP9, "/other.webm": VP9 };
1436-
const rejected = createVideo("/alpha.webm");
1437-
stubCanPlayType(rejected, "");
1438-
const decodable = createVideo("/other.webm");
1439-
stubCanPlayType(decodable, "probably");
1440-
maybeProxyProactively(rejected);
1441-
maybeProxyProactively(decodable);
1442-
expect(isUnplayable(rejected)).toBe(true);
1443-
expect(isUnplayable(rejected)).toBe(true);
1444-
expect(isUnplayable(decodable)).toBe(false);
1445-
expect(isProxied(rejected)).toBe(false);
1446-
expect(warn).toHaveBeenCalledTimes(1);
1447-
expect(String(warn.mock.calls[0]?.[0])).toContain("/alpha.webm");
1448-
});
1449-
});

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import {
44
evictMediaSyncState,
55
HOLD_CAP_MS,
66
isActiveAtPlayhead,
7-
noteCodecRejected,
87
sourceTimeAtPlayhead,
98
} from "./media";
109
import { findInjectedRenderFrame } from "./renderFrameSibling";
@@ -612,12 +611,8 @@ export function maybeProxyProactively(el: HTMLMediaElement): void {
612611
const entry = codecEntryOf(el);
613612
const canPlay = entry?.representativeMime ? el.canPlayType(entry.representativeMime) : "";
614613
const playable = canPlay === "probably" || canPlay === "maybe";
615-
if (entry?.browserHostile && !playable) {
616-
swapToProxy(el, entry, "proactive");
617-
return;
618-
}
619-
if (entry?.representativeMime && canPlay === "") noteCodecRejected(el);
620-
if (previewQuality < 1) lightenIfHeavy(el, entry);
614+
if (entry?.browserHostile && !playable) swapToProxy(el, entry, "proactive");
615+
else if (previewQuality < 1) lightenIfHeavy(el, entry);
621616
}
622617

623618
function lightenIfHeavy(el: HTMLMediaElement, entry: MediaCodecMapEntry | null): void {

0 commit comments

Comments
 (0)