@remotion/renderer 3.2.11 → 3.2.12-crf.5

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

@@ -4,4 +4,5 @@ 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,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.codecSupportsMedia = void 0;
+exports.codecSupportsCrf = exports.codecSupportsMedia = void 0;
+const get_codec_name_1 = require("./get-codec-name");
 const support = {
     'h264-mkv': {
         audio: true,
@@ -47,3 +48,9 @@ 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, }: {
+export declare const combineVideos: ({ files, filelistDir, output, onProgress, numberOfFrames, codec, fps, numberOfGifLoops, crf, }: {
     files: string[];
     filelistDir: string;
     output: string;
@@ -8,4 +8,5 @@ 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,15 +8,17 @@ 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, }) => {
+const combineVideos = async ({ files, filelistDir, output, onProgress, numberOfFrames, codec, fps, numberOfGifLoops, crf, }) => {
     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',
@@ -40,6 +42,8 @@ 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/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, 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 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 command = [
         '-itsoffset',
         actualOffset,
@@ -72,7 +72,20 @@ const getFrameOfVideoSlow = async ({ src, timestamp, ffmpegExecutable, imageForm
     const [stdErr, stdoutBuffer] = await Promise.all([stdErrString, stdoutChunk]);
     const isEmpty = stdErr.includes('Output file is empty');
     if (isEmpty) {
-        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.`);
+        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,
+        });
     }
     return stdoutBuffer;
 };
@@ -88,12 +101,14 @@ const getLastFrameOfVideoFastUnlimited = async (options) => {
     }
     if (options.specialVCodecForTransparency === 'vp8' || offset > 40) {
         const last = await getFrameOfVideoSlow({
-            timestamp: duration,
+            duration,
             ffmpegExecutable,
             src,
             imageFormat: options.imageFormat,
             specialVCodecForTransparency: options.specialVCodecForTransparency,
             needsResize: options.needsResize,
+            offset: offset - 1000 / (fps === null ? 10 : fps),
+            fps,
         });
         return last;
     }
@@ -143,7 +158,7 @@ const getLastFrameOfVideoFastUnlimited = async (options) => {
         const unlimited = await getLastFrameOfVideoFastUnlimited({
             ffmpegExecutable,
             // Decrement in 10ms increments, or 1 frame (e.g. fps = 25 --> 40ms)
-            offset: offset + 1000 / (fps === null ? 10 : fps),
+            offset: offset + (fps === null ? 10 : 1000 / fps),
             src,
             ffprobeExecutable,
             imageFormat: options.imageFormat,
@@ -167,13 +182,16 @@ 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,
-            timestamp: time,
+            duration: time,
             needsResize,
+            offset: 0,
+            fps,
         });
     }
     if ((0, is_beyond_last_frame_1.isBeyondLastFrame)(downloadMap, src, time)) {
@@ -243,6 +261,11 @@ 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/guess-extension-for-media.d.ts

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

package/dist/index.d.ts

@@ -60,14 +60,14 @@ export declare const RenderInternals: {
         width: number;
         height: number;
         scale: number;
-        codec: "mp3" | "wav" | "h264" | "h265" | "vp8" | "vp9" | "aac" | "prores" | "h264-mkv" | "gif";
+        codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif";
     }) => void;
     normalizeServeUrl: (unnormalized: string) => string;
     spawnFfmpeg: (options: import("./stitch-frames-to-video").StitcherOptions) => Promise<{
         task: Promise<Buffer | null>;
         getLogs: () => string;
     }>;
-    getFileExtensionFromCodec: (codec: "mp3" | "wav" | "h264" | "h265" | "vp8" | "vp9" | "aac" | "prores" | "h264-mkv" | "gif", type: "chunk" | "final") => "mp3" | "webm" | "wav" | "mp4" | "aac" | "gif" | "mkv" | "mov";
+    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;
@@ -115,7 +115,7 @@ export declare const RenderInternals: {
     };
     registerErrorSymbolicationLock: () => number;
     unlockErrorSymbolicationLock: (id: number) => void;
-    canUseParallelEncoding: (codec: "mp3" | "wav" | "h264" | "h265" | "vp8" | "vp9" | "aac" | "prores" | "h264-mkv" | "gif") => boolean;
+    canUseParallelEncoding: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif") => boolean;
     mimeContentType: typeof mimeContentType;
     mimeLookup: typeof mimeLookup;
     validateConcurrency: (value: unknown, setting: string) => void;
@@ -124,8 +124,8 @@ export declare const RenderInternals: {
     validateFrameRange: (frameRange: import("./frame-range").FrameRange | null) => void;
     DEFAULT_OPENGL_RENDERER: "swangle" | "angle" | "egl" | "swiftshader" | null;
     validateOpenGlRenderer: (option: "swangle" | "angle" | "egl" | "swiftshader" | null) => "swangle" | "angle" | "egl" | "swiftshader" | null;
-    getDefaultCrfForCodec: (codec: "mp3" | "wav" | "h264" | "h265" | "vp8" | "vp9" | "aac" | "prores" | "h264-mkv" | "gif") => number;
-    validateSelectedCrfAndCodecCombination: (crf: unknown, codec: "mp3" | "wav" | "h264" | "h265" | "vp8" | "vp9" | "aac" | "prores" | "h264-mkv" | "gif") => void;
+    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"];
     validCodecs: readonly ["h264", "h265", "vp8", "vp9", "mp3", "aac", "wav", "prores", "h264-mkv", "gif"];
     DEFAULT_OVERWRITE: boolean;
@@ -133,14 +133,14 @@ export declare const RenderInternals: {
     validateQuality: (q: number | undefined) => void;
     validateFrame: (frame: number, durationInFrames: number) => void;
     DEFAULT_TIMEOUT: number;
-    getValidCrfRanges: (codec: "mp3" | "wav" | "h264" | "h265" | "vp8" | "vp9" | "aac" | "prores" | "h264-mkv" | "gif") => [number, number];
-    validateSelectedPixelFormatAndCodecCombination: (pixelFormat: "yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le", codec: "mp3" | "wav" | "h264" | "h265" | "vp8" | "vp9" | "aac" | "prores" | "h264-mkv" | "gif") => void;
-    validateSelectedCodecAndProResCombination: (actualCodec: "mp3" | "wav" | "h264" | "h265" | "vp8" | "vp9" | "aac" | "prores" | "h264-mkv" | "gif", actualProResProfile: "4444-xq" | "4444" | "hq" | "standard" | "light" | "proxy" | undefined) => void;
+    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: "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: "mp3" | "wav" | "h264" | "h265" | "vp8" | "vp9" | "aac" | "prores" | "h264-mkv" | "gif";
-    isAudioCodec: (codec: "mp3" | "wav" | "h264" | "h265" | "vp8" | "vp9" | "aac" | "prores" | "h264-mkv" | "gif" | undefined) => boolean;
+    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: "verbose" | "info" | "warn" | "error", level: "verbose" | "info" | "warn" | "error") => boolean;
+    isEqualOrBelowLogLevel: (currentLevel: "verbose" | "error" | "info" | "warn", level: "verbose" | "error" | "info" | "warn") => boolean;
     isValidLogLevel: (level: string) => boolean;
     validateEveryNthFrame: (everyNthFrame: unknown) => void;
     perf: typeof perf;

package/dist/render-media.js

@@ -46,6 +46,9 @@ const renderMedia = ({ parallelism, proResProfile, crf, composition, ffmpegExecu
     if (outputLocation) {
         (0, validate_output_filename_1.validateOutputFilename)(codec, (0, get_extension_of_filename_1.getExtensionOfFilename)(outputLocation));
     }
+    const absoluteOutputLocation = outputLocation
+        ? path_1.default.resolve(process.cwd(), outputLocation)
+        : null;
     (0, validate_scale_1.validateScale)(scale);
     const everyNthFrame = (_a = options.everyNthFrame) !== null && _a !== void 0 ? _a : 1;
     const numberOfGifLoops = (_b = options.numberOfGifLoops) !== null && _b !== void 0 ? _b : null;
@@ -207,8 +210,8 @@ const renderMedia = ({ parallelism, proResProfile, crf, composition, ffmpegExecu
         .then(([{ assetsInfo }]) => {
         renderedDoneIn = Date.now() - renderStart;
         callUpdate();
-        if (outputLocation) {
-            (0, ensure_output_directory_1.ensureOutputDirectory)(outputLocation);
+        if (absoluteOutputLocation) {
+            (0, ensure_output_directory_1.ensureOutputDirectory)(absoluteOutputLocation);
         }
         const stitchStart = Date.now();
         return Promise.all([
@@ -216,7 +219,7 @@ const renderMedia = ({ parallelism, proResProfile, crf, composition, ffmpegExecu
                 width: composition.width * (scale !== null && scale !== void 0 ? scale : 1),
                 height: composition.height * (scale !== null && scale !== void 0 ? scale : 1),
                 fps,
-                outputLocation,
+                outputLocation: absoluteOutputLocation,
                 internalOptions: {
                     preEncodedFileLocation,
                     imageFormat,

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 = encoderName && codec !== 'prores';
+    const supportsCrf = (0, codec_supports_media_1.codecSupportsCrf)(codec);
     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.11",
+	"version": "3.2.12-crf.5+14dc380ad",
 	"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.11",
+		"remotion": "3.2.12-crf.5+14dc380ad",
 		"source-map": "^0.8.0-beta.0",
 		"ws": "8.7.0"
 	},
@@ -57,5 +57,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "43d44e718e41200aea544719e9963482f9a65120"
+	"gitHead": "14dc380ad148868c35c5612f48eaf8e78ab42d9c"
 }