@remotion/media 4.0.426 → 4.0.428

package/dist/audio/audio-preview-iterator.d.ts

@@ -1,5 +1,4 @@
 import type { WrappedAudioBuffer } from 'mediabunny';
-import { type AllowWait } from './allow-wait';
 export declare const HEALTHY_BUFFER_THRESHOLD_SECONDS = 1;
 export type QueuedNode = {
     node: AudioBufferSourceNode;
@@ -26,7 +25,7 @@ export declare const makeAudioIterator: (startFromSecond: number, cache: {
         from: number;
         until: number;
     } | null;
-    tryToSatisfySeek: (time: number, allowWait: AllowWait | null, onBufferScheduled: (buffer: WrappedAudioBuffer) => void) => Promise<{
+    tryToSatisfySeek: (time: number, onBufferScheduled: (buffer: WrappedAudioBuffer) => void) => Promise<{
         type: "not-satisfied";
         reason: string;
     } | {
@@ -34,6 +33,13 @@ export declare const makeAudioIterator: (startFromSecond: number, cache: {
     } | {
         type: "satisfied";
     }>;
+    bufferAsFarAsPossible: (onBufferScheduled: (buffer: WrappedAudioBuffer) => void, maxTimestamp: number) => Promise<{
+        type: "ended";
+    } | {
+        type: "waiting";
+    } | {
+        type: "max-reached";
+    }>;
     addChunkForAfterResuming: (buffer: AudioBuffer, timestamp: number) => void;
     moveQueuedChunksToPauseQueue: () => void;
     getNumberOfChunksAfterResuming: () => number;

package/dist/audio-iterator-manager.d.ts

@@ -1,8 +1,7 @@
 import type { InputAudioTrack, WrappedAudioBuffer } from 'mediabunny';
-import type { UseBufferState } from 'remotion';
 import type { DelayPlaybackIfNotPremounting } from './delay-playback-if-not-premounting';
 import type { Nonce } from './nonce-manager';
-export declare const audioIteratorManager: ({ audioTrack, delayPlaybackHandleIfNotPremounting, sharedAudioContext, getIsLooping, getEndTime, getStartTime, updatePlaybackTime, initialMuted, }: {
+export declare const audioIteratorManager: ({ audioTrack, delayPlaybackHandleIfNotPremounting, sharedAudioContext, getIsLooping, getEndTime, getStartTime, updatePlaybackTime, initialMuted, drawDebugOverlay, }: {
     audioTrack: InputAudioTrack;
     delayPlaybackHandleIfNotPremounting: () => DelayPlaybackIfNotPremounting;
     sharedAudioContext: AudioContext;
@@ -11,6 +10,7 @@ export declare const audioIteratorManager: ({ audioTrack, delayPlaybackHandleIfN
     getStartTime: () => number;
     initialMuted: boolean;
     updatePlaybackTime: (time: number) => void;
+    drawDebugOverlay: () => void;
 }) => {
     startAudioIterator: ({ nonce, playbackRate, startFromSecond, getIsPlaying, scheduleAudioNode, }: {
         startFromSecond: number;
@@ -38,7 +38,7 @@ export declare const audioIteratorManager: ({ audioTrack, delayPlaybackHandleIfN
             from: number;
             until: number;
         } | null;
-        tryToSatisfySeek: (time: number, allowWait: import("./audio/allow-wait").AllowWait | null, onBufferScheduled: (buffer: WrappedAudioBuffer) => void) => Promise<{
+        tryToSatisfySeek: (time: number, onBufferScheduled: (buffer: WrappedAudioBuffer) => void) => Promise<{
             type: "not-satisfied";
             reason: string;
         } | {
@@ -46,18 +46,23 @@ export declare const audioIteratorManager: ({ audioTrack, delayPlaybackHandleIfN
         } | {
             type: "satisfied";
         }>;
+        bufferAsFarAsPossible: (onBufferScheduled: (buffer: WrappedAudioBuffer) => void, maxTimestamp: number) => Promise<{
+            type: "ended";
+        } | {
+            type: "waiting";
+        } | {
+            type: "max-reached";
+        }>;
         addChunkForAfterResuming: (buffer: AudioBuffer, timestamp: number) => void;
         moveQueuedChunksToPauseQueue: () => void;
         getNumberOfChunksAfterResuming: () => number;
     } | null;
     destroyIterator: () => void;
-    seek: ({ newTime, nonce, fps, playbackRate, getIsPlaying, scheduleAudioNode, bufferState, }: {
+    seek: ({ newTime, nonce, playbackRate, getIsPlaying, scheduleAudioNode, }: {
         newTime: number;
         nonce: Nonce;
-        fps: number;
         playbackRate: number;
         getIsPlaying: () => boolean;
-        bufferState: UseBufferState;
         scheduleAudioNode: (node: AudioBufferSourceNode, mediaTimestamp: number) => void;
     }) => Promise<void>;
     getAudioIteratorsCreated: () => number;

package/dist/debug-overlay/preview-overlay.d.ts

@@ -1,4 +1,4 @@
-export declare const drawPreviewOverlay: ({ context, audioTime, audioContextState, audioSyncAnchor, playing, audioIteratorManager, videoIteratorManager, }: {
+export declare const drawPreviewOverlay: ({ context, audioTime, audioContextState, audioSyncAnchor, playing, audioIteratorManager, videoIteratorManager, playbackRate, }: {
     context: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D;
     audioTime: number | null;
     audioContextState: AudioContextState | null;
@@ -31,7 +31,7 @@ export declare const drawPreviewOverlay: ({ context, audioTime, audioContextStat
                 from: number;
                 until: number;
             } | null;
-            tryToSatisfySeek: (time: number, allowWait: import("../audio/allow-wait").AllowWait | null, onBufferScheduled: (buffer: import("mediabunny").WrappedAudioBuffer) => void) => Promise<{
+            tryToSatisfySeek: (time: number, onBufferScheduled: (buffer: import("mediabunny").WrappedAudioBuffer) => void) => Promise<{
                 type: "not-satisfied";
                 reason: string;
             } | {
@@ -39,18 +39,23 @@ export declare const drawPreviewOverlay: ({ context, audioTime, audioContextStat
             } | {
                 type: "satisfied";
             }>;
+            bufferAsFarAsPossible: (onBufferScheduled: (buffer: import("mediabunny").WrappedAudioBuffer) => void, maxTimestamp: number) => Promise<{
+                type: "ended";
+            } | {
+                type: "waiting";
+            } | {
+                type: "max-reached";
+            }>;
             addChunkForAfterResuming: (buffer: AudioBuffer, timestamp: number) => void;
             moveQueuedChunksToPauseQueue: () => void;
             getNumberOfChunksAfterResuming: () => number;
         } | null;
         destroyIterator: () => void;
-        seek: ({ newTime, nonce, fps, playbackRate, getIsPlaying, scheduleAudioNode, bufferState, }: {
+        seek: ({ newTime, nonce, playbackRate, getIsPlaying, scheduleAudioNode, }: {
             newTime: number;
             nonce: import("../nonce-manager").Nonce;
-            fps: number;
             playbackRate: number;
             getIsPlaying: () => boolean;
-            bufferState: import("remotion").UseBufferState;
             scheduleAudioNode: (node: AudioBufferSourceNode, mediaTimestamp: number) => void;
         }) => Promise<void>;
         getAudioIteratorsCreated: () => number;
@@ -86,4 +91,5 @@ export declare const drawPreviewOverlay: ({ context, audioTime, audioContextStat
         drawFrame: (frame: import("mediabunny").WrappedCanvas) => void;
         getFramesRendered: () => number;
     } | null;
+    playbackRate: number;
 }) => void;

package/dist/esm/index.mjs

@@ -36,9 +36,6 @@ var __callDispose = (stack, error, hasError) => {
   return next();
 };
 
-// src/index.ts
-import { registerAc3Decoder } from "@mediabunny/ac3";
-
 // src/audio/audio.tsx
 import { Internals as Internals15, useRemotionEnvironment as useRemotionEnvironment2 } from "remotion";
 
@@ -122,23 +119,6 @@ var roundTo4Digits = (timestamp) => {
   return Math.round(timestamp * 1000) / 1000;
 };
 
-// src/audio/allow-wait.ts
-var allowWaitRoutine = async (next, waitFn) => {
-  const result = await Promise.race([
-    next,
-    new Promise((resolve) => {
-      Promise.resolve().then(() => resolve());
-    })
-  ]);
-  if (!result) {
-    const unblock = waitFn.waitCallback();
-    const newRes = await next;
-    unblock();
-    return newRes;
-  }
-  return result;
-};
-
 // src/audio/audio-preview-iterator.ts
 var makeAudioIterator = (startFromSecond, cache) => {
   let destroyed = false;
@@ -146,21 +126,27 @@ var makeAudioIterator = (startFromSecond, cache) => {
   const queuedAudioNodes = [];
   const audioChunksForAfterResuming = [];
   let mostRecentTimestamp = -Infinity;
+  let pendingNext = null;
   const cleanupAudioQueue = () => {
     for (const node of queuedAudioNodes) {
       node.node.stop();
     }
     queuedAudioNodes.length = 0;
   };
-  const getNextOrNullIfNotAvailable = async (allowWait) => {
-    const next = iterator.next();
-    const result = allowWait ? await allowWaitRoutine(next, allowWait) : await Promise.race([
+  const getNextOrNullIfNotAvailable = async () => {
+    let next = pendingNext;
+    if (!next) {
+      next = iterator.next();
+    }
+    pendingNext = null;
+    const result = await Promise.race([
       next,
       new Promise((resolve) => {
         Promise.resolve().then(() => resolve());
       })
     ]);
     if (!result) {
+      pendingNext = next;
       return {
         type: "need-to-wait-for-it",
         waitPromise: async () => {
@@ -171,6 +157,7 @@ var makeAudioIterator = (startFromSecond, cache) => {
     }
     if (result.value) {
       mostRecentTimestamp = Math.max(mostRecentTimestamp, result.value.timestamp + result.value.duration);
+      pendingNext = iterator.next();
       return {
         type: "got-buffer",
         buffer: result.value
@@ -181,7 +168,7 @@ var makeAudioIterator = (startFromSecond, cache) => {
       mostRecentTimestamp
     };
   };
-  const tryToSatisfySeek = async (time, allowWait, onBufferScheduled) => {
+  const tryToSatisfySeek = async (time, onBufferScheduled) => {
     if (time < startFromSecond) {
       return {
         type: "not-satisfied",
@@ -189,7 +176,7 @@ var makeAudioIterator = (startFromSecond, cache) => {
       };
     }
     while (true) {
-      const buffer = await getNextOrNullIfNotAvailable(allowWait);
+      const buffer = await getNextOrNullIfNotAvailable();
       if (buffer.type === "need-to-wait-for-it") {
         return {
           type: "not-satisfied",
@@ -229,6 +216,25 @@ var makeAudioIterator = (startFromSecond, cache) => {
       throw new Error("Unreachable");
     }
   };
+  const bufferAsFarAsPossible = async (onBufferScheduled, maxTimestamp) => {
+    while (true) {
+      if (mostRecentTimestamp >= maxTimestamp) {
+        return { type: "max-reached" };
+      }
+      const buffer = await getNextOrNullIfNotAvailable();
+      if (buffer.type === "need-to-wait-for-it") {
+        return { type: "waiting" };
+      }
+      if (buffer.type === "got-end") {
+        return { type: "ended" };
+      }
+      if (buffer.type === "got-buffer") {
+        onBufferScheduled(buffer.buffer);
+        continue;
+      }
+      throw new Error("Unreachable");
+    }
+  };
   const removeAndReturnAllQueuedAudioNodes = () => {
     const nodes = queuedAudioNodes.slice();
     for (const node of nodes) {
@@ -302,6 +308,7 @@ var makeAudioIterator = (startFromSecond, cache) => {
       };
     },
     tryToSatisfySeek,
+    bufferAsFarAsPossible,
     addChunkForAfterResuming,
     moveQueuedChunksToPauseQueue,
     getNumberOfChunksAfterResuming
@@ -373,6 +380,7 @@ var makePrewarmedAudioIteratorCache = (audioSink) => {
 };
 
 // src/audio-iterator-manager.ts
+var MAX_BUFFER_AHEAD_SECONDS = 8;
 var audioIteratorManager = ({
   audioTrack,
   delayPlaybackHandleIfNotPremounting,
@@ -381,7 +389,8 @@ var audioIteratorManager = ({
   getEndTime,
   getStartTime,
   updatePlaybackTime,
-  initialMuted
+  initialMuted,
+  drawDebugOverlay
 }) => {
   let muted = initialMuted;
   let currentVolume = 1;
@@ -439,6 +448,7 @@ var audioIteratorManager = ({
       }
       audioBufferIterator.addChunkForAfterResuming(buffer.buffer, buffer.timestamp);
     }
+    drawDebugOverlay();
   };
   const startAudioIterator = async ({
     nonce,
@@ -460,7 +470,7 @@ var audioIteratorManager = ({
       audioIteratorsCreated++;
       audioBufferIterator = iterator;
       try {
-        for (let i = 0;i < 3; i++) {
+        for (let i = 0;i < 6; i++) {
           const result = await iterator.getNext();
           if (iterator.isDestroyed()) {
             return;
@@ -478,6 +488,16 @@ var audioIteratorManager = ({
             scheduleAudioNode
           });
         }
+        await iterator.bufferAsFarAsPossible((buffer) => {
+          if (!nonce.isStale()) {
+            onAudioChunk({
+              getIsPlaying,
+              buffer,
+              playbackRate,
+              scheduleAudioNode
+            });
+          }
+        }, startFromSecond + MAX_BUFFER_AHEAD_SECONDS);
       } catch (e) {
         if (e instanceof InputDisposedError) {
           return;
@@ -499,11 +519,9 @@ var audioIteratorManager = ({
   const seek = async ({
     newTime,
     nonce,
-    fps,
     playbackRate,
     getIsPlaying,
-    scheduleAudioNode,
-    bufferState
+    scheduleAudioNode
   }) => {
     if (muted) {
       return;
@@ -528,7 +546,7 @@ var audioIteratorManager = ({
     const queuedPeriod = audioBufferIterator.getQueuedPeriod();
     const currentTimeIsAlreadyQueued = isAlreadyQueued(newTime, queuedPeriod);
     if (!currentTimeIsAlreadyQueued) {
-      const audioSatisfyResult = await audioBufferIterator.tryToSatisfySeek(newTime, null, (buffer) => {
+      const audioSatisfyResult = await audioBufferIterator.tryToSatisfySeek(newTime, (buffer) => {
         if (!nonce.isStale()) {
           onAudioChunk({
             getIsPlaying,
@@ -556,43 +574,16 @@ var audioIteratorManager = ({
       }
       if (audioSatisfyResult.type === "satisfied") {}
     }
-    const nextTime = newTime + 1 / fps * Math.max(1, playbackRate) * 3;
-    const nextIsAlreadyQueued = isAlreadyQueued(nextTime, audioBufferIterator.getQueuedPeriod());
-    if (!nextIsAlreadyQueued) {
-      const audioSatisfyResult = await audioBufferIterator.tryToSatisfySeek(nextTime, {
-        type: "allow-wait",
-        waitCallback: () => {
-          const handle = bufferState.delayPlayback();
-          return () => {
-            handle.unblock();
-          };
-        }
-      }, (buffer) => {
-        if (!nonce.isStale()) {
-          onAudioChunk({
-            getIsPlaying,
-            buffer,
-            playbackRate,
-            scheduleAudioNode
-          });
-        }
-      });
-      if (nonce.isStale()) {
-        return;
-      }
-      if (audioSatisfyResult.type === "ended") {
-        return;
-      }
-      if (audioSatisfyResult.type === "not-satisfied") {
-        await startAudioIterator({
-          nonce,
-          playbackRate,
-          startFromSecond: newTime,
+    await audioBufferIterator.bufferAsFarAsPossible((buffer) => {
+      if (!nonce.isStale()) {
+        onAudioChunk({
           getIsPlaying,
+          buffer,
+          playbackRate,
           scheduleAudioNode
         });
       }
-    }
+    }, newTime + MAX_BUFFER_AHEAD_SECONDS);
   };
   const resumeScheduledAudioChunks = ({
     playbackRate,
@@ -659,7 +650,8 @@ var drawPreviewOverlay = ({
   audioSyncAnchor,
   playing,
   audioIteratorManager: audioIteratorManager2,
-  videoIteratorManager
+  videoIteratorManager,
+  playbackRate
 }) => {
   const lines = [
     "Debug overlay",
@@ -667,15 +659,13 @@ var drawPreviewOverlay = ({
     `Audio iterators created: ${audioIteratorManager2?.getAudioIteratorsCreated()}`,
     `Frames rendered: ${videoIteratorManager?.getFramesRendered()}`,
     `Audio context state: ${audioContextState}`,
-    audioTime ? `Audio time: ${(audioTime - audioSyncAnchor).toFixed(3)}s` : null
+    audioTime ? `Audio time: ${((audioTime - audioSyncAnchor) * playbackRate).toFixed(3)}s` : null
   ].filter(Boolean);
   if (audioIteratorManager2) {
     const queuedPeriod = audioIteratorManager2.getAudioBufferIterator()?.getQueuedPeriod();
-    const numberOfChunksAfterResuming = audioIteratorManager2?.getAudioBufferIterator()?.getNumberOfChunksAfterResuming();
-    if (queuedPeriod && audioTime) {
-      lines.push(`Audio queued until: ${(queuedPeriod.until - (audioTime - audioSyncAnchor)).toFixed(3)}s`);
-    } else if (numberOfChunksAfterResuming) {
-      lines.push(`Audio chunks for after resuming: ${numberOfChunksAfterResuming}`);
+    if (queuedPeriod) {
+      const aheadText = audioTime ? ` (${(queuedPeriod.until - (audioTime - audioSyncAnchor) * playbackRate).toFixed(3)}s ahead)` : "";
+      lines.push(`Audio queued until ${queuedPeriod.until.toFixed(3)}s${aheadText}`);
     }
     lines.push(`Playing: ${playing}`);
   }
@@ -1157,7 +1147,8 @@ class MediaPlayer {
             getEndTime: () => this.getEndTime(),
             getStartTime: () => this.getStartTime(),
             updatePlaybackTime: (time) => this.setPlaybackTime(time, this.playbackRate * this.globalPlaybackRate),
-            initialMuted
+            initialMuted,
+            drawDebugOverlay: this.drawDebugOverlay
           });
         }
         const nonce = this.nonceManager.createAsyncOperation();
@@ -1230,11 +1221,9 @@ class MediaPlayer {
       shouldSeekAudio ? this.audioIteratorManager?.seek({
         newTime,
         nonce,
-        fps: this.fps,
         playbackRate: this.playbackRate * this.globalPlaybackRate,
         getIsPlaying: () => this.playing,
-        scheduleAudioNode: this.scheduleAudioNode,
-        bufferState: this.bufferState
+        scheduleAudioNode: this.scheduleAudioNode
       }) : null
     ]);
   }
@@ -1400,7 +1389,7 @@ class MediaPlayer {
     if (delay >= 0) {
       node.start(this.sharedAudioContext.currentTime + delay);
     } else {
-      node.start(this.sharedAudioContext.currentTime, -delay);
+      node.start(this.sharedAudioContext.currentTime, -delayWithoutPlaybackRate);
     }
   };
   getAudioPlaybackTime() {
@@ -1433,7 +1422,8 @@ class MediaPlayer {
         audioSyncAnchor: this.audioSyncAnchor,
         audioIteratorManager: this.audioIteratorManager,
         playing: this.playing,
-        videoIteratorManager: this.videoIteratorManager
+        videoIteratorManager: this.videoIteratorManager,
+        playbackRate: this.playbackRate * this.globalPlaybackRate
       });
     }
   };
@@ -4964,7 +4954,6 @@ Internals18.addSequenceStackTraces(Video);
 // src/index.ts
 var experimental_Audio = Audio;
 var experimental_Video = Video;
-registerAc3Decoder();
 export {
   experimental_Video,
   experimental_Audio,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/media",
-	"version": "4.0.426",
+	"version": "4.0.428",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
 	"module": "dist/esm/index.mjs",
@@ -22,15 +22,14 @@
 	},
 	"dependencies": {
 		"mediabunny": "1.34.4",
-		"@mediabunny/ac3": "1.34.4",
-		"remotion": "4.0.426"
+		"remotion": "4.0.428"
 	},
 	"peerDependencies": {
 		"react": ">=16.8.0",
 		"react-dom": ">=16.8.0"
 	},
 	"devDependencies": {
-		"@remotion/eslint-config-internal": "4.0.426",
+		"@remotion/eslint-config-internal": "4.0.428",
 		"@vitest/browser-webdriverio": "4.0.9",
 		"eslint": "9.19.0",
 		"react": "19.2.3",

package/dist/audio/allow-wait.js

@@ -1,15 +0,0 @@
-export const allowWaitRoutine = async (next, waitFn) => {
-    const result = await Promise.race([
-        next,
-        new Promise((resolve) => {
-            Promise.resolve().then(() => resolve());
-        }),
-    ]);
-    if (!result) {
-        const unblock = waitFn.waitCallback();
-        const newRes = await next;
-        unblock();
-        return newRes;
-    }
-    return result;
-};