@remotion/renderer 3.0.31 → 3.1.0

package/dist/stitch-frames-to-video.js

@@ -12,6 +12,8 @@ const remotion_1 = require("remotion");
 const calculate_asset_positions_1 = require("./assets/calculate-asset-positions");
 const convert_assets_to_file_urls_1 = require("./assets/convert-assets-to-file-urls");
 const download_and_map_assets_to_file_1 = require("./assets/download-and-map-assets-to-file");
+const codec_supports_media_1 = require("./codec-supports-media");
+const convert_number_of_gif_loops_to_ffmpeg_1 = require("./convert-number-of-gif-loops-to-ffmpeg");
 const delete_directory_1 = require("./delete-directory");
 const get_audio_codec_name_1 = require("./get-audio-codec-name");
 const get_codec_name_1 = require("./get-codec-name");
@@ -71,10 +73,9 @@ const getAssetsData = async ({ assets, downloadDir, onDownload, fps, expectedFra
     return outName;
 };
 const spawnFfmpeg = async (options) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
     remotion_1.Internals.validateDimension(options.height, 'height', 'passed to `stitchFramesToVideo()`');
     remotion_1.Internals.validateDimension(options.width, 'width', 'passed to `stitchFramesToVideo()`');
-    remotion_1.Internals.validateFps(options.fps, 'passed to `stitchFramesToVideo()`');
     const codec = (_a = options.codec) !== null && _a !== void 0 ? _a : remotion_1.Internals.DEFAULT_CODEC;
     (0, validate_even_dimensions_with_codec_1.validateEvenDimensionsWithCodec)({
         width: options.width,
@@ -82,13 +83,14 @@ const spawnFfmpeg = async (options) => {
         codec,
         scale: 1,
     });
+    remotion_1.Internals.validateFps(options.fps, 'in `stitchFramesToVideo()`', codec);
     const crf = (_b = options.crf) !== null && _b !== void 0 ? _b : remotion_1.Internals.getDefaultCrfForCodec(codec);
     const pixelFormat = (_c = options.pixelFormat) !== null && _c !== void 0 ? _c : remotion_1.Internals.DEFAULT_PIXEL_FORMAT;
     await (0, validate_ffmpeg_1.validateFfmpeg)((_d = options.ffmpegExecutable) !== null && _d !== void 0 ? _d : null);
     const encoderName = (0, get_codec_name_1.getCodecName)(codec);
     const audioCodecName = (0, get_audio_codec_name_1.getAudioCodecName)(codec);
     const proResProfileName = (0, get_prores_profile_name_1.getProResProfileName)(codec, options.proResProfile);
-    const isAudioOnly = encoderName === null;
+    const mediaSupport = (0, codec_supports_media_1.codecSupportsMedia)(codec);
     const supportsCrf = encoderName && codec !== 'prores';
     const tempFile = options.outputLocation
         ? null
@@ -102,7 +104,7 @@ const spawnFfmpeg = async (options) => {
             console.log('[verbose] crf', crf);
         }
         console.log('[verbose] codec', codec);
-        console.log('[verbose] isAudioOnly', isAudioOnly);
+        console.log('[verbose] isAudioOnly', mediaSupport.audio && !mediaSupport.video);
         console.log('[verbose] proResProfileName', proResProfileName);
     }
     remotion_1.Internals.validateSelectedCrfAndCodecCombination(crf, codec);
@@ -113,18 +115,20 @@ const spawnFfmpeg = async (options) => {
         const totalFrameProgress = 0.5 * preStitchProgress * expectedFrames + muxProgress * 0.5;
         (_a = options.onProgress) === null || _a === void 0 ? void 0 : _a.call(options, Math.round(totalFrameProgress));
     };
-    const audio = await getAssetsData({
-        assets: options.assetsInfo.assets,
-        downloadDir: options.assetsInfo.downloadDir,
-        onDownload: options.onDownload,
-        fps: options.fps,
-        expectedFrames,
-        verbose: (_f = options.verbose) !== null && _f !== void 0 ? _f : false,
-        ffmpegExecutable: (_g = options.ffmpegExecutable) !== null && _g !== void 0 ? _g : null,
-        ffprobeExecutable: (_h = options.ffprobeExecutable) !== null && _h !== void 0 ? _h : null,
-        onProgress: (prog) => updateProgress(prog, 0),
-    });
-    if (isAudioOnly) {
+    const audio = mediaSupport.audio
+        ? await getAssetsData({
+            assets: options.assetsInfo.assets,
+            downloadDir: options.assetsInfo.downloadDir,
+            onDownload: options.onDownload,
+            fps: options.fps,
+            expectedFrames,
+            verbose: (_f = options.verbose) !== null && _f !== void 0 ? _f : false,
+            ffmpegExecutable: (_g = options.ffmpegExecutable) !== null && _g !== void 0 ? _g : null,
+            ffprobeExecutable: (_h = options.ffprobeExecutable) !== null && _h !== void 0 ? _h : null,
+            onProgress: (prog) => updateProgress(prog, 0),
+        })
+        : null;
+    if (mediaSupport.audio && !mediaSupport.video) {
         if (!audioCodecName) {
             throw new TypeError('exporting audio but has no audio codec name. Report this in the Remotion repo.');
         }
@@ -160,11 +164,17 @@ const spawnFfmpeg = async (options) => {
                 ['-start_number', String(options.assetsInfo.firstFrameIndex)],
                 ['-i', options.assetsInfo.imageSequenceName],
             ]),
-        ['-i', audio],
+        audio ? ['-i', audio] : null,
+        ((_p = options.numberOfGifLoops) !== null && _p !== void 0 ? _p : null) === null
+            ? null
+            : [
+                '-loop',
+                (0, convert_number_of_gif_loops_to_ffmpeg_1.convertNumberOfGifLoopsToFfmpegSyntax)((_q = options.numberOfGifLoops) !== null && _q !== void 0 ? _q : null),
+            ],
         // -c:v is the same as -vcodec as -codec:video
         // and specified the video codec.
         ['-c:v', encoderName],
-        ...(((_p = options.internalOptions) === null || _p === void 0 ? void 0 : _p.preEncodedFileLocation)
+        ...(((_r = options.internalOptions) === null || _r === void 0 ? void 0 : _r.preEncodedFileLocation)
             ? []
             : [
                 proResProfileName ? ['-profile:v', proResProfileName] : null,
@@ -187,22 +197,22 @@ const spawnFfmpeg = async (options) => {
                 [`Made with Remotion`, packageJson ? packageJson.version : null].join(' '),
         ],
         options.force ? '-y' : null,
-        (_q = options.outputLocation) !== null && _q !== void 0 ? _q : tempFile,
+        (_s = options.outputLocation) !== null && _s !== void 0 ? _s : tempFile,
     ];
     if (options.verbose) {
         console.log('Generated FFMPEG command:');
         console.log(ffmpegArgs);
     }
     const ffmpegString = ffmpegArgs.flat(2).filter(Boolean);
-    const task = (0, execa_1.default)((_r = options.ffmpegExecutable) !== null && _r !== void 0 ? _r : 'ffmpeg', ffmpegString, {
+    const task = (0, execa_1.default)((_t = options.ffmpegExecutable) !== null && _t !== void 0 ? _t : 'ffmpeg', ffmpegString, {
         cwd: options.dir,
     });
-    (_s = options.cancelSignal) === null || _s === void 0 ? void 0 : _s.call(options, () => {
+    (_u = options.cancelSignal) === null || _u === void 0 ? void 0 : _u.call(options, () => {
         task.kill();
     });
     let ffmpegOutput = '';
     let isFinished = false;
-    (_t = task.stderr) === null || _t === void 0 ? void 0 : _t.on('data', (data) => {
+    (_v = task.stderr) === null || _v === void 0 ? void 0 : _v.on('data', (data) => {
         var _a;
         const str = data.toString();
         ffmpegOutput += str;

package/dist/validate-output-filename.js

@@ -48,5 +48,10 @@ const validateOutputFilename = (codec, extension) => {
             throw new TypeError("When using the 'wav' codec, the output location must end in .wav.");
         }
     }
+    if (codec === 'gif') {
+        if (extension !== 'gif') {
+            throw new TypeError('When using the GIF codec, the output filename must end in .gif.');
+        }
+    }
 };
 exports.validateOutputFilename = validateOutputFilename;

package/package.json

@@ -1,13 +1,13 @@
 {
 	"name": "@remotion/renderer",
-	"version": "3.0.31",
+	"version": "3.1.0",
 	"description": "Renderer for Remotion",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
 	"sideEffects": false,
 	"scripts": {
 		"lint": "eslint src --ext ts,tsx",
-		"test": "jest --runInBand",
+		"test": "vitest --run",
 		"watch": "tsc -w",
 		"build": "tsc -d"
 	},
@@ -22,7 +22,7 @@
 	"dependencies": {
 		"execa": "5.1.1",
 		"extract-zip": "2.0.1",
-		"remotion": "3.0.31",
+		"remotion": "3.1.0",
 		"source-map": "^0.8.0-beta.0",
 		"ws": "8.7.0"
 	},
@@ -32,21 +32,19 @@
 	},
 	"devDependencies": {
 		"@jonny/eslint-config": "3.0.266",
-		"@testing-library/dom": "^8.7.2",
-		"@testing-library/react": "13.1.1",
-		"@types/jest": "^27.4.0",
+		"@testing-library/dom": "^8.16.0",
+		"@testing-library/react": "13.3.0",
 		"@types/node": "^16.7.5",
 		"@types/progress": "2.0.5",
 		"@types/react": "18.0.1",
 		"@types/react-dom": "18.0.0",
 		"eslint": "8.13.0",
-		"jest": "^27.2.4",
 		"prettier": "^2.0.5",
 		"prettier-plugin-organize-imports": "^2.3.4",
 		"react": "18.0.0",
 		"react-dom": "18.0.0",
-		"ts-jest": "^27.0.5",
-		"typescript": "^4.7.0"
+		"typescript": "^4.7.0",
+		"vitest": "^0.18.0"
 	},
 	"keywords": [
 		"remotion",
@@ -59,5 +57,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "9342296ce1634b8b7b6dbdaee810a961f6922516"
+	"gitHead": "482c66127662171577aa427f10fe265fa1bc933b"
 }

package/tsconfig.json

@@ -5,5 +5,6 @@
 		"rootDir": "src",
 		"outDir": "dist"
 	},
-	"references": [{"path": "../core"}, {"path": "../bundler"}]
+	"references": [{"path": "../core"}, {"path": "../bundler"}],
+	"exclude": ["vitest.config.ts", "dist"]
 }

package/vitest.config.ts

@@ -0,0 +1,8 @@
+import {defineConfig} from 'vitest/config';
+
+export default defineConfig({
+	test: {
+		testTimeout: 90000,
+		maxConcurrency: 2,
+	},
+});

package/dist/abort.d.ts

@@ -1,7 +0,0 @@
-declare type Callback = () => void;
-export declare type CancelSignal = (callback: Callback) => void;
-export declare const getCancelSignal: () => {
-    cancelSignal: CancelSignal;
-    cancel: () => void;
-};
-export {};

package/dist/abort.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCancelSignal = void 0;
-const getCancelSignal = () => {
-    const callbacks = [];
-    let cancelled = false;
-    return {
-        cancelSignal: (callback) => callbacks.push(callback),
-        cancel: () => {
-            if (cancelled) {
-                return;
-            }
-            callbacks.forEach((cb) => {
-                cb();
-            });
-            cancelled = true;
-        },
-    };
-};
-exports.getCancelSignal = getCancelSignal;

package/dist/assets/cleanup-assets.d.ts

@@ -1,2 +0,0 @@
-export declare type RenderCleanupFn = () => Promise<void>;
-export declare type AddRenderCleanupFunction = (cleanup: RenderCleanupFn) => void;

package/dist/assets/cleanup-assets.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/browser/ConnectionTransport.d.ts

@@ -1,21 +0,0 @@
-/**
- * Copyright 2020 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-export interface ConnectionTransport {
-    send(message: string): void;
-    close(): void;
-    onmessage?: (message: string) => void;
-    onclose?: () => void;
-}

package/dist/browser/ConnectionTransport.js

@@ -1,17 +0,0 @@
-"use strict";
-/**
- * Copyright 2020 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/browser/EmulationManager.d.ts

@@ -1,7 +0,0 @@
-import { CDPSession } from './Connection';
-import { Viewport } from './PuppeteerViewport';
-export declare class EmulationManager {
-    #private;
-    constructor(client: CDPSession);
-    emulateViewport(viewport: Viewport): Promise<void>;
-}

package/dist/browser/EmulationManager.js

@@ -1,40 +0,0 @@
-"use strict";
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _EmulationManager_client;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EmulationManager = void 0;
-class EmulationManager {
-    constructor(client) {
-        _EmulationManager_client.set(this, void 0);
-        __classPrivateFieldSet(this, _EmulationManager_client, client, "f");
-    }
-    async emulateViewport(viewport) {
-        const { height, width } = viewport;
-        const { deviceScaleFactor } = viewport;
-        const screenOrientation = {
-            angle: 0,
-            type: 'portraitPrimary',
-        };
-        await Promise.all([
-            __classPrivateFieldGet(this, _EmulationManager_client, "f").send('Emulation.setDeviceMetricsOverride', {
-                mobile: false,
-                width,
-                height,
-                deviceScaleFactor,
-                screenOrientation,
-            }),
-        ]);
-    }
-}
-exports.EmulationManager = EmulationManager;
-_EmulationManager_client = new WeakMap();

package/dist/browser/Page.d.ts

@@ -1,74 +0,0 @@
-/**
- * Copyright 2017 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import type { Browser } from './Browser';
-import type { CDPSession } from './Connection';
-import { ConsoleMessage } from './ConsoleMessage';
-import type { EvaluateFn, EvaluateFnReturnType, EvaluateHandleFn, SerializableOrJSHandle, UnwrapPromiseLike } from './EvalTypes';
-import { EventEmitter } from './EventEmitter';
-import type { Frame } from './FrameManager';
-import type { HTTPResponse } from './HTTPResponse';
-import type { JSHandle } from './JSHandle';
-import type { Viewport } from './PuppeteerViewport';
-import type { Target } from './Target';
-import { TaskQueue } from './TaskQueue';
-interface WaitForOptions {
-    timeout?: number;
-}
-interface PageEventObject {
-    console: ConsoleMessage;
-    error: Error;
-}
-export declare class Page extends EventEmitter {
-    #private;
-    static _create(client: CDPSession, target: Target, defaultViewport: Viewport, browser: Browser): Promise<Page>;
-    browser: Browser;
-    screenshotTaskQueue: TaskQueue;
-    constructor(client: CDPSession, target: Target, browser: Browser);
-    /**
-     * Listen to page events.
-     */
-    on<K extends keyof PageEventObject>(eventName: K, handler: (event: PageEventObject[K]) => void): EventEmitter;
-    once<K extends keyof PageEventObject>(eventName: K, handler: (event: PageEventObject[K]) => void): EventEmitter;
-    off<K extends keyof PageEventObject>(eventName: K, handler: (event: PageEventObject[K]) => void): EventEmitter;
-    /**
-     * @returns A target this page was created from.
-     */
-    target(): Target;
-    _client(): CDPSession;
-    /**
-     * @returns The page's main frame.
-     * @remarks
-     * Page is guaranteed to have a main frame which persists during navigations.
-     */
-    mainFrame(): Frame;
-    setViewport(viewport: Viewport): Promise<void>;
-    setDefaultNavigationTimeout(timeout: number): void;
-    setDefaultTimeout(timeout: number): void;
-    evaluateHandle<HandlerType extends JSHandle = JSHandle>(pageFunction: EvaluateHandleFn, ...args: SerializableOrJSHandle[]): Promise<HandlerType>;
-    url(): string;
-    goto(url: string, options?: WaitForOptions & {
-        referer?: string;
-    }): Promise<HTTPResponse | null>;
-    bringToFront(): Promise<void>;
-    evaluate<T extends EvaluateFn>(pageFunction: T, ...args: SerializableOrJSHandle[]): Promise<UnwrapPromiseLike<EvaluateFnReturnType<T>>>;
-    evaluateOnNewDocument(pageFunction: Function | string, ...args: unknown[]): Promise<void>;
-    close(options?: {
-        runBeforeUnload?: boolean;
-    }): Promise<void>;
-    isClosed(): boolean;
-    waitForFunction(browser: Browser, pageFunction: Function | string, ...args: SerializableOrJSHandle[]): Promise<JSHandle>;
-}
-export {};