@remotion/media 4.0.401 → 4.0.403

package/dist/audio/audio-for-preview.js

@@ -270,6 +270,7 @@ const AudioForPreviewAssertedShowing = ({ src, playbackRate, logLevel, muted, vo
 };
 export const AudioForPreview = ({ loop, src, logLevel, muted, name, volume, loopVolumeCurveBehavior, playbackRate, trimAfter, trimBefore, showInTimeline, stack, disallowFallbackToHtml5Audio, toneFrequency, audioStreamIndex, fallbackHtml5AudioProps, }) => {
     const preloadedSrc = usePreload(src);
+    const defaultLogLevel = Internals.useLogLevel();
     const frame = useCurrentFrame();
     const videoConfig = useVideoConfig();
     const currentTime = frame / videoConfig.fps;
@@ -297,8 +298,5 @@ export const AudioForPreview = ({ loop, src, logLevel, muted, name, volume, loop
     if (!showShow) {
         return null;
     }
-    return (_jsx(AudioForPreviewAssertedShowing, { audioStreamIndex: audioStreamIndex ?? 0, src: preloadedSrc, playbackRate: playbackRate ?? 1, logLevel: logLevel ??
-            (typeof window !== 'undefined'
-                ? (window.remotion_logLevel ?? 'info')
-                : 'info'), muted: muted ?? false, volume: volume ?? 1, loopVolumeCurveBehavior: loopVolumeCurveBehavior ?? 'repeat', loop: loop ?? false, trimAfter: trimAfter, trimBefore: trimBefore, name: name, showInTimeline: showInTimeline ?? true, stack: stack, disallowFallbackToHtml5Audio: disallowFallbackToHtml5Audio ?? false, toneFrequency: toneFrequency, fallbackHtml5AudioProps: fallbackHtml5AudioProps }));
+    return (_jsx(AudioForPreviewAssertedShowing, { audioStreamIndex: audioStreamIndex ?? 0, src: preloadedSrc, playbackRate: playbackRate ?? 1, logLevel: logLevel ?? defaultLogLevel, muted: muted ?? false, volume: volume ?? 1, loopVolumeCurveBehavior: loopVolumeCurveBehavior ?? 'repeat', loop: loop ?? false, trimAfter: trimAfter, trimBefore: trimBefore, name: name, showInTimeline: showInTimeline ?? true, stack: stack, disallowFallbackToHtml5Audio: disallowFallbackToHtml5Audio ?? false, toneFrequency: toneFrequency, fallbackHtml5AudioProps: fallbackHtml5AudioProps }));
 };

package/dist/audio/audio-for-rendering.js

@@ -6,7 +6,9 @@ import { applyVolume } from '../convert-audiodata/apply-volume';
 import { TARGET_SAMPLE_RATE } from '../convert-audiodata/resample-audiodata';
 import { frameForVolumeProp } from '../looped-frame';
 import { extractFrameViaBroadcastChannel } from '../video-extraction/extract-frame-via-broadcast-channel';
-export const AudioForRendering = ({ volume: volumeProp, playbackRate, src, muted, loopVolumeCurveBehavior, delayRenderRetries, delayRenderTimeoutInMilliseconds, logLevel = window.remotion_logLevel ?? 'info', loop, fallbackHtml5AudioProps, audioStreamIndex, showInTimeline, style, name, disallowFallbackToHtml5Audio, toneFrequency, trimAfter, trimBefore, }) => {
+export const AudioForRendering = ({ volume: volumeProp, playbackRate, src, muted, loopVolumeCurveBehavior, delayRenderRetries, delayRenderTimeoutInMilliseconds, logLevel: overriddenLogLevel, loop, fallbackHtml5AudioProps, audioStreamIndex, showInTimeline, style, name, disallowFallbackToHtml5Audio, toneFrequency, trimAfter, trimBefore, }) => {
+    const defaultLogLevel = Internals.useLogLevel();
+    const logLevel = overriddenLogLevel ?? defaultLogLevel;
     const frame = useCurrentFrame();
     const absoluteFrame = Internals.useTimelinePosition();
     const videoConfig = Internals.useUnsafeVideoConfig();
@@ -31,7 +33,7 @@ export const AudioForRendering = ({ volume: volumeProp, playbackRate, src, muted
         sequenceContext?.relativeFrom,
         sequenceContext?.durationInFrames,
     ]);
-    const maxCacheSize = useMaxMediaCacheSize(logLevel ?? window.remotion_logLevel);
+    const maxCacheSize = useMaxMediaCacheSize(logLevel);
     const audioEnabled = Internals.useAudioEnabled();
     useLayoutEffect(() => {
         const timestamp = frame / fps;
@@ -60,7 +62,7 @@ export const AudioForRendering = ({ volume: volumeProp, playbackRate, src, muted
             timeInSeconds: timestamp,
             durationInSeconds,
             playbackRate: playbackRate ?? 1,
-            logLevel: logLevel ?? window.remotion_logLevel,
+            logLevel,
             includeAudio: shouldRenderAudio,
             includeVideo: false,
             isClientSideRendering: environment.isClientSideRendering,
@@ -81,7 +83,7 @@ export const AudioForRendering = ({ volume: volumeProp, playbackRate, src, muted
                     cancelRender(new Error(`Unknown container format ${src}, and 'disallowFallbackToHtml5Audio' was set. Failing the render.`));
                 }
                 Internals.Log.warn({
-                    logLevel: logLevel ?? window.remotion_logLevel,
+                    logLevel,
                     tag: '@remotion/media',
                 }, `Unknown container format for ${src} (Supported formats: https://www.remotion.dev/docs/mediabunny/formats), falling back to <Html5Audio>`);
                 setReplaceWithHtml5Audio(true);
@@ -96,7 +98,7 @@ export const AudioForRendering = ({ volume: volumeProp, playbackRate, src, muted
                     cancelRender(new Error(`Cannot decode ${src}, and 'disallowFallbackToHtml5Audio' was set. Failing the render.`));
                 }
                 Internals.Log.warn({
-                    logLevel: logLevel ?? window.remotion_logLevel,
+                    logLevel,
                     tag: '@remotion/media',
                 }, `Cannot decode ${src}, falling back to <Html5Audio>`);
                 setReplaceWithHtml5Audio(true);
@@ -114,7 +116,7 @@ export const AudioForRendering = ({ volume: volumeProp, playbackRate, src, muted
                     cancelRender(new Error(`Cannot decode ${src}, and 'disallowFallbackToHtml5Audio' was set. Failing the render.`));
                 }
                 Internals.Log.warn({
-                    logLevel: logLevel ?? window.remotion_logLevel,
+                    logLevel,
                     tag: '@remotion/media',
                 }, `Network error fetching ${src}, falling back to <Html5Audio>`);
                 setReplaceWithHtml5Audio(true);

package/dist/audio-extraction/audio-iterator.js

@@ -1,5 +1,5 @@
 import { Internals } from 'remotion';
-import { SAFE_BACK_WINDOW_IN_SECONDS } from '../caches';
+import { SAFE_WINDOW_OF_MONOTONICITY } from '../caches';
 import { makeAudioCache } from './audio-cache';
 // https://discord.com/channels/@me/1409810025844838481/1415028953093111870
 // Audio frames might have dependencies on previous and next frames so we need to decode a bit more
@@ -47,7 +47,7 @@ export const makeAudioIterator = ({ audioSampleSink, isMatroska, startTimestamp,
         if (fullDuration !== null && timestamp > fullDuration) {
             // Clear all samples before the timestamp
             // Do this in the while loop because samples might start from 0
-            cache.clearBeforeThreshold(fullDuration - SAFE_BACK_WINDOW_IN_SECONDS);
+            cache.clearBeforeThreshold(fullDuration - SAFE_WINDOW_OF_MONOTONICITY);
             return [];
         }
         const samples = cache.getSamples(timestamp, durationInSeconds);
@@ -64,7 +64,7 @@ export const makeAudioIterator = ({ audioSampleSink, isMatroska, startTimestamp,
             // Also do this after a sample has just been added, if it was the last sample we now have the duration
             // and can prevent deleting the last sample
             const deleteBefore = fullDuration === null ? timestamp : Math.min(timestamp, fullDuration);
-            cache.clearBeforeThreshold(deleteBefore - SAFE_BACK_WINDOW_IN_SECONDS);
+            cache.clearBeforeThreshold(deleteBefore - SAFE_WINDOW_OF_MONOTONICITY);
             if (sample === null) {
                 break;
             }

package/dist/audio-extraction/audio-manager.js

@@ -48,8 +48,16 @@ export const makeAudioManager = () => {
         }
     };
     const getIterator = async ({ src, timeInSeconds, audioSampleSink, isMatroska, actualMatroskaTimestamps, logLevel, maxCacheSize, }) => {
-        while ((await getTotalCacheStats()).totalSize > maxCacheSize) {
+        let attempts = 0;
+        const maxAttempts = 3;
+        while ((await getTotalCacheStats()).totalSize > maxCacheSize &&
+            attempts < maxAttempts) {
             deleteOldestIterator();
+            attempts++;
+        }
+        if ((await getTotalCacheStats()).totalSize > maxCacheSize &&
+            attempts >= maxAttempts) {
+            Internals.Log.warn({ logLevel, tag: '@remotion/media' }, `Audio cache: Exceeded max cache size after ${maxAttempts} attempts. Still ${(await getTotalCacheStats()).totalSize} bytes used, target was ${maxCacheSize} bytes.`);
         }
         for (const iterator of iterators) {
             if (iterator.src === src &&

package/dist/caches.d.ts

@@ -1,19 +1,18 @@
 import { type LogLevel } from 'remotion';
-export declare const SAFE_BACK_WINDOW_IN_SECONDS = 1;
+export declare const SAFE_WINDOW_OF_MONOTONICITY = 0.2;
 export declare const keyframeManager: {
-    requestKeyframeBank: ({ packetSink, timestamp, videoSampleSink, src, logLevel, maxCacheSize, }: {
-        packetSink: import("mediabunny").EncodedPacketSink;
+    requestKeyframeBank: ({ timestamp, videoSampleSink, src, logLevel, maxCacheSize, }: {
         timestamp: number;
         videoSampleSink: import("mediabunny").VideoSampleSink;
         src: string;
         logLevel: LogLevel;
         maxCacheSize: number;
-    }) => Promise<import("./video-extraction/keyframe-bank").KeyframeBank | "has-alpha" | null>;
-    getCacheStats: () => Promise<{
+    }) => Promise<import("./video-extraction/keyframe-bank").KeyframeBank>;
+    getCacheStats: () => {
         count: number;
         totalSize: number;
-    }>;
-    clearAll: (logLevel: LogLevel) => Promise<void>;
+    };
+    clearAll: (logLevel: LogLevel) => void;
 };
 export declare const audioManager: {
     getIterator: ({ src, timeInSeconds, audioSampleSink, isMatroska, actualMatroskaTimestamps, logLevel, maxCacheSize, }: {

package/dist/caches.js

@@ -2,8 +2,8 @@ import React from 'react';
 import { cancelRender, Internals } from 'remotion';
 import { makeAudioManager } from './audio-extraction/audio-manager';
 import { makeKeyframeManager } from './video-extraction/keyframe-manager';
-// TODO: make it dependent on the fps and concurrency
-export const SAFE_BACK_WINDOW_IN_SECONDS = 1;
+// Frames can be out of order, but we don't expect them to be more than 1 second out of order
+export const SAFE_WINDOW_OF_MONOTONICITY = 0.2;
 export const keyframeManager = makeKeyframeManager();
 export const audioManager = makeAudioManager();
 export const getTotalCacheStats = async () => {

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

@@ -2,8 +2,8 @@ import type { AudioIteratorManager } from '../audio-iterator-manager';
 import type { VideoIteratorManager } from '../video-iterator-manager';
 export declare const drawPreviewOverlay: ({ context, audioTime, audioContextState, audioSyncAnchor, playing, audioIteratorManager, videoIteratorManager, }: {
     context: OffscreenCanvasRenderingContext2D | CanvasRenderingContext2D;
-    audioTime: number;
-    audioContextState: AudioContextState;
+    audioTime: number | null;
+    audioContextState: AudioContextState | null;
     audioSyncAnchor: number;
     playing: boolean;
     audioIteratorManager: AudioIteratorManager | null;

package/dist/debug-overlay/preview-overlay.js

@@ -6,8 +6,10 @@ export const drawPreviewOverlay = ({ context, audioTime, audioContextState, audi
         `Audio iterators created: ${audioIteratorManager?.getAudioIteratorsCreated()}`,
         `Frames rendered: ${videoIteratorManager?.getFramesRendered()}`,
         `Audio context state: ${audioContextState}`,
-        `Audio time: ${(audioTime - audioSyncAnchor).toFixed(3)}s`,
-    ];
+        audioTime
+            ? `Audio time: ${(audioTime - audioSyncAnchor).toFixed(3)}s`
+            : null,
+    ].filter(Boolean);
     if (audioIteratorManager) {
         const queuedPeriod = audioIteratorManager
             .getAudioBufferIterator()
@@ -15,7 +17,7 @@ export const drawPreviewOverlay = ({ context, audioTime, audioContextState, audi
         const numberOfChunksAfterResuming = audioIteratorManager
             ?.getAudioBufferIterator()
             ?.getNumberOfChunksAfterResuming();
-        if (queuedPeriod) {
+        if (queuedPeriod && audioTime) {
             lines.push(`Audio queued until: ${(queuedPeriod.until - (audioTime - audioSyncAnchor)).toFixed(3)}s`);
         }
         else if (numberOfChunksAfterResuming) {