Skip to content

Commit c6ddf2d

Browse files
committed
fix(core): WebKit audio seeks to its in-point before its cut, and a stuck one resyncs in 1 s
1 parent 5a07ea2 commit c6ddf2d

4 files changed

Lines changed: 41 additions & 5 deletions

File tree

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1687,6 +1687,23 @@ describe("syncRuntimeMedia", () => {
16871687
expect(clip.el.currentTime).toBeGreaterThan(3);
16881688
});
16891689

1690+
it("pulls a WebKit audio element frozen on its in-point onto the playhead after 1 s, not 3", () => {
1691+
const userAgent = vi
1692+
.spyOn(navigator, "userAgent", "get")
1693+
.mockReturnValue(
1694+
"Mozilla/5.0 AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.4 Safari/605.1.15",
1695+
);
1696+
const clip = createMockClip({ start: 0, end: 100, mediaStart: 0 }, "audio");
1697+
Object.defineProperty(clip.el, "paused", { value: false, writable: true, configurable: true });
1698+
Object.defineProperty(clip.el, "currentTime", { value: 0, writable: true });
1699+
syncRuntimeMedia({ clips: [clip], timeSeconds: 0, playing: true, playbackRate: 1 });
1700+
for (let t = 0.3; t <= 1.5; t += 0.3) {
1701+
syncRuntimeMedia({ clips: [clip], timeSeconds: t, playing: true, playbackRate: 1 });
1702+
}
1703+
userAgent.mockRestore();
1704+
expect(clip.el.currentTime).toBeGreaterThan(1);
1705+
});
1706+
16901707
it("clears offset baseline when clip deactivates — re-entry hard-syncs", () => {
16911708
const clip = createMockClip({ start: 0, end: 5, mediaStart: 0 });
16921709
Object.defineProperty(clip.el, "currentTime", { value: 0, writable: true });

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { swallow } from "./diagnostics";
22
import { isClipVisibleAt, isInClipWindow } from "./clipWindow";
3-
import { mediaElementTime, startsSoundOnlyInsideATap } from "./mediaClock";
3+
import { isWebKit, mediaElementTime, startsSoundOnlyInsideATap } from "./mediaClock";
44
import { sameInstant } from "../clipFacts";
55
import { interpolateVolumeGain } from "./mediaVolumeEnvelope.js";
66
import { elementVolumeLaneGain } from "./audioAutomationVolume.js";
@@ -36,6 +36,8 @@ export function readElementPlaybackStart(el: Element): number {
3636

3737
const HOLD_END_EVENTS = ["seeked", "loadeddata", "error", "emptied", "abort"] as const;
3838
export const HOLD_CAP_MS = 5000;
39+
// Past this a WebKit audio element that has not moved is stuck on a seek, not slow to start (output lags 0.15 to 0.4 s).
40+
const WEBKIT_STUCK_AUDIO_SECONDS = 1;
3941
const releaseHeldVideo = new WeakMap<HTMLMediaElement, () => void>();
4042

4143
// A seeking video still paints its previous frame, and one still fetching its first data paints none (its seek
@@ -644,7 +646,8 @@ export function syncRuntimeMedia(params: {
644646
lastOffset.set(el, offset);
645647
const firstTickOfClip = prevOffset === undefined;
646648
const offsetJumped = !firstTickOfClip && Math.abs(offset - prevOffset!) > 0.5;
647-
const catastrophicDrift = drift > 3;
649+
const catastrophicDrift =
650+
drift > (el.tagName === "AUDIO" && isWebKit() ? WEBKIT_STUCK_AUDIO_SECONDS : 3);
648651
// A short audio clip can leave its native element paused just before EOF.
649652
// When the timeline re-enters the clip, rewind stale forward state at the
650653
// strict threshold; do not force cold audio forward while it buffers.

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

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ describe("releasing a clip's download", () => {
174174
});
175175

176176
describe("preparing upcoming video playback", () => {
177+
afterEach(() => vi.restoreAllMocks());
177178
function video() {
178179
const element = document.createElement("video");
179180
element.setAttribute("data-media-start", "6");
@@ -233,7 +234,7 @@ describe("preparing upcoming video playback", () => {
233234
expect(element.currentTime).toBe(0);
234235
});
235236

236-
it("does not prepare an audio clip's source offset", () => {
237+
it("does not prepare an audio clip's source offset outside WebKit", () => {
237238
const element = document.createElement("audio");
238239
element.setAttribute("data-media-start", "6");
239240
element.load = vi.fn();
@@ -244,4 +245,19 @@ describe("preparing upcoming video playback", () => {
244245
expect(element.currentTime).toBe(0);
245246
element.remove();
246247
});
248+
249+
it("prepares an upcoming audio clip's source offset in WebKit, so the cut has no seek to wait for", () => {
250+
vi.spyOn(navigator, "userAgent", "get").mockReturnValue(
251+
"Mozilla/5.0 AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.4 Safari/605.1.15",
252+
);
253+
const element = document.createElement("audio");
254+
element.setAttribute("data-media-start", "6");
255+
element.load = vi.fn();
256+
document.body.appendChild(element);
257+
258+
prepareUpcomingMedia(element, () => true);
259+
element.dispatchEvent(new Event("loadedmetadata"));
260+
expect(element.currentTime).toBeCloseTo(6, 3);
261+
element.remove();
262+
});
247263
});

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { createRuntimeStartTimeResolver } from "./startResolver";
33
import { readMediaRenderId } from "./renderFrameSibling";
44
import { defersMedia } from "./timedClipHide";
55
import { swallow } from "./diagnostics";
6-
import { mediaElementTime } from "./mediaClock";
6+
import { isWebKit, mediaElementTime } from "./mediaClock";
77

88
const MEDIA_EDGE_SECONDS = 0.1;
99

@@ -36,7 +36,7 @@ function cancelPlaybackStart(media: HTMLMediaElement): void {
3636

3737
export function prepareUpcomingMedia(media: HTMLMediaElement, isUpcoming: () => boolean): void {
3838
cancelPlaybackStart(media);
39-
if (media.tagName !== "VIDEO" || isRenderFrameVideo(media)) return;
39+
if ((media.tagName !== "VIDEO" && !isWebKit()) || isRenderFrameVideo(media)) return;
4040
const prepare = () => {
4141
if (!media.isConnected || !media.paused || media.seeking || !isUpcoming()) return;
4242
const start = readMediaStart(media);

0 commit comments

Comments
 (0)