@remotion/media 4.0.356 → 4.0.357

package/dist/extract-frame-and-audio.d.ts

@@ -1,6 +1,6 @@
 import type { LogLevel } from 'remotion';
-import type { PcmS16AudioData } from './convert-audiodata/convert-audiodata';
-export declare const extractFrameAndAudio: ({ src, timeInSeconds, logLevel, durationInSeconds, playbackRate, includeAudio, includeVideo, loop, audioStreamIndex, }: {
+import type { ExtractFrameViaBroadcastChannelResult } from './video-extraction/extract-frame-via-broadcast-channel';
+export declare const extractFrameAndAudio: ({ src, timeInSeconds, logLevel, durationInSeconds, playbackRate, includeAudio, includeVideo, loop, audioStreamIndex, trimAfter, trimBefore, fps, }: {
     src: string;
     timeInSeconds: number;
     logLevel: LogLevel;
@@ -10,8 +10,7 @@ export declare const extractFrameAndAudio: ({ src, timeInSeconds, logLevel, dura
     includeVideo: boolean;
     loop: boolean;
     audioStreamIndex: number;
-}) => Promise<{
-    frame: VideoFrame | null;
-    audio: PcmS16AudioData | null;
-    durationInSeconds: number | null;
-} | "cannot-decode" | "unknown-container-format" | "network-error">;
+    trimAfter: number | undefined;
+    trimBefore: number | undefined;
+    fps: number;
+}) => Promise<ExtractFrameViaBroadcastChannelResult>;

package/dist/extract-frame-and-audio.js

@@ -1,6 +1,7 @@
 import { extractAudio } from './audio-extraction/extract-audio';
+import { isNetworkError } from './is-network-error';
 import { extractFrame } from './video-extraction/extract-frame';
-export const extractFrameAndAudio = async ({ src, timeInSeconds, logLevel, durationInSeconds, playbackRate, includeAudio, includeVideo, loop, audioStreamIndex, }) => {
+export const extractFrameAndAudio = async ({ src, timeInSeconds, logLevel, durationInSeconds, playbackRate, includeAudio, includeVideo, loop, audioStreamIndex, trimAfter, trimBefore, fps, }) => {
     try {
         const [frame, audio] = await Promise.all([
             includeVideo
@@ -9,6 +10,10 @@ export const extractFrameAndAudio = async ({ src, timeInSeconds, logLevel, durat
                     timeInSeconds,
                     logLevel,
                     loop,
+                    trimAfter,
+                    playbackRate,
+                    trimBefore,
+                    fps,
                 })
                 : null,
             includeAudio
@@ -20,43 +25,47 @@ export const extractFrameAndAudio = async ({ src, timeInSeconds, logLevel, durat
                     loop,
                     playbackRate,
                     audioStreamIndex,
+                    trimAfter,
+                    fps,
+                    trimBefore,
                 })
                 : null,
         ]);
-        if (frame === 'cannot-decode') {
-            return 'cannot-decode';
+        if (frame?.type === 'cannot-decode') {
+            return {
+                type: 'cannot-decode',
+                durationInSeconds: frame.durationInSeconds,
+            };
         }
-        if (frame === 'unknown-container-format') {
-            return 'unknown-container-format';
+        if (frame?.type === 'unknown-container-format') {
+            return { type: 'unknown-container-format' };
         }
         if (audio === 'unknown-container-format') {
             if (frame !== null) {
-                frame?.close();
+                frame?.frame?.close();
             }
-            return 'unknown-container-format';
+            return { type: 'unknown-container-format' };
         }
         if (audio === 'cannot-decode') {
-            if (frame !== null) {
-                frame?.close();
+            if (frame?.type === 'success' && frame.frame !== null) {
+                frame?.frame.close();
             }
-            return 'cannot-decode';
+            return {
+                type: 'cannot-decode',
+                durationInSeconds: frame?.type === 'success' ? frame.durationInSeconds : null,
+            };
         }
         return {
-            frame: frame?.toVideoFrame() ?? null,
+            type: 'success',
+            frame: frame?.frame?.toVideoFrame() ?? null,
             audio: audio?.data ?? null,
             durationInSeconds: audio?.durationInSeconds ?? null,
         };
     }
     catch (err) {
         const error = err;
-        if (
-        // Chrome
-        error.message.includes('Failed to fetch') ||
-            // Safari
-            error.message.includes('Load failed') ||
-            // Firefox
-            error.message.includes('NetworkError when attempting to fetch resource')) {
-            return 'network-error';
+        if (isNetworkError(error)) {
+            return { type: 'network-error' };
         }
         throw err;
     }

package/dist/get-sink-weak.d.ts

@@ -1,7 +1,7 @@
 import type { LogLevel } from 'remotion';
 import type { GetSink } from './video-extraction/get-frames-since-keyframe';
 export declare const sinkPromises: Record<string, Promise<GetSink>>;
-export declare const getSinkWeak: (src: string, logLevel: LogLevel) => Promise<{
+export declare const getSink: (src: string, logLevel: LogLevel) => Promise<{
     getVideo: () => Promise<import("./video-extraction/get-frames-since-keyframe").VideoSinkResult>;
     getAudio: (index: number) => Promise<import("./video-extraction/get-frames-since-keyframe").AudioSinkResult>;
     actualMatroskaTimestamps: {

package/dist/get-sink-weak.js

@@ -1,23 +1,15 @@
 import { Internals } from 'remotion';
 import { getSinks } from './video-extraction/get-frames-since-keyframe';
 export const sinkPromises = {};
-export const getSinkWeak = async (src, logLevel) => {
+export const getSink = (src, logLevel) => {
     let promise = sinkPromises[src];
     if (!promise) {
-        promise = getSinks(src);
-        sinkPromises[src] = promise;
-    }
-    let awaited = await promise;
-    let deferredValue = awaited.deref();
-    if (!deferredValue) {
         Internals.Log.verbose({
             logLevel,
             tag: '@remotion/media',
-        }, `Sink for ${src} was garbage collected, creating new sink`);
+        }, `Sink for ${src} was not found, creating new sink`);
         promise = getSinks(src);
         sinkPromises[src] = promise;
-        awaited = await promise;
-        deferredValue = awaited.deref();
     }
-    return deferredValue;
+    return promise;
 };

package/dist/get-sink.d.ts

@@ -0,0 +1,13 @@
+import type { LogLevel } from 'remotion';
+import type { GetSink } from './video-extraction/get-frames-since-keyframe';
+export declare const sinkPromises: Record<string, Promise<GetSink>>;
+export declare const getSink: (src: string, logLevel: LogLevel) => Promise<{
+    getVideo: () => Promise<import("./video-extraction/get-frames-since-keyframe").VideoSinkResult>;
+    getAudio: (index: number) => Promise<import("./video-extraction/get-frames-since-keyframe").AudioSinkResult>;
+    actualMatroskaTimestamps: {
+        observeTimestamp: (startTime: number) => void;
+        getRealTimestamp: (observedTimestamp: number) => number | null;
+    };
+    isMatroska: boolean;
+    getDuration: () => Promise<number>;
+}>;

package/dist/get-sink.js

@@ -0,0 +1,15 @@
+import { Internals } from 'remotion';
+import { getSinks } from './video-extraction/get-frames-since-keyframe';
+export const sinkPromises = {};
+export const getSink = (src, logLevel) => {
+    let promise = sinkPromises[src];
+    if (!promise) {
+        Internals.Log.verbose({
+            logLevel,
+            tag: '@remotion/media',
+        }, `Sink for ${src} was not found, creating new sink`);
+        promise = getSinks(src);
+        sinkPromises[src] = promise;
+    }
+    return promise;
+};

package/dist/get-time-in-seconds.d.ts

@@ -0,0 +1,10 @@
+export declare const getTimeInSeconds: ({ loop, mediaDurationInSeconds, unloopedTimeInSeconds, src, trimAfter, trimBefore, fps, playbackRate, }: {
+    loop: boolean;
+    mediaDurationInSeconds: number | null;
+    unloopedTimeInSeconds: number;
+    src: string;
+    trimAfter: number | undefined;
+    trimBefore: number | undefined;
+    playbackRate: number;
+    fps: number;
+}) => number | null;

package/dist/get-time-in-seconds.js

@@ -0,0 +1,25 @@
+import { Internals } from 'remotion';
+export const getTimeInSeconds = ({ loop, mediaDurationInSeconds, unloopedTimeInSeconds, src, trimAfter, trimBefore, fps, playbackRate, }) => {
+    if (mediaDurationInSeconds === null && loop) {
+        throw new Error(`Could not determine duration of ${src}, but "loop" was set.`);
+    }
+    const loopDuration = loop
+        ? Internals.calculateLoopDuration({
+            trimAfter,
+            mediaDurationInFrames: mediaDurationInSeconds * fps,
+            // Playback rate was already specified before
+            playbackRate: 1,
+            trimBefore,
+        }) / fps
+        : Infinity;
+    const timeInSeconds = (unloopedTimeInSeconds * playbackRate) % loopDuration;
+    if ((trimAfter ?? null) !== null) {
+        if (!loop) {
+            const time = (trimAfter - (trimBefore ?? 0)) / fps;
+            if (timeInSeconds >= time) {
+                return null;
+            }
+        }
+    }
+    return timeInSeconds + (trimBefore ?? 0) / fps;
+};

package/dist/index.d.ts

@@ -8,6 +8,7 @@ export declare const experimental_Audio: import("react").FC<import(".").AudioPro
  * @deprecated Now just `Video`
  */
 export declare const experimental_Video: import("react").FC<import(".").VideoProps>;
+export { AudioForPreview } from './audio/audio-for-preview';
 export { AudioProps, FallbackHtml5AudioProps } from './audio/props';
 export { VideoProps } from './video/props';
 export { Audio, Video };

package/dist/index.js

@@ -8,4 +8,5 @@ export const experimental_Audio = Audio;
  * @deprecated Now just `Video`
  */
 export const experimental_Video = Video;
+export { AudioForPreview } from './audio/audio-for-preview';
 export { Audio, Video };

package/dist/is-network-error.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Utility to check if error is network error
+ * @param error
+ * @returns
+ */
+export declare function isNetworkError(error: Error): boolean;

package/dist/is-network-error.js

@@ -0,0 +1,17 @@
+/**
+ * Utility to check if error is network error
+ * @param error
+ * @returns
+ */
+export function isNetworkError(error) {
+    if (
+    // Chrome
+    error.message.includes('Failed to fetch') ||
+        // Safari
+        error.message.includes('Load failed') ||
+        // Firefox
+        error.message.includes('NetworkError when attempting to fetch resource')) {
+        return true;
+    }
+    return false;
+}

package/dist/render-timestamp-range.d.ts

@@ -0,0 +1 @@
+export declare const renderTimestampRange: (timestamps: number[]) => string;

package/dist/render-timestamp-range.js

@@ -0,0 +1,9 @@
+export const renderTimestampRange = (timestamps) => {
+    if (timestamps.length === 0) {
+        return '(none)';
+    }
+    if (timestamps.length === 1) {
+        return timestamps[0].toFixed(3);
+    }
+    return `${timestamps[0].toFixed(3)}...${timestamps[timestamps.length - 1].toFixed(3)}`;
+};

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

@@ -1,11 +1,23 @@
 import type { LogLevel } from 'remotion';
 export declare const SEEK_THRESHOLD = 0.05;
+export type MediaPlayerInitResult = {
+    type: 'success';
+} | {
+    type: 'unknown-container-format';
+} | {
+    type: 'cannot-decode';
+} | {
+    type: 'network-error';
+} | {
+    type: 'no-tracks';
+};
 export declare class MediaPlayer {
     private canvas;
     private context;
     private src;
     private logLevel;
     private playbackRate;
+    private audioStreamIndex;
     private canvasSink;
     private videoFrameIterator;
     private nextFrame;
@@ -17,8 +29,12 @@ export declare class MediaPlayer {
     private audioSyncAnchor;
     private playing;
     private muted;
+    private loop;
+    private trimBeforeSeconds;
+    private trimAfterSeconds;
     private animationFrameId;
     private videoAsyncId;
+    private audioAsyncId;
     private initialized;
     private totalDuration;
     private isBuffering;
@@ -27,17 +43,22 @@ export declare class MediaPlayer {
     private audioIteratorStarted;
     private readonly HEALTHY_BUFER_THRESHOLD_SECONDS;
     private onVideoFrameCallback?;
-    constructor({ canvas, src, logLevel, sharedAudioContext, }: {
-        canvas: HTMLCanvasElement;
+    constructor({ canvas, src, logLevel, sharedAudioContext, loop, trimBeforeSeconds, trimAfterSeconds, playbackRate, audioStreamIndex, }: {
+        canvas: HTMLCanvasElement | null;
         src: string;
         logLevel: LogLevel;
         sharedAudioContext: AudioContext;
+        loop: boolean;
+        trimBeforeSeconds: number | undefined;
+        trimAfterSeconds: number | undefined;
+        playbackRate: number;
+        audioStreamIndex: number;
     });
     private input;
     private isReady;
     private hasAudio;
     private isCurrentlyBuffering;
-    initialize(startTime?: number): Promise<void>;
+    initialize(startTimeUnresolved: number): Promise<MediaPlayerInitResult>;
     private cleanupAudioQueue;
     private cleanAudioIteratorAndNodes;
     seekTo(time: number): Promise<void>;
@@ -45,13 +66,13 @@ export declare class MediaPlayer {
     pause(): void;
     setMuted(muted: boolean): void;
     setVolume(volume: number): void;
-    setPlaybackRate(rate: number): Promise<void>;
+    setPlaybackRate(rate: number): void;
+    setLoop(loop: boolean): void;
     dispose(): void;
     private getPlaybackTime;
-    private getAdjustedTimestamp;
     private scheduleAudioChunk;
-    onBufferingChange(callback: (isBuffering: boolean) => void): void;
-    onVideoFrame(callback: (frame: CanvasImageSource) => void): void;
+    onBufferingChange(callback: (isBuffering: boolean) => void): () => void;
+    onVideoFrame(callback: (frame: CanvasImageSource) => void): () => void;
     private canRenderVideo;
     private startRenderLoop;
     private stopRenderLoop;