@remotion/media 4.0.361 → 4.0.362

package/dist/esm/index.mjs

@@ -226,11 +226,18 @@ function isNetworkError(error) {
 
 // src/video/timeout-utils.ts
 var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+
+class TimeoutError extends Error {
+  constructor(message = "Operation timed out") {
+    super(message);
+    this.name = "TimeoutError";
+  }
+}
 function withTimeout(promise, timeoutMs, errorMessage = "Operation timed out") {
   let timeoutId = null;
   const timeoutPromise = new Promise((_, reject) => {
     timeoutId = window.setTimeout(() => {
-      reject(new Error(errorMessage));
+      reject(new TimeoutError(errorMessage));
     }, timeoutMs);
   });
   return Promise.race([
@@ -280,6 +287,7 @@ class MediaPlayer {
   audioBufferHealth = 0;
   audioIteratorStarted = false;
   HEALTHY_BUFER_THRESHOLD_SECONDS = 1;
+  mediaEnded = false;
   onVideoFrameCallback;
   constructor({
     canvas,
@@ -440,6 +448,8 @@ class MediaPlayer {
       src: this.src
     });
     if (newTime === null) {
+      this.videoAsyncId++;
+      this.nextFrame = null;
       this.clearCanvas();
       await this.cleanAudioIteratorAndNodes();
       return;
@@ -449,6 +459,7 @@ class MediaPlayer {
     if (isSignificantSeek) {
       this.nextFrame = null;
       this.audioSyncAnchor = this.sharedAudioContext.currentTime - newTime;
+      this.mediaEnded = false;
       if (this.audioSink) {
         await this.cleanAudioIteratorAndNodes();
       }
@@ -646,6 +657,7 @@ class MediaPlayer {
       while (true) {
         const newNextFrame = (await this.videoFrameIterator.next()).value ?? null;
         if (!newNextFrame) {
+          this.mediaEnded = true;
           break;
         }
         const playbackTime = this.getPlaybackTime();
@@ -716,12 +728,15 @@ class MediaPlayer {
         let result;
         try {
           result = await withTimeout(this.audioBufferIterator.next(), BUFFERING_TIMEOUT_MS, "Iterator timeout");
-        } catch {
-          this.setBufferingState(true);
+        } catch (error) {
+          if (error instanceof TimeoutError && !this.mediaEnded) {
+            this.setBufferingState(true);
+          }
           await sleep(10);
           continue;
         }
         if (result.done || !result.value) {
+          this.mediaEnded = true;
           break;
         }
         const { buffer, timestamp, duration } = result.value;

package/dist/video/media-player.d.ts

@@ -45,6 +45,7 @@ export declare class MediaPlayer {
     private audioBufferHealth;
     private audioIteratorStarted;
     private readonly HEALTHY_BUFER_THRESHOLD_SECONDS;
+    private mediaEnded;
     private onVideoFrameCallback?;
     constructor({ canvas, src, logLevel, sharedAudioContext, loop, trimBefore, trimAfter, playbackRate, audioStreamIndex, fps, }: {
         canvas: HTMLCanvasElement | null;

package/dist/video/media-player.js

@@ -2,7 +2,7 @@ import { ALL_FORMATS, AudioBufferSink, CanvasSink, Input, UrlSource, } from 'med
 import { Internals } from 'remotion';
 import { getTimeInSeconds } from '../get-time-in-seconds';
 import { isNetworkError } from '../is-network-error';
-import { sleep, withTimeout } from './timeout-utils';
+import { sleep, TimeoutError, withTimeout } from './timeout-utils';
 export const SEEK_THRESHOLD = 0.05;
 const AUDIO_BUFFER_TOLERANCE_THRESHOLD = 0.1;
 export class MediaPlayer {
@@ -30,6 +30,7 @@ export class MediaPlayer {
         this.audioBufferHealth = 0;
         this.audioIteratorStarted = false;
         this.HEALTHY_BUFER_THRESHOLD_SECONDS = 1;
+        this.mediaEnded = false;
         this.input = null;
         this.render = () => {
             if (this.isBuffering) {
@@ -100,6 +101,7 @@ export class MediaPlayer {
                 while (true) {
                     const newNextFrame = (await this.videoFrameIterator.next()).value ?? null;
                     if (!newNextFrame) {
+                        this.mediaEnded = true;
                         break;
                     }
                     const playbackTime = this.getPlaybackTime();
@@ -138,12 +140,16 @@ export class MediaPlayer {
                     try {
                         result = await withTimeout(this.audioBufferIterator.next(), BUFFERING_TIMEOUT_MS, 'Iterator timeout');
                     }
-                    catch {
-                        this.setBufferingState(true);
+                    catch (error) {
+                        if (error instanceof TimeoutError && !this.mediaEnded) {
+                            this.setBufferingState(true);
+                        }
                         await sleep(10);
                         continue;
                     }
+                    // media has ended
                     if (result.done || !result.value) {
+                        this.mediaEnded = true;
                         break;
                     }
                     const { buffer, timestamp, duration } = result.value;
@@ -337,6 +343,9 @@ export class MediaPlayer {
             src: this.src,
         });
         if (newTime === null) {
+            // invalidate in-flight video operations
+            this.videoAsyncId++;
+            this.nextFrame = null;
             this.clearCanvas();
             await this.cleanAudioIteratorAndNodes();
             return;
@@ -347,6 +356,7 @@ export class MediaPlayer {
         if (isSignificantSeek) {
             this.nextFrame = null;
             this.audioSyncAnchor = this.sharedAudioContext.currentTime - newTime;
+            this.mediaEnded = false;
             if (this.audioSink) {
                 await this.cleanAudioIteratorAndNodes();
             }

package/dist/video/timeout-utils.d.ts

@@ -1,2 +1,5 @@
 export declare const sleep: (ms: number) => Promise<unknown>;
+export declare class TimeoutError extends Error {
+    constructor(message?: string);
+}
 export declare function withTimeout<T>(promise: Promise<T>, timeoutMs: number, errorMessage?: string): Promise<T>;

package/dist/video/timeout-utils.js

@@ -1,10 +1,16 @@
 /* eslint-disable no-promise-executor-return */
 export const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+export class TimeoutError extends Error {
+    constructor(message = 'Operation timed out') {
+        super(message);
+        this.name = 'TimeoutError';
+    }
+}
 export function withTimeout(promise, timeoutMs, errorMessage = 'Operation timed out') {
     let timeoutId = null;
     const timeoutPromise = new Promise((_, reject) => {
         timeoutId = window.setTimeout(() => {
-            reject(new Error(errorMessage));
+            reject(new TimeoutError(errorMessage));
         }, timeoutMs);
     });
     return Promise.race([

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/media",
-	"version": "4.0.361",
+	"version": "4.0.362",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
 	"module": "dist/esm/index.mjs",
@@ -22,7 +22,7 @@
 	},
 	"dependencies": {
 		"mediabunny": "1.23.0",
-		"remotion": "4.0.361",
+		"remotion": "4.0.362",
 		"webdriverio": "9.19.2"
 	},
 	"peerDependencies": {
@@ -30,7 +30,7 @@
 		"react-dom": ">=16.8.0"
 	},
 	"devDependencies": {
-		"@remotion/eslint-config-internal": "4.0.361",
+		"@remotion/eslint-config-internal": "4.0.362",
 		"@vitest/browser": "^3.2.4",
 		"eslint": "9.19.0",
 		"react": "19.0.0",