@remotion/webcodecs 4.0.227 → 4.0.229

package/dist/convert-media.js

@@ -1,20 +1,25 @@
 "use strict";
+/**
+ * Copyright (c) 2024 Remotion AG
+ * For licensing, see: https://remotion.dev/docs/webcodecs#license
+ */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertMedia = void 0;
 const media_parser_1 = require("@remotion/media-parser");
-const buffer_1 = require("@remotion/media-parser/buffer");
-const web_fs_1 = require("@remotion/media-parser/web-fs");
+const auto_select_writer_1 = require("./auto-select-writer");
+const calculate_progress_1 = require("./calculate-progress");
 const error_cause_1 = __importDefault(require("./error-cause"));
 const on_audio_track_1 = require("./on-audio-track");
 const on_video_track_1 = require("./on-video-track");
-const resolve_audio_action_1 = require("./resolve-audio-action");
-const resolve_video_action_1 = require("./resolve-video-action");
 const with_resolvers_1 = require("./with-resolvers");
-const convertMedia = async ({ src, onVideoFrame, onMediaStateUpdate, audioCodec, to, videoCodec, signal: userPassedAbortSignal, onAudioTrack: userAudioResolver, onVideoTrack: userVideoResolver, }) => {
-    if (to !== 'webm') {
+const convertMedia = async function ({ src, onVideoFrame, onMediaStateUpdate: onMediaStateDoNoCallDirectly, audioCodec, container, videoCodec, signal: userPassedAbortSignal, onAudioTrack: userAudioResolver, onVideoTrack: userVideoResolver, reader, fields, logLevel = 'info', writer, ...more }) {
+    if (userPassedAbortSignal === null || userPassedAbortSignal === void 0 ? void 0 : userPassedAbortSignal.aborted) {
+        return Promise.reject(new error_cause_1.default('Aborted'));
+    }
+    if (container !== 'webm') {
         return Promise.reject(new TypeError('Only `to: "webm"` is supported currently'));
     }
     if (audioCodec !== 'opus') {
@@ -23,7 +28,7 @@ const convertMedia = async ({ src, onVideoFrame, onMediaStateUpdate, audioCodec,
     if (videoCodec !== 'vp8' && videoCodec !== 'vp9') {
         return Promise.reject(new TypeError('Only `videoCodec: "vp8"` and `videoCodec: "vp9"` are supported currently'));
     }
-    const { promise, resolve, reject } = (0, with_resolvers_1.withResolvers)();
+    const { resolve, reject, getPromiseToImmediatelyReturn } = (0, with_resolvers_1.withResolversAndWaitForReturn)();
     const controller = new AbortController();
     const abortConversion = (errCause) => {
         reject(errCause);
@@ -40,9 +45,34 @@ const convertMedia = async ({ src, onVideoFrame, onMediaStateUpdate, audioCodec,
         decodedVideoFrames: 0,
         encodedVideoFrames: 0,
         encodedAudioFrames: 0,
+        bytesWritten: 0,
+        millisecondsWritten: 0,
+        expectedOutputDurationInMs: null,
+        overallProgress: 0,
+    };
+    const onMediaStateUpdate = (newState) => {
+        if (controller.signal.aborted) {
+            return;
+        }
+        onMediaStateDoNoCallDirectly === null || onMediaStateDoNoCallDirectly === void 0 ? void 0 : onMediaStateDoNoCallDirectly(newState);
     };
-    const canUseWebFs = await (0, web_fs_1.canUseWebFsWriter)();
-    const state = await media_parser_1.MediaParserInternals.createMedia(canUseWebFs ? web_fs_1.webFsWriter : buffer_1.bufferWriter);
+    const state = await media_parser_1.MediaParserInternals.createMedia({
+        writer: await (0, auto_select_writer_1.autoSelectWriter)(writer, logLevel),
+        onBytesProgress: (bytesWritten) => {
+            convertMediaState.bytesWritten = bytesWritten;
+            onMediaStateUpdate === null || onMediaStateUpdate === void 0 ? void 0 : onMediaStateUpdate(convertMediaState);
+        },
+        onMillisecondsProgress: (millisecondsWritten) => {
+            if (millisecondsWritten > convertMediaState.millisecondsWritten) {
+                convertMediaState.millisecondsWritten = millisecondsWritten;
+                convertMediaState.overallProgress = (0, calculate_progress_1.calculateProgress)({
+                    millisecondsWritten: convertMediaState.millisecondsWritten,
+                    expectedOutputDurationInMs: convertMediaState.expectedOutputDurationInMs,
+                });
+                onMediaStateUpdate === null || onMediaStateUpdate === void 0 ? void 0 : onMediaStateUpdate(convertMediaState);
+            }
+        },
+    });
     const onVideoTrack = (0, on_video_track_1.makeVideoTrackHandler)({
         state,
         onVideoFrame: onVideoFrame !== null && onVideoFrame !== void 0 ? onVideoFrame : null,
@@ -51,7 +81,9 @@ const convertMedia = async ({ src, onVideoFrame, onMediaStateUpdate, audioCodec,
         convertMediaState,
         controller,
         videoCodec,
-        onVideoTrack: userVideoResolver !== null && userVideoResolver !== void 0 ? userVideoResolver : resolve_video_action_1.defaultResolveVideoAction,
+        onVideoTrack: userVideoResolver !== null && userVideoResolver !== void 0 ? userVideoResolver : null,
+        logLevel,
+        container,
     });
     const onAudioTrack = (0, on_audio_track_1.makeAudioTrackHandler)({
         abortConversion,
@@ -60,14 +92,37 @@ const convertMedia = async ({ src, onVideoFrame, onMediaStateUpdate, audioCodec,
         convertMediaState,
         onMediaStateUpdate: onMediaStateUpdate !== null && onMediaStateUpdate !== void 0 ? onMediaStateUpdate : null,
         state,
-        onAudioTrack: userAudioResolver !== null && userAudioResolver !== void 0 ? userAudioResolver : resolve_audio_action_1.defaultResolveAudioAction,
-        bitrate: 128000,
+        onAudioTrack: userAudioResolver !== null && userAudioResolver !== void 0 ? userAudioResolver : null,
+        logLevel,
+        container,
     });
     (0, media_parser_1.parseMedia)({
         src,
         onVideoTrack,
         onAudioTrack,
         signal: controller.signal,
+        fields: {
+            ...fields,
+            durationInSeconds: true,
+        },
+        reader,
+        ...more,
+        onDurationInSeconds: (durationInSeconds) => {
+            if (durationInSeconds === null) {
+                return null;
+            }
+            const casted = more;
+            if (casted.onDurationInSeconds) {
+                casted.onDurationInSeconds(durationInSeconds);
+            }
+            const expectedOutputDurationInMs = durationInSeconds * 1000;
+            convertMediaState.expectedOutputDurationInMs = expectedOutputDurationInMs;
+            convertMediaState.overallProgress = (0, calculate_progress_1.calculateProgress)({
+                millisecondsWritten: convertMediaState.millisecondsWritten,
+                expectedOutputDurationInMs,
+            });
+            onMediaStateUpdate(convertMediaState);
+        },
     })
         .then(() => {
         return state.waitForFinish();
@@ -77,10 +132,9 @@ const convertMedia = async ({ src, onVideoFrame, onMediaStateUpdate, audioCodec,
     })
         .catch((err) => {
         reject(err);
-    })
-        .finally(() => {
+    });
+    return getPromiseToImmediatelyReturn().finally(() => {
         userPassedAbortSignal === null || userPassedAbortSignal === void 0 ? void 0 : userPassedAbortSignal.removeEventListener('abort', onUserAbort);
     });
-    return promise;
 };
 exports.convertMedia = convertMedia;