@remotion/renderer 3.2.12-crf.7 → 3.2.12

package/dist/codec-supports-media.d.ts

@@ -4,5 +4,4 @@ declare type MediaSupport = {
     audio: boolean;
 };
 export declare const codecSupportsMedia: (codec: Codec) => MediaSupport;
-export declare const codecSupportsCrf: (codec: Codec) => boolean | "" | null;
 export {};

package/dist/codec-supports-media.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.codecSupportsCrf = exports.codecSupportsMedia = void 0;
-const get_codec_name_1 = require("./get-codec-name");
+exports.codecSupportsMedia = void 0;
 const support = {
     'h264-mkv': {
         audio: true,
@@ -48,9 +47,3 @@ const codecSupportsMedia = (codec) => {
     return support[codec];
 };
 exports.codecSupportsMedia = codecSupportsMedia;
-const codecSupportsCrf = (codec) => {
-    const encoderName = (0, get_codec_name_1.getCodecName)(codec);
-    const supportsCrf = encoderName && codec !== 'prores';
-    return supportsCrf;
-};
-exports.codecSupportsCrf = codecSupportsCrf;

package/dist/combine-videos.d.ts

@@ -1,5 +1,5 @@
 import type { Codec } from './codec';
-export declare const combineVideos: ({ files, filelistDir, output, onProgress, numberOfFrames, codec, fps, numberOfGifLoops, crf, }: {
+export declare const combineVideos: ({ files, filelistDir, output, onProgress, numberOfFrames, codec, fps, numberOfGifLoops, }: {
     files: string[];
     filelistDir: string;
     output: string;
@@ -8,5 +8,4 @@ export declare const combineVideos: ({ files, filelistDir, output, onProgress, n
     codec: Codec;
     fps: number;
     numberOfGifLoops: number | null;
-    crf: number | null;
 }) => Promise<void>;

package/dist/combine-videos.js

@@ -8,17 +8,15 @@ exports.combineVideos = void 0;
 const execa_1 = __importDefault(require("execa"));
 const fs_1 = require("fs");
 const path_1 = require("path");
-const codec_supports_media_1 = require("./codec-supports-media");
 const get_audio_codec_name_1 = require("./get-audio-codec-name");
 const is_audio_codec_1 = require("./is-audio-codec");
 const parse_ffmpeg_progress_1 = require("./parse-ffmpeg-progress");
 const truthy_1 = require("./truthy");
-const combineVideos = async ({ files, filelistDir, output, onProgress, numberOfFrames, codec, fps, numberOfGifLoops, crf, }) => {
+const combineVideos = async ({ files, filelistDir, output, onProgress, numberOfFrames, codec, fps, numberOfGifLoops, }) => {
     var _a;
     const fileList = files.map((p) => `file '${p}'`).join('\n');
     const fileListTxt = (0, path_1.join)(filelistDir, 'files.txt');
     (0, fs_1.writeFileSync)(fileListTxt, fileList);
-    const supportsCrf = (0, codec_supports_media_1.codecSupportsCrf)(codec);
     try {
         const task = (0, execa_1.default)('ffmpeg', [
             (0, is_audio_codec_1.isAudioCodec)(codec) ? null : '-r',
@@ -42,8 +40,6 @@ const combineVideos = async ({ files, filelistDir, output, onProgress, numberOfF
             // Set max bitrate up to 1024kbps, will choose lower if that's too much
             '-b:a',
             '512K',
-            supportsCrf ? '-crf' : null,
-            supportsCrf ? String(crf) : null,
             codec === 'h264' ? '-movflags' : null,
             codec === 'h264' ? 'faststart' : null,
             '-shortest',

package/dist/create-ffmpeg-complex-filter.d.ts

@@ -1,5 +1,8 @@
 import type { DownloadMap } from './assets/download-map';
 export declare const createFfmpegComplexFilter: (filters: number, downloadMap: DownloadMap) => Promise<{
-    complexFilterFlag: [string, string] | null;
+    complexFilterFlag: [
+        string,
+        string
+    ] | null;
     cleanup: () => void;
 }>;

package/dist/extract-frame-from-video.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { OffthreadVideoImageFormat } from 'remotion';
 import type { DownloadMap } from './assets/download-map';
 import type { FfmpegExecutable } from './ffmpeg-executable';

package/dist/extract-frame-from-video.js

@@ -32,9 +32,9 @@ const determineResizeParams = (needsResize) => {
 };
 // Uses no seeking, therefore the whole video has to be decoded. This is a last resort and should only happen
 // if the video is corrupted
-const getFrameOfVideoSlow = async ({ src, duration, ffmpegExecutable, imageFormat, specialVCodecForTransparency, needsResize, offset, fps, }) => {
-    console.warn(`\nUsing a slow method to extract the frame at ${duration}ms of ${src}. See https://remotion.dev/docs/slow-method-to-extract-frame for advice`);
-    const actualOffset = `-${duration * 1000 - offset}ms`;
+const getFrameOfVideoSlow = async ({ src, timestamp, ffmpegExecutable, imageFormat, specialVCodecForTransparency, needsResize, }) => {
+    console.warn(`\nUsing a slow method to extract the frame at ${timestamp}ms of ${src}. See https://remotion.dev/docs/slow-method-to-extract-frame for advice`);
+    const actualOffset = `-${timestamp * 1000}ms`;
     const command = [
         '-itsoffset',
         actualOffset,
@@ -72,20 +72,7 @@ const getFrameOfVideoSlow = async ({ src, duration, ffmpegExecutable, imageForma
     const [stdErr, stdoutBuffer] = await Promise.all([stdErrString, stdoutChunk]);
     const isEmpty = stdErr.includes('Output file is empty');
     if (isEmpty) {
-        if (offset > 70) {
-            throw new Error(`Could not get last frame of ${src}. Tried to seek to the end using the command "ffmpeg ${command.join(' ')}" but got no frame. Most likely this video is corrupted.`);
-        }
-        return getFrameOfVideoSlow({
-            ffmpegExecutable,
-            duration,
-            // Decrement in 10ms increments, or 1 frame (e.g. fps = 25 --> 40ms)
-            offset: offset + (fps === null ? 10 : 1000 / fps),
-            src,
-            imageFormat,
-            specialVCodecForTransparency,
-            needsResize,
-            fps,
-        });
+        throw new Error(`Could not get last frame of ${src}. Tried to seek to the end using the command "ffmpeg ${command.join(' ')}" but got no frame. Most likely this video is corrupted.`);
     }
     return stdoutBuffer;
 };
@@ -101,14 +88,12 @@ const getLastFrameOfVideoFastUnlimited = async (options) => {
     }
     if (options.specialVCodecForTransparency === 'vp8' || offset > 40) {
         const last = await getFrameOfVideoSlow({
-            duration,
+            timestamp: duration,
             ffmpegExecutable,
             src,
             imageFormat: options.imageFormat,
             specialVCodecForTransparency: options.specialVCodecForTransparency,
             needsResize: options.needsResize,
-            offset: offset - 1000 / (fps === null ? 10 : fps),
-            fps,
         });
         return last;
     }
@@ -158,7 +143,7 @@ const getLastFrameOfVideoFastUnlimited = async (options) => {
         const unlimited = await getLastFrameOfVideoFastUnlimited({
             ffmpegExecutable,
             // Decrement in 10ms increments, or 1 frame (e.g. fps = 25 --> 40ms)
-            offset: offset + (fps === null ? 10 : 1000 / fps),
+            offset: offset + 1000 / (fps === null ? 10 : fps),
             src,
             ffprobeExecutable,
             imageFormat: options.imageFormat,
@@ -182,16 +167,13 @@ const extractFrameFromVideoFn = async ({ time, ffmpegExecutable, ffprobeExecutab
     const src = await (0, ensure_presentation_timestamp_1.ensurePresentationTimestamps)(downloadMap, options.src);
     const { specialVcodec, needsResize } = await (0, get_video_info_1.getVideoInfo)(downloadMap, src, ffprobeExecutable);
     if (specialVcodec === 'vp8') {
-        const { fps } = await (0, get_video_stream_duration_1.getVideoStreamDuration)(downloadMap, src, ffprobeExecutable);
         return getFrameOfVideoSlow({
             ffmpegExecutable,
             imageFormat,
             specialVCodecForTransparency: specialVcodec,
             src,
-            duration: time,
+            timestamp: time,
             needsResize,
-            offset: 0,
-            fps,
         });
     }
     if ((0, is_beyond_last_frame_1.isBeyondLastFrame)(downloadMap, src, time)) {
@@ -261,11 +243,6 @@ const extractFrameFromVideoFn = async ({ time, ffmpegExecutable, ffprobeExecutab
         });
         return last;
     }
-    if (stdOut.length === 0) {
-        console.log('FFMPEG Logs:');
-        console.log(stderrStr);
-        throw new Error("Couldn't extract frame from video - FFMPEG did not return any data. Check logs to see more information");
-    }
     return stdOut;
 };
 const extractFrameFromVideo = async (options) => {

package/dist/get-extension-from-codec.d.ts

@@ -1,2 +1,2 @@
 import type { Codec } from './codec';
-export declare const getFileExtensionFromCodec: (codec: Codec, type: 'chunk' | 'final') => "mp3" | "aac" | "wav" | "gif" | "webm" | "mp4" | "mov" | "mkv";
+export declare const getFileExtensionFromCodec: (codec: Codec, type: 'chunk' | 'final') => "mp3" | "aac" | "wav" | "gif" | "mp4" | "mkv" | "mov" | "webm";

package/dist/guess-extension-for-media.d.ts

@@ -1 +1 @@
-export declare const guessExtensionForVideo: (src: string) => Promise<"mp3" | "wav" | "webm" | "mp4">;
+export declare const guessExtensionForVideo: (src: string) => Promise<"mp3" | "wav" | "mp4" | "webm">;

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import execa from 'execa';
 import { SymbolicateableError } from './error-handling/symbolicateable-error';
 import { mimeContentType, mimeLookup } from './mime-types';
@@ -68,7 +67,7 @@ export declare const RenderInternals: {
         task: Promise<Buffer | null>;
         getLogs: () => string;
     }>;
-    getFileExtensionFromCodec: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif", type: "chunk" | "final") => "mp3" | "aac" | "wav" | "gif" | "webm" | "mp4" | "mov" | "mkv";
+    getFileExtensionFromCodec: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif", type: "chunk" | "final") => "mp3" | "aac" | "wav" | "gif" | "mp4" | "mkv" | "mov" | "webm";
     tmpDir: (str: string) => string;
     deleteDirectory: (directory: string) => Promise<void>;
     isServeUrl: (potentialUrl: string) => boolean;
@@ -123,8 +122,8 @@ export declare const RenderInternals: {
     validPixelFormats: readonly ["yuv420p", "yuva420p", "yuv422p", "yuv444p", "yuv420p10le", "yuv422p10le", "yuv444p10le", "yuva444p10le"];
     DEFAULT_BROWSER: import("./browser").Browser;
     validateFrameRange: (frameRange: import("./frame-range").FrameRange | null) => void;
-    DEFAULT_OPENGL_RENDERER: "angle" | "swangle" | "egl" | "swiftshader" | null;
-    validateOpenGlRenderer: (option: "angle" | "swangle" | "egl" | "swiftshader" | null) => "angle" | "swangle" | "egl" | "swiftshader" | null;
+    DEFAULT_OPENGL_RENDERER: "swangle" | "angle" | "egl" | "swiftshader" | null;
+    validateOpenGlRenderer: (option: "swangle" | "angle" | "egl" | "swiftshader" | null) => "swangle" | "angle" | "egl" | "swiftshader" | null;
     getDefaultCrfForCodec: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif") => number;
     validateSelectedCrfAndCodecCombination: (crf: unknown, codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif") => void;
     validImageFormats: readonly ["png", "jpeg", "none"];
@@ -136,12 +135,12 @@ export declare const RenderInternals: {
     DEFAULT_TIMEOUT: number;
     getValidCrfRanges: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif") => [number, number];
     validateSelectedPixelFormatAndCodecCombination: (pixelFormat: "yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le", codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif") => void;
-    validateSelectedCodecAndProResCombination: (actualCodec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif", actualProResProfile: "proxy" | "4444-xq" | "4444" | "hq" | "standard" | "light" | undefined) => void;
-    validateSelectedPixelFormatAndImageFormatCombination: (pixelFormat: "yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le", imageFormat: "jpeg" | "png" | "none") => "none" | "valid";
+    validateSelectedCodecAndProResCombination: (actualCodec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif", actualProResProfile: "4444-xq" | "4444" | "hq" | "standard" | "light" | "proxy" | undefined) => void;
+    validateSelectedPixelFormatAndImageFormatCombination: (pixelFormat: "yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le", imageFormat: "png" | "jpeg" | "none") => "none" | "valid";
     DEFAULT_CODEC: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif";
     isAudioCodec: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif" | undefined) => boolean;
     logLevels: readonly ["verbose", "info", "warn", "error"];
-    isEqualOrBelowLogLevel: (currentLevel: "error" | "verbose" | "info" | "warn", level: "error" | "verbose" | "info" | "warn") => boolean;
+    isEqualOrBelowLogLevel: (currentLevel: "verbose" | "info" | "warn" | "error", level: "verbose" | "info" | "warn" | "error") => boolean;
     isValidLogLevel: (level: string) => boolean;
     validateEveryNthFrame: (everyNthFrame: unknown) => void;
     perf: typeof perf;

package/dist/last-frame-from-video-cache.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { OffthreadVideoImageFormat } from 'remotion';
 import type { DownloadMap, SpecialVCodecForTransparency } from './assets/download-map';
 import type { FfmpegExecutable } from './ffmpeg-executable';

package/dist/make-assets-download-dir.d.ts

@@ -0,0 +1 @@
+export declare const makeAssetsDownloadTmpDir: () => string;

package/dist/make-assets-download-dir.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeAssetsDownloadTmpDir = void 0;
+const tmp_dir_1 = require("./tmp-dir");
+let dir = null;
+const makeAssetsDownloadTmpDir = () => {
+    if (dir) {
+        return dir;
+    }
+    dir = (0, tmp_dir_1.tmpDir)('remotion-assets-dir');
+    return dir;
+};
+exports.makeAssetsDownloadTmpDir = makeAssetsDownloadTmpDir;

package/dist/provide-screenshot.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { Page } from './browser/BrowserPage';
 import type { ImageFormat } from './image-format';
 export declare const provideScreenshot: ({ page, imageFormat, options, quality, }: {

package/dist/puppeteer-screenshot.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { Page } from './browser/BrowserPage';
 import type { ScreenshotOptions } from './browser/ScreenshotOptions';
 export declare const screenshot: (page: Page, options: ScreenshotOptions) => Promise<Buffer | string | void>;

package/dist/render-media.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { SmallTCompMetadata } from 'remotion';
 import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import type { DownloadMap } from './assets/download-map';

package/dist/screenshot-dom-element.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { Page } from './browser/BrowserPage';
 import type { ImageFormat } from './image-format';
 export declare const screenshotDOMElement: ({ page, imageFormat, quality, opts, }: {

package/dist/screenshot-task.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { Page } from './browser/BrowserPage';
 import type { ScreenshotOptions } from './browser/ScreenshotOptions';
 import type { StillImageFormat } from './image-format';

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

@@ -96,7 +96,7 @@ const spawnFfmpeg = async (options) => {
     const audioCodecName = (0, get_audio_codec_name_1.getAudioCodecName)(codec);
     const proResProfileName = (0, get_prores_profile_name_1.getProResProfileName)(codec, options.proResProfile);
     const mediaSupport = (0, codec_supports_media_1.codecSupportsMedia)(codec);
-    const supportsCrf = (0, codec_supports_media_1.codecSupportsCrf)(codec);
+    const supportsCrf = encoderName && codec !== 'prores';
     const tempFile = options.outputLocation
         ? null
         : path_1.default.join(options.assetsInfo.downloadMap.stitchFrames, `out.${(0, get_extension_from_codec_1.getFileExtensionFromCodec)(codec, 'final')}`);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "3.2.12-crf.7+93db68411",
+	"version": "3.2.12",
 	"description": "Renderer for Remotion",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
 	"dependencies": {
 		"execa": "5.1.1",
 		"extract-zip": "2.0.1",
-		"remotion": "3.2.12-crf.7+93db68411",
+		"remotion": "3.2.12",
 		"source-map": "^0.8.0-beta.0",
 		"ws": "8.7.0"
 	},
@@ -57,5 +57,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "93db68411377be8a8345f52ad3ea4d281424decc"
+	"gitHead": "72c9a148cafdd4468fff41bbc7ca70a1776fb15e"
 }

package/dist/captions-to-ffmpeg-inputs.d.ts

@@ -1,10 +0,0 @@
-import type { TCaption } from 'remotion';
-interface CaptionFfmpegInputs {
-    captionFilters: string[];
-    captionInputs: [string, string][];
-}
-export declare const captionsToFfmpegInputs: ({ assetsCount, captions, }: {
-    assetsCount: number;
-    captions: TCaption[][];
-}) => CaptionFfmpegInputs;
-export {};

package/dist/captions-to-ffmpeg-inputs.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.captionsToFfmpegInputs = void 0;
-const captionsToFfmpegInputs = ({ assetsCount, captions, }) => {
-    const uniqueCaptions = Object.values(captions.flat(1).reduce((acc, caption) => {
-        acc[caption.id] = caption;
-        return acc;
-    }, {}));
-    /**
-     * TODO: Support more formats.
-     * `mov_text` works for SRT.
-     */
-    const getFilter = ({ language, title }, index) => {
-        return ['-map', `${assetsCount + 1 + index}:s`, '-c:s', 'mov_text'].concat(language ? [`-metadata:s:s:${index}`, `language=${language}`] : '', title ? [`-metadata:s:s:${index}`, `title=${title}`] : '');
-    };
-    return {
-        captionInputs: uniqueCaptions.map((caption) => ['-i', caption.src]),
-        captionFilters: uniqueCaptions.reduce((acc, caption, i) => acc.concat(getFilter(caption, i)), []),
-    };
-};
-exports.captionsToFfmpegInputs = captionsToFfmpegInputs;