From 3e0b8855067af7424f3e9c490d2a611c027a2a70 Mon Sep 17 00:00:00 2001 From: Thomas Pamminger Date: Wed, 24 Jun 2026 12:22:26 +0200 Subject: [PATCH 1/2] fix: pass clip-relative 0 to media-seek-request in resetPlaybackIfNeeded MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #resetPlaybackIfNeeded dispatches seekableStart() (absolute) to media-seek-request, but since 1.14.0 the seek handler treats the detail as clip-relative and boundTime() adds clipStartTime back. This double- adds clipStartTime, jumping clipped players to ~ clip end on play() after a clip ends or when realCurrentTime < seekableStart. Pass 0 instead — boundTime's isStart clamp resolves 0 + clipStartTime (<= seekableStart) to seekableStart(), the intended target. Safe for all video types: clipped on-demand (-> clipStartTime), non-clipped (-> 0), live DVR (-> DVR window start). Fixes the auto-advance / replay-after-clip-end regression that appeared in 1.14.0 (maverick 0.44.1) when currentTime became clip-relative. This contribution was created with the support of GLM-5.2. --- packages/vidstack/src/core/state/media-state-manager.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vidstack/src/core/state/media-state-manager.ts b/packages/vidstack/src/core/state/media-state-manager.ts index 920bf6a3c..829c9c5c6 100644 --- a/packages/vidstack/src/core/state/media-state-manager.ts +++ b/packages/vidstack/src/core/state/media-state-manager.ts @@ -690,7 +690,7 @@ export class MediaStateManager extends MediaPlayerController { if (shouldReset) { this.dispatch('media-seek-request', { - detail: seekableStart(), + detail: 0, trigger, }); } From 9cd8883bbd4090879115b0c3a20850850f20aec1 Mon Sep 17 00:00:00 2001 From: Thomas Pamminger Date: Mon, 28 Sep 2026 16:47:16 +0200 Subject: [PATCH 2/2] test: cover clip-relative playback resets --- .../core/state/media-state-manager.test.ts | 126 ++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 packages/vidstack/src/core/state/media-state-manager.test.ts diff --git a/packages/vidstack/src/core/state/media-state-manager.test.ts b/packages/vidstack/src/core/state/media-state-manager.test.ts new file mode 100644 index 000000000..f96db4597 --- /dev/null +++ b/packages/vidstack/src/core/state/media-state-manager.test.ts @@ -0,0 +1,126 @@ +import { signal } from 'maverick.js'; +import { vi } from 'vitest'; + +vi.mock('../api/player-controller', () => ({ + MediaPlayerController: class extends EventTarget { + $props = {}; + $state: any; + + createEvent(type: string, init?: EventInit & { detail?: unknown; trigger?: Event }) { + const event = new Event(type, init) as Event & { detail?: unknown; trigger?: Event }; + event.detail = init?.detail; + event.trigger = init?.trigger; + return event; + } + + dispatch(event: Event | string, init?: EventInit & { detail?: unknown; trigger?: Event }) { + return typeof event === 'string' + ? this.dispatchEvent(this.createEvent(event, init)) + : this.dispatchEvent(event); + } + + listen() { + return () => {}; + } + }, +})); + +import { mediaState } from '../api/player-state'; +import { TimeRange } from '../time-ranges'; +import { MediaRequestContext, MediaRequestManager } from './media-request-manager'; +import { MediaStateManager } from './media-state-manager'; + +it.each([ + [30, 40], + [300, 600], +])('replays an ended clip [%i, %i] from its absolute start', (start, end) => { + const { manager, provider, request, state } = setup(); + state.clipStartTime.set(start); + state.clipEndTime.set(end); + state.realCurrentTime.set(end); + state.ended.set(true); + + manager['play'](manager.createEvent('play')); + + expect(provider.setCurrentTime).toHaveBeenCalledOnce(); + expect(provider.setCurrentTime).toHaveBeenCalledWith(start); + expect(request.queue.peek('media-seek-request')).toHaveProperty('detail', 0); + expect(state.ended()).toBe(false); + expect(state.paused()).toBe(false); +}); + +it.each([ + { position: 'before the clip start', time: 0 }, + { position: 'at the clip end', time: 600 }, + { position: 'within the end tolerance', time: 599.95 }, +])('resets playback $position without an ended event', ({ time }) => { + const { manager, provider, state } = setup(); + state.realCurrentTime.set(time); + + manager['play'](manager.createEvent('play')); + + expect(provider.setCurrentTime).toHaveBeenCalledOnce(); + expect(provider.setCurrentTime).toHaveBeenCalledWith(300); +}); + +it('does not reset playback within the clip', () => { + const { manager, provider, state } = setup(); + state.realCurrentTime.set(450); + + manager['play'](manager.createEvent('play')); + + expect(provider.setCurrentTime).not.toHaveBeenCalled(); +}); + +it('replays unclipped media from zero', () => { + const { manager, provider, state } = setup(); + state.clipStartTime.set(0); + state.clipEndTime.set(0); + state.realCurrentTime.set(900); + state.ended.set(true); + + manager['play'](manager.createEvent('play')); + + expect(provider.setCurrentTime).toHaveBeenCalledOnce(); + expect(provider.setCurrentTime).toHaveBeenCalledWith(0); +}); + +it('resets playback before a live DVR window to the window start', () => { + const { manager, provider, state } = setup(); + state.clipStartTime.set(0); + state.clipEndTime.set(0); + state.inferredStreamType.set('live:dvr'); + state.inferredLiveDVRWindow.set(300); + state.userBehindLiveEdge.set(true); + state.realCurrentTime.set(500); + + expect(state.seekableStart()).toBe(600); + + manager['play'](manager.createEvent('play')); + + expect(provider.setCurrentTime).toHaveBeenCalledOnce(); + expect(provider.setCurrentTime).toHaveBeenCalledWith(600); +}); + +function setup() { + const provider = { setCurrentTime: vi.fn() }, + request = new MediaRequestContext(), + state = mediaState.create(), + media = { $provider: signal(provider) }, + manager = new MediaStateManager(request, media as any), + requests = new MediaRequestManager(manager, request, media as any); + + state.canPlay.set(true); + state.seekable.set(new TimeRange(0, 900)); + state.clipStartTime.set(300); + state.clipEndTime.set(600); + + (manager as any).$state = state; + (requests as any).$state = state; + + manager.addEventListener('media-seek-request', (event) => { + requests['media-seek-request'](event as any); + }); + + return { manager, provider, request, state }; +}