Skip to content

🎥 Make videos programmatically with React

`@remotion/media`: give deferred audio waiters a turn when premounting ends (#10464)

Noah99185b32b52f
diff --git a/packages/media/src/media-player.ts b/packages/media/src/media-player.ts
index 3b6d8d1042..3f9cf7a0f7 100644
--- a/packages/media/src/media-player.ts
+++ b/packages/media/src/media-player.ts
@@ -17,6 +17,7 @@ import {
getScheduledTime,
getTrimStartForAudioNode,
} from './audio/get-scheduled-time';
+import {processNext} from './audio/sort-by-priority';
import {drawPreviewOverlay} from './debug-overlay/preview-overlay';
import {getDurationOrCompute} from './get-duration-or-compute';
import {acquireSharedInput, releaseSharedInput} from './get-shared-input';
@@ -639,10 +640,12 @@ export class MediaPlayer {
public setIsPremounting(isPremounting: boolean): void {
this.premountAwareDelayPlayback.setIsPremounting(isPremounting);
+ processNext();
}
public setIsPostmounting(isPostmounting: boolean): void {
this.premountAwareDelayPlayback.setIsPostmounting(isPostmounting);
+ processNext();
}
public async setLoop(
diff --git a/packages/media/src/test/premount-arm-kicks-scheduler.test.ts b/packages/media/src/test/premount-arm-kicks-scheduler.test.ts
new file mode 100644
index 0000000000..c2dd40f687
--- /dev/null
+++ b/packages/media/src/test/premount-arm-kicks-scheduler.test.ts
@@ -0,0 +1,110 @@
+import type {useBufferState} from 'remotion';
+import {expect, test} from 'vitest';
+import {waitForTurn} from '../audio/sort-by-priority';
+import {MediaPlayer} from '../media-player';
+
+const makePlayer = ({
+ isPremounting,
+ isPostmounting,
+}: {
+ isPremounting: boolean;
+ isPostmounting: boolean;
+}) => {
+ return new MediaPlayer({
+ canvas: null,
+ src: '/bigbuckbunny.mp4',
+ logLevel: 'info',
+ sharedAudioContext: null,
+ loop: false,
+ trimBefore: undefined,
+ trimAfter: undefined,
+ playbackRate: 1,
+ globalPlaybackRate: 1,
+ audioStreamIndex: 0,
+ fps: 30,
+ debugOverlay: false,
+ bufferState: {
+ delayPlayback: () => ({unblock: () => undefined}),
+ } as unknown as ReturnType<typeof useBufferState>,
+ isPremounting,
+ isPostmounting,
+ durationInFrames: 100,
+ onVideoFrameCallback: null,
+ playing: false,
+ sequenceOffset: 0,
+ credentials: undefined,
+ requestInit: undefined,
+ tagType: 'audio',
+ getEffects: () => [],
+ getEffectChainState: () => null,
+ });
+};
+
+const sleep = (ms: number) =>
+ new Promise<void>((resolve) => {
+ setTimeout(resolve, ms);
+ });
+
+const parkWaiter = () => {
+ const events: string[] = [];
+ let priority: number | null = 3;
+
+ waitForTurn({
+ getPriority: () => priority,
+ fn: () => Promise.resolve('deferred'),
+ onDone: (_, triggerNext) => {
+ events.push('done');
+ triggerNext();
+ },
+ onError: (err) => {
+ events.push((err as Error).name);
+ },
+ });
+
+ return {
+ events,
+ setPriority: (newPriority: number | null) => {
+ priority = newPriority;
+ },
+ };
+};
+
+test('ending premounting gives deferred audio waiters a turn', async () => {
+ const {events, setPriority} = parkWaiter();
+ const mediaPlayer = makePlayer({isPremounting: true, isPostmounting: false});
+
+ setPriority(1);
+ await sleep(50);
+ expect(events).toEqual([]);
+
+ mediaPlayer.setIsPremounting(false);
+ await sleep(50);
+ expect(events).toEqual(['done']);
+});
+
+test('ending postmounting gives deferred audio waiters a turn', async () => {
+ const {events, setPriority} = parkWaiter();
+ const mediaPlayer = makePlayer({isPremounting: false, isPostmounting: true});
+
+ setPriority(1);
+ await sleep(50);
+ expect(events).toEqual([]);
+
+ mediaPlayer.setIsPostmounting(false);
+ await sleep(50);
+ expect(events).toEqual(['done']);
+});
+
+test('the kick keeps deferring waiters beyond the horizon and sweeps stale ones', async () => {
+ const {events, setPriority} = parkWaiter();
+ const mediaPlayer = makePlayer({isPremounting: true, isPostmounting: false});
+
+ mediaPlayer.setIsPremounting(false);
+ await sleep(50);
+ expect(events).toEqual([]);
+
+ setPriority(null);
+ mediaPlayer.setIsPremounting(true);
+ await sleep(50);
+ expect(events).toEqual(['StaleWaiterError']);
+});