Skip to content

Commit 47ddded

Browse files
fix(core): Safari audio frozen after its cut is pulled onto the playhead at 0.5 s behind, not 1 s (#7082)
* fix(core): Safari audio that sits frozen after its cut is pulled onto the playhead in 0.4 s, not 1 s * fix(core): shorten the frozen-audio comment * fix(core): leave a WebKit audio element that is still filling data out of the frozen rule
1 parent 2daedcd commit 47ddded

2 files changed

Lines changed: 67 additions & 1 deletion

File tree

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

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1704,6 +1704,57 @@ describe("syncRuntimeMedia", () => {
17041704
expect(clip.el.currentTime).toBeGreaterThan(1);
17051705
});
17061706

1707+
it("pulls a WebKit audio element that sits frozen behind the playhead, well before the 1 s valve", () => {
1708+
const userAgent = vi
1709+
.spyOn(navigator, "userAgent", "get")
1710+
.mockReturnValue(
1711+
"Mozilla/5.0 AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.4 Safari/605.1.15",
1712+
);
1713+
const clip = createMockClip({ start: 0, end: 100, mediaStart: 0 }, "audio");
1714+
Object.defineProperty(clip.el, "paused", { value: false, writable: true, configurable: true });
1715+
Object.defineProperty(clip.el, "readyState", { value: 4 });
1716+
Object.defineProperty(clip.el, "currentTime", { value: 0, writable: true });
1717+
for (const t of [0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7]) {
1718+
syncRuntimeMedia({ clips: [clip], timeSeconds: t, playing: true, playbackRate: 1 });
1719+
}
1720+
userAgent.mockRestore();
1721+
expect(clip.el.currentTime).toBeGreaterThan(0.5);
1722+
});
1723+
1724+
it("leaves a WebKit audio element alone while it is still filling data", () => {
1725+
const userAgent = vi
1726+
.spyOn(navigator, "userAgent", "get")
1727+
.mockReturnValue(
1728+
"Mozilla/5.0 AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.4 Safari/605.1.15",
1729+
);
1730+
const clip = createMockClip({ start: 0, end: 100, mediaStart: 0 }, "audio");
1731+
Object.defineProperty(clip.el, "paused", { value: false, writable: true, configurable: true });
1732+
Object.defineProperty(clip.el, "readyState", { value: 2 });
1733+
Object.defineProperty(clip.el, "currentTime", { value: 0, writable: true });
1734+
for (const t of [0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7]) {
1735+
syncRuntimeMedia({ clips: [clip], timeSeconds: t, playing: true, playbackRate: 1 });
1736+
}
1737+
userAgent.mockRestore();
1738+
expect(clip.el.currentTime).toBe(0);
1739+
});
1740+
1741+
it("leaves a moving WebKit audio element alone at the same lag", () => {
1742+
const userAgent = vi
1743+
.spyOn(navigator, "userAgent", "get")
1744+
.mockReturnValue(
1745+
"Mozilla/5.0 AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.4 Safari/605.1.15",
1746+
);
1747+
const clip = createMockClip({ start: 0, end: 100, mediaStart: 0 }, "audio");
1748+
Object.defineProperty(clip.el, "paused", { value: false, writable: true, configurable: true });
1749+
Object.defineProperty(clip.el, "currentTime", { value: 0, writable: true });
1750+
for (const t of [0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7]) {
1751+
(clip.el as { currentTime: number }).currentTime = Math.max(0, t - 0.6);
1752+
syncRuntimeMedia({ clips: [clip], timeSeconds: t, playing: true, playbackRate: 1 });
1753+
}
1754+
userAgent.mockRestore();
1755+
expect(clip.el.currentTime).toBeLessThan(0.2);
1756+
});
1757+
17071758
it("clears offset baseline when clip deactivates — re-entry hard-syncs", () => {
17081759
const clip = createMockClip({ start: 0, end: 5, mediaStart: 0 });
17091760
Object.defineProperty(clip.el, "currentTime", { value: 0, writable: true });

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

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,17 @@ export function readElementPlaybackStart(el: Element): number {
3737
const HOLD_END_EVENTS = ["seeked", "loadeddata", "error", "emptied", "abort"] as const;
3838
export const HOLD_CAP_MS = 5000;
3939
const WEBKIT_STUCK_AUDIO_SECONDS = 1;
40+
// A playing WebKit audio element that has not moved for this long is frozen, not starting (it starts ~150 ms late).
41+
const WEBKIT_FROZEN_AUDIO_SECONDS = 0.4;
42+
const lastMoved = new WeakMap<HTMLMediaElement, { ct: number; at: number }>();
43+
function frozenAudioFor(el: HTMLMediaElement, ct: number, now: number): number {
44+
const m = lastMoved.get(el);
45+
if (!m || m.ct !== ct || el.paused || el.seeking || el.readyState < 3) {
46+
lastMoved.set(el, { ct, at: now });
47+
return 0;
48+
}
49+
return now - m.at;
50+
}
4051
const releaseHeldVideo = new WeakMap<HTMLMediaElement, () => void>();
4152

4253
// A seeking video still paints its previous frame, and one still fetching its first data paints none (its seek
@@ -242,6 +253,7 @@ function clampVolume(volume: number): number {
242253
* element at a different file without ever leaving its active window.
243254
*/
244255
export function evictMediaSyncState(el: HTMLMediaElement): void {
256+
lastMoved.delete(el);
245257
lastOffset.delete(el);
246258
lastRelativeTime.delete(el);
247259
strictDriftSamples.delete(el);
@@ -650,8 +662,11 @@ export function syncRuntimeMedia(params: {
650662
lastOffset.set(el, offset);
651663
const firstTickOfClip = prevOffset === undefined;
652664
const offsetJumped = !firstTickOfClip && Math.abs(offset - prevOffset!) > 0.5;
665+
const webkitAudio = el.tagName === "AUDIO" && isWebKit();
666+
const frozenFor = webkitAudio ? frozenAudioFor(el, currentElTime, params.timeSeconds) : 0;
653667
const catastrophicDrift =
654-
drift > (el.tagName === "AUDIO" && isWebKit() ? WEBKIT_STUCK_AUDIO_SECONDS : 3);
668+
drift > (webkitAudio ? WEBKIT_STUCK_AUDIO_SECONDS : 3) ||
669+
frozenFor >= WEBKIT_FROZEN_AUDIO_SECONDS;
655670
// A short audio clip can leave its native element paused just before EOF.
656671
// When the timeline re-enters the clip, rewind stale forward state at the
657672
// strict threshold; do not force cold audio forward while it buffers.

0 commit comments

Comments
 (0)