Skip to content

Commit 58df7e8

Browse files
committed
fix(player): a parent audio proxy of a video clip is seeked when its lag holds, not rate-chased
1 parent 16c6ac8 commit 58df7e8

3 files changed

Lines changed: 24 additions & 8 deletions

File tree

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,19 @@ const AUDIO_STEER_LIMIT_SECONDS = 0.1;
1515
/** Direction (+1 fast, -1 slow) an element is being steered in; absent when it plays at its authored rate. */
1616
const steering = new WeakMap<HTMLMediaElement, number>();
1717

18-
/** Rate or seek for media `offset` s behind (+) or ahead (-); a lag still growing (`settled` false) never seeks. */
18+
/**
19+
* Rate or seek for media `offset` s behind (+) or ahead (-); a lag still growing (`settled` false) never seeks.
20+
* `audioOnly` is what the element is for: only its sound is heard (an `<audio>`, or a proxy of any tag).
21+
*/
1922
export function steerMedia(
2023
el: HTMLMediaElement,
2124
offset: number,
2225
baseRate: number,
2326
settled: boolean,
27+
audioOnly = el.tagName === "AUDIO",
2428
): { rate: number; seek: boolean } {
2529
const lag = Math.abs(offset);
26-
if (el.tagName === "AUDIO" && settled && lag > AUDIO_STEER_LIMIT_SECONDS) {
30+
if (audioOnly && settled && lag > AUDIO_STEER_LIMIT_SECONDS) {
2731
steering.delete(el);
2832
return { rate: baseRate, seek: true };
2933
}
@@ -35,7 +39,7 @@ export function steerMedia(
3539
return { rate: baseRate, seek: false };
3640
}
3741
const step = MEDIA_STEER_STEPS.find(([from]) => lag > from)?.[1] ?? MEDIA_STEER;
38-
const steer = el.tagName === "AUDIO" ? Math.min(step, AUDIO_MAX_STEER) : step;
42+
const steer = audioOnly ? Math.min(step, AUDIO_MAX_STEER) : step;
3943
return { rate: baseRate * (1 + direction * steer), seek: false };
4044
}
4145

‎packages/player/src/parent-media.test.ts‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ import { mediaElementTime } from "@hyperframes/core/runtime/media-clock";
33
import { ParentMediaManager, type ProxyEntry } from "./parent-media";
44

55
// A fake media element whose paused state is driven by play()/pause() stubs.
6-
function makeFakeAudio(initiallyPaused: boolean): HTMLMediaElement {
7-
const el = new Audio();
6+
function makeFakeAudio(
7+
initiallyPaused: boolean,
8+
tag: "audio" | "video" = "audio",
9+
): HTMLMediaElement {
10+
const el = tag === "video" ? document.createElement("video") : new Audio();
811
let paused = initiallyPaused;
912
Object.defineProperty(el, "paused", { get: () => paused });
1013
el.pause = () => {
@@ -486,9 +489,9 @@ describe("ParentMediaManager drift policy", () => {
486489
});
487490

488491
// A playing proxy `lag` seconds behind a timeline at `t`, a clip that starts at 0 and plays from media 0.
489-
function playingProxy(lag: number, t = 5) {
492+
function playingProxy(lag: number, t = 5, tag: "audio" | "video" = "audio") {
490493
const mgr = makeManager({ isPaused: false });
491-
const el = makeFakeAudio(false);
494+
const el = makeFakeAudio(false, tag);
492495
const writes: number[] = [];
493496
let time = t - lag;
494497
Object.defineProperty(el, "currentTime", {
@@ -537,6 +540,15 @@ describe("ParentMediaManager drift policy", () => {
537540
expect(writes[0]).toBeCloseTo(mediaElementTime(5.1), 9);
538541
});
539542

543+
it("seeks a video proxy that holds a 1 s lag: a proxy is heard, whatever its tag", () => {
544+
const { mgr, el, writes, setTime } = playingProxy(1, 5, "video");
545+
mgr.mirrorTime(5);
546+
setTime(4.1);
547+
mgr.mirrorTime(5.1);
548+
expect(writes).toHaveLength(1);
549+
expect(el.playbackRate).toBe(1);
550+
});
551+
540552
it("steers, never seeks, a proxy whose lag keeps growing because it is stalled", () => {
541553
const { mgr, el, writes } = playingProxy(0.25);
542554
mgr.mirrorTime(5);

‎packages/player/src/parent-media.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ export class ParentMediaManager {
285285
const settled =
286286
m.lastOffset !== undefined && Math.abs(offset - m.lastOffset) < SETTLED_OFFSET_DELTA_SECONDS;
287287
m.lastOffset = offset;
288-
const { rate, seek } = steerMedia(m.el, offset, this._getPlaybackRate(), settled);
288+
const { rate, seek } = steerMedia(m.el, offset, this._getPlaybackRate(), settled, true);
289289
if (seek) this._jumpTo(m, target, true);
290290
else if (Math.abs(m.el.playbackRate - rate) > 1e-6) m.el.playbackRate = rate;
291291
}

0 commit comments

Comments
 (0)