@remotion/media 4.0.489 → 4.0.490

package/dist/esm/index.mjs

@@ -136,7 +136,6 @@ var calculateEndTime = ({
 };
 
 // src/media-player.ts
-import { ALL_FORMATS, Input, UrlSource } from "mediabunny";
 import { Internals as Internals5 } from "remotion";
 
 // src/audio-iterator-manager.ts
@@ -853,6 +852,127 @@ var getDurationOrCompute = async (input) => {
   }) ?? input.computeDuration(undefined, { skipLiveWait: true });
 };
 
+// src/get-shared-input.ts
+import { ALL_FORMATS, Input, UrlSource } from "mediabunny";
+
+// src/request-init.ts
+var normalizeMediaHeaders = (headers) => {
+  if (!headers) {
+    return;
+  }
+  const entries = [];
+  if (headers instanceof Headers) {
+    headers.forEach((value, key) => {
+      entries.push([key.toLowerCase(), value]);
+    });
+  } else if (Array.isArray(headers)) {
+    for (const [key, value] of headers) {
+      entries.push([key.toLowerCase(), value]);
+    }
+  } else {
+    for (const [key, value] of Object.entries(headers)) {
+      entries.push([key.toLowerCase(), value]);
+    }
+  }
+  entries.sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0);
+  return entries;
+};
+var normalizeMediaRequestInit = (requestInit) => {
+  if (!requestInit) {
+    return;
+  }
+  const headers = normalizeMediaHeaders(requestInit.headers);
+  const normalized = {
+    ...requestInit.cache === undefined ? null : { cache: requestInit.cache },
+    ...requestInit.credentials === undefined ? null : { credentials: requestInit.credentials },
+    ...headers === undefined ? null : { headers },
+    ...requestInit.integrity === undefined ? null : { integrity: requestInit.integrity },
+    ...requestInit.mode === undefined ? null : { mode: requestInit.mode },
+    ...requestInit.redirect === undefined ? null : { redirect: requestInit.redirect },
+    ...requestInit.referrer === undefined ? null : { referrer: requestInit.referrer },
+    ...requestInit.referrerPolicy === undefined ? null : { referrerPolicy: requestInit.referrerPolicy }
+  };
+  return Object.keys(normalized).length === 0 ? undefined : normalized;
+};
+var getMediaRequestInitFingerprint = (requestInit) => {
+  const normalized = normalizeMediaRequestInit(requestInit);
+  if (!normalized) {
+    return null;
+  }
+  return [
+    normalized.cache ?? null,
+    normalized.credentials ?? null,
+    normalized.integrity ?? null,
+    normalized.mode ?? null,
+    normalized.redirect ?? null,
+    normalized.referrer ?? null,
+    normalized.referrerPolicy ?? null,
+    normalized.headers ?? null
+  ];
+};
+var resolveRequestInit = ({
+  credentials,
+  requestInit
+}) => {
+  if (credentials === undefined) {
+    return normalizeMediaRequestInit(requestInit);
+  }
+  return normalizeMediaRequestInit({
+    credentials,
+    ...requestInit
+  });
+};
+
+// src/get-shared-input.ts
+var sharedInputs = {};
+var getSharedInputCacheKey = ({
+  src,
+  credentials,
+  requestInit
+}) => JSON.stringify([
+  src,
+  credentials ?? null,
+  getMediaRequestInitFingerprint(requestInit)
+]);
+var acquireSharedInput = ({
+  src,
+  credentials,
+  requestInit
+}) => {
+  const normalizedRequestInit = normalizeMediaRequestInit(requestInit);
+  const cacheKey = getSharedInputCacheKey({
+    src,
+    credentials,
+    requestInit: normalizedRequestInit
+  });
+  const existing = sharedInputs[cacheKey];
+  if (existing) {
+    existing.refCount++;
+    return { input: existing.input, cacheKey };
+  }
+  const resolvedRequestInit = resolveRequestInit({
+    credentials,
+    requestInit: normalizedRequestInit
+  });
+  const input = new Input({
+    source: new UrlSource(src, resolvedRequestInit ? { requestInit: resolvedRequestInit } : undefined),
+    formats: ALL_FORMATS
+  });
+  sharedInputs[cacheKey] = { input, refCount: 1 };
+  return { input, cacheKey };
+};
+var releaseSharedInput = (cacheKey) => {
+  const entry = sharedInputs[cacheKey];
+  if (!entry) {
+    return;
+  }
+  entry.refCount--;
+  if (entry.refCount <= 0) {
+    delete sharedInputs[cacheKey];
+    entry.input.dispose();
+  }
+};
+
 // src/helpers/resolve-audio-track.ts
 var resolveAudioTrack = async ({
   videoTrack,
@@ -972,74 +1092,6 @@ class PremountAwareDelayPlayback {
   }
 }
 
-// src/request-init.ts
-var normalizeMediaHeaders = (headers) => {
-  if (!headers) {
-    return;
-  }
-  const entries = [];
-  if (headers instanceof Headers) {
-    headers.forEach((value, key) => {
-      entries.push([key.toLowerCase(), value]);
-    });
-  } else if (Array.isArray(headers)) {
-    for (const [key, value] of headers) {
-      entries.push([key.toLowerCase(), value]);
-    }
-  } else {
-    for (const [key, value] of Object.entries(headers)) {
-      entries.push([key.toLowerCase(), value]);
-    }
-  }
-  entries.sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0);
-  return entries;
-};
-var normalizeMediaRequestInit = (requestInit) => {
-  if (!requestInit) {
-    return;
-  }
-  const headers = normalizeMediaHeaders(requestInit.headers);
-  const normalized = {
-    ...requestInit.cache === undefined ? null : { cache: requestInit.cache },
-    ...requestInit.credentials === undefined ? null : { credentials: requestInit.credentials },
-    ...headers === undefined ? null : { headers },
-    ...requestInit.integrity === undefined ? null : { integrity: requestInit.integrity },
-    ...requestInit.mode === undefined ? null : { mode: requestInit.mode },
-    ...requestInit.redirect === undefined ? null : { redirect: requestInit.redirect },
-    ...requestInit.referrer === undefined ? null : { referrer: requestInit.referrer },
-    ...requestInit.referrerPolicy === undefined ? null : { referrerPolicy: requestInit.referrerPolicy }
-  };
-  return Object.keys(normalized).length === 0 ? undefined : normalized;
-};
-var getMediaRequestInitFingerprint = (requestInit) => {
-  const normalized = normalizeMediaRequestInit(requestInit);
-  if (!normalized) {
-    return null;
-  }
-  return [
-    normalized.cache ?? null,
-    normalized.credentials ?? null,
-    normalized.integrity ?? null,
-    normalized.mode ?? null,
-    normalized.redirect ?? null,
-    normalized.referrer ?? null,
-    normalized.referrerPolicy ?? null,
-    normalized.headers ?? null
-  ];
-};
-var resolveRequestInit = ({
-  credentials,
-  requestInit
-}) => {
-  if (credentials === undefined) {
-    return normalizeMediaRequestInit(requestInit);
-  }
-  return normalizeMediaRequestInit({
-    credentials,
-    ...requestInit
-  });
-};
-
 // src/video-iterator-manager.ts
 import { CanvasSink } from "mediabunny";
 import { Internals as Internals4 } from "remotion";
@@ -1659,13 +1711,13 @@ class MediaPlayer {
     this.onVideoFrameCallback = onVideoFrameCallback;
     this.playing = playing;
     this.sequenceOffset = sequenceOffset;
-    const resolvedRequestInit = resolveRequestInit({ credentials, requestInit });
-    this.input = new Input({
-      source: new UrlSource(this.src, resolvedRequestInit ? {
-        requestInit: resolvedRequestInit
-      } : undefined),
-      formats: ALL_FORMATS
+    const { input, cacheKey } = acquireSharedInput({
+      src: this.src,
+      credentials,
+      requestInit
     });
+    this.input = input;
+    this.inputCacheKey = cacheKey;
     this.tagType = tagType;
     this.getEffects = getEffects;
     this.getEffectChainState = getEffectChainState;
@@ -1683,8 +1735,10 @@ class MediaPlayer {
     }
   }
   input;
+  inputCacheKey;
+  disposed = false;
   isDisposalError() {
-    return this.input.disposed === true;
+    return this.disposed || this.input.disposed === true;
   }
   initialize(startTimeUnresolved, initialMuted) {
     const promise = this._initialize(startTimeUnresolved, initialMuted);
@@ -1719,7 +1773,7 @@ class MediaPlayer {
     try {
       const _ = __using(__stack, this.delayPlaybackHandleIfNotPremounting(), 0);
       try {
-        if (this.input.disposed) {
+        if (this.isDisposalError()) {
           return { type: "disposed" };
         }
         try {
@@ -1740,7 +1794,7 @@ class MediaPlayer {
           this.input.getPrimaryVideoTrack(),
           this.input.getAudioTracks()
         ]);
-        if (this.input.disposed) {
+        if (this.isDisposalError()) {
           return { type: "disposed" };
         }
         this.totalDuration = durationInSeconds;
@@ -1763,7 +1817,7 @@ class MediaPlayer {
           if (!canDecode) {
             return { type: "cannot-decode" };
           }
-          if (this.input.disposed) {
+          if (this.isDisposalError()) {
             return { type: "disposed" };
           }
           this.videoIteratorManager = await videoIteratorManager({
@@ -1796,7 +1850,7 @@ class MediaPlayer {
           if (!canDecode) {
             return { type: "cannot-decode" };
           }
-          if (this.input.disposed) {
+          if (this.isDisposalError()) {
             return { type: "disposed" };
           }
           this.audioIteratorManager = audioIteratorManager({
@@ -2015,6 +2069,10 @@ class MediaPlayer {
     }
   }
   async dispose() {
+    if (this.disposed) {
+      return;
+    }
+    this.disposed = true;
     if (this.initializationPromise) {
       try {
         await this.initializationPromise;
@@ -2023,7 +2081,7 @@ class MediaPlayer {
     this.nonceManager.createAsyncOperation();
     this.videoIteratorManager?.destroy();
     this.audioIteratorManager?.destroyIterator();
-    this.input.dispose();
+    releaseSharedInput(this.inputCacheKey);
   }
   getTargetTime = (mediaTimestamp, currentTime) => {
     if (!this.sharedAudioContext) {
@@ -4886,7 +4944,6 @@ var Audio = Interactive.withSchema({
   schema: audioSchema,
   supportsEffects: false
 });
-Internals17.addSequenceStackTraces(Audio);
 
 // src/video/video.tsx
 import React6, { useMemo as useMemo6, useState as useState6 } from "react";
@@ -5974,7 +6031,6 @@ var Video = Interactive2.withSchema({
   schema: videoSchema,
   supportsEffects: true
 });
-Internals21.addSequenceStackTraces(Video);
 
 // src/index.ts
 var experimental_Audio = Audio;

package/dist/get-shared-input.d.ts

@@ -0,0 +1,11 @@
+import { Input } from 'mediabunny';
+import { type MediaRequestInit } from './request-init';
+export declare const acquireSharedInput: ({ src, credentials, requestInit, }: {
+    src: string;
+    credentials: RequestCredentials | undefined;
+    requestInit: MediaRequestInit | undefined;
+}) => {
+    input: Input<import("mediabunny").Source>;
+    cacheKey: string;
+};
+export declare const releaseSharedInput: (cacheKey: string) => void;

package/dist/media-player.d.ts

@@ -72,6 +72,8 @@ export declare class MediaPlayer {
         getEffectChainState: (width: number, height: number) => EffectChainState | null;
     });
     private input;
+    private inputCacheKey;
+    private disposed;
     private isDisposalError;
     initialize(startTimeUnresolved: number, initialMuted: boolean): Promise<MediaPlayerInitResult>;
     private getStartTime;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/media",
-	"version": "4.0.489",
+	"version": "4.0.490",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
 	"module": "dist/esm/index.mjs",
@@ -23,7 +23,7 @@
 	},
 	"dependencies": {
 		"mediabunny": "1.50.8",
-		"remotion": "4.0.489",
+		"remotion": "4.0.490",
 		"zod": "4.3.6"
 	},
 	"peerDependencies": {
@@ -31,8 +31,8 @@
 		"react-dom": ">=16.8.0"
 	},
 	"devDependencies": {
-		"@remotion/eslint-config-internal": "4.0.489",
-		"@remotion/player": "4.0.489",
+		"@remotion/eslint-config-internal": "4.0.490",
+		"@remotion/player": "4.0.490",
 		"@vitest/browser-webdriverio": "4.0.9",
 		"eslint": "9.19.0",
 		"react": "19.2.3",