Skip to content

Commit ca10d37

Browse files
committed
fix(core): a handed-over WebKit track goes back to its element when the speed changes
1 parent 94e2818 commit ca10d37

3 files changed

Lines changed: 27 additions & 6 deletions

File tree

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

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5932,9 +5932,10 @@ describe("initSandboxRuntimeModular", () => {
59325932
const startRouted = async (userAgent?: string) => {
59335933
if (userAgent) vi.spyOn(navigator, "userAgent", "get").mockReturnValue(userAgent);
59345934
const audio = mountAudio("/assets/track.mp3");
5935-
vi.spyOn(WebAudioTransport.prototype, "scheduleMediaElementPlayback").mockResolvedValue({
5936-
el: audio,
5937-
} as never);
5935+
Object.defineProperty(audio, "duration", { value: 10 });
5936+
const capture = vi
5937+
.spyOn(WebAudioTransport.prototype, "scheduleMediaElementPlayback")
5938+
.mockResolvedValue({ el: audio } as never);
59385939
vi.spyOn(WebAudioTransport.prototype, "decodeAudioElement").mockResolvedValue(
59395940
{} as AudioBuffer,
59405941
);
@@ -5943,7 +5944,7 @@ describe("initSandboxRuntimeModular", () => {
59435944
.mockResolvedValue({} as never);
59445945
const release = vi.spyOn(WebAudioTransport.prototype, "releaseRouted");
59455946
await startPlayback();
5946-
return { audio, schedule, release };
5947+
return { audio, schedule, release, capture };
59475948
};
59485949

59495950
it("hands the sound to a decoded buffer on the context clock once it is decoded", async () => {
@@ -5952,6 +5953,19 @@ describe("initSandboxRuntimeModular", () => {
59525953
expect(schedule).toHaveBeenCalledTimes(1);
59535954
});
59545955

5956+
it("returns a handed-over track to its element when the speed changes, to hold its pitch", async () => {
5957+
const { audio, schedule, release, capture } = await startRouted(SAFARI);
5958+
await vi.waitFor(() => expect(release).toHaveBeenCalledWith(audio));
5959+
vi.spyOn(WebAudioTransport.prototype, "hasHandedOverSources").mockReturnValue(true);
5960+
schedule.mockClear();
5961+
capture.mockClear();
5962+
5963+
setRate(1.5);
5964+
5965+
await vi.waitFor(() => expect(capture).toHaveBeenCalled());
5966+
expect(schedule).not.toHaveBeenCalled();
5967+
});
5968+
59555969
it("leaves the element on its route elsewhere", async () => {
59565970
const { schedule, release } = await startRouted();
59575971
await Promise.resolve();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ function decodesFirst(el: HTMLMediaElement): boolean {
485485
isWebKit() &&
486486
isAudioElement(el) &&
487487
!el.loop &&
488-
!(el.duration > DECODE_FIRST_MAX_SECONDS) &&
488+
el.duration <= DECODE_FIRST_MAX_SECONDS &&
489489
typeof readElementRateSpec(el) === "number" &&
490490
readElementPlaybackRate(el) === 1
491491
);
@@ -6064,7 +6064,7 @@ export function initSandboxRuntimeModular(): void {
60646064
!state.webAudioMediaDisabled &&
60656065
webAudioReady &&
60666066
clock.isPlaying() &&
6067-
webAudio.hasBoundedActiveSources()
6067+
(webAudio.hasBoundedActiveSources() || webAudio.hasHandedOverSources())
60686068
) {
60696069
webAudio.stopAll();
60706070
scheduleWebAudioForActiveClips();

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ export class WebAudioTransport {
236236
private _decoding = new Map<string, Promise<AudioBuffer | null>>();
237237
private _failedSrcs = new Set<string>();
238238
private _mediaElementSources = new WeakMap<HTMLMediaElement, MediaElementAudioSourceNode>();
239+
private _handedOver = new WeakSet<HTMLMediaElement>();
239240
private _activeSources: ScheduledSource[] = [];
240241
private _masterGain: GainNode | null = null;
241242
/** Where the master bus chain lands; the program meter taps here. */
@@ -1027,6 +1028,12 @@ export class WebAudioTransport {
10271028
if (!routed) return;
10281029
this._activeSources.splice(this._activeSources.indexOf(routed), 1);
10291030
this.dispose(routed);
1031+
this._handedOver.add(el);
1032+
}
1033+
1034+
/** A decoded buffer plays what an element carried: it cannot hold pitch through a speed change. */
1035+
hasHandedOverSources(): boolean {
1036+
return this._activeSources.some((s) => isBufferSource(s) && this._handedOver.has(s.el));
10301037
}
10311038

10321039
/**

0 commit comments

Comments
 (0)