@remotion/lambda 4.0.132 → 4.0.134

package/dist/functions/helpers/can-concat-seamlessly.d.ts

@@ -1,3 +1,3 @@
 import type { AudioCodec } from '@remotion/renderer';
-export declare const canConcatAudioSeamlessly: (audioCodec: AudioCodec | null) => boolean;
+export declare const canConcatAudioSeamlessly: (audioCodec: AudioCodec | null, chunkDurationInFrames: number) => boolean;
 export declare const canConcatVideoSeamlessly: (codec: string) => boolean;

package/dist/functions/helpers/can-concat-seamlessly.js

@@ -3,7 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.canConcatVideoSeamlessly = exports.canConcatAudioSeamlessly = void 0;
 // Cannot do WAV yet, because currently assumes AAC in+outpoint
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-const canConcatAudioSeamlessly = (audioCodec) => {
+const canConcatAudioSeamlessly = (audioCodec, chunkDurationInFrames) => {
+    // Rendering a chunk that is too small generates too much overhead
+    // and is currently buggy
+    if (chunkDurationInFrames <= 4) {
+        return false;
+    }
     return audioCodec === 'aac';
 };
 exports.canConcatAudioSeamlessly = canConcatAudioSeamlessly;

package/dist/functions/helpers/concat-videos.d.ts

@@ -12,7 +12,7 @@ export declare const getAllFilesS3: ({ bucket, expectedFiles, outdir, renderId,
     onErrors: (errors: EnhancedErrorInfo[]) => void;
     logLevel: LogLevel;
 }) => Promise<string[]>;
-export declare const concatVideosS3: ({ onProgress, numberOfFrames, codec, fps, numberOfGifLoops, files, outdir, audioCodec, audioBitrate, logLevel, framesPerLambda, binariesDirectory, cancelSignal, preferLossless, }: {
+export declare const concatVideosS3: ({ onProgress, numberOfFrames, codec, fps, numberOfGifLoops, files, outdir, audioCodec, audioBitrate, logLevel, framesPerLambda, binariesDirectory, cancelSignal, preferLossless, muted, }: {
     onProgress: (frames: number) => void;
     numberOfFrames: number;
     codec: LambdaCodec;
@@ -27,6 +27,7 @@ export declare const concatVideosS3: ({ onProgress, numberOfFrames, codec, fps,
     binariesDirectory: string | null;
     cancelSignal: CancelSignal | undefined;
     preferLossless: boolean;
+    muted: boolean;
 }) => Promise<{
     outfile: string;
     cleanupChunksProm: Promise<void>;

package/dist/functions/helpers/concat-videos.js

@@ -88,7 +88,7 @@ const getAllFilesS3 = ({ bucket, expectedFiles, outdir, renderId, region, expect
                         .map((file) => getChunkDownloadOutputLocation({ outdir, file })));
                 }
             };
-            renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, 'Found ', filesInBucket);
+            renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, `Found ${filesInBucket.length} out of ${expectedFiles}`);
             const errors = (await (0, inspect_errors_1.inspectErrors)({
                 bucket,
                 contents: errorContents,
@@ -134,7 +134,7 @@ const getAllFilesS3 = ({ bucket, expectedFiles, outdir, renderId, region, expect
     });
 };
 exports.getAllFilesS3 = getAllFilesS3;
-const concatVideosS3 = async ({ onProgress, numberOfFrames, codec, fps, numberOfGifLoops, files, outdir, audioCodec, audioBitrate, logLevel, framesPerLambda, binariesDirectory, cancelSignal, preferLossless, }) => {
+const concatVideosS3 = async ({ onProgress, numberOfFrames, codec, fps, numberOfGifLoops, files, outdir, audioCodec, audioBitrate, logLevel, framesPerLambda, binariesDirectory, cancelSignal, preferLossless, muted, }) => {
     const outfile = (0, node_path_1.join)(renderer_1.RenderInternals.tmpDir(constants_1.REMOTION_CONCATED_TOKEN), `concat.${renderer_1.RenderInternals.getFileExtensionFromCodec(codec, audioCodec)}`);
     const combine = (0, timer_1.timer)('Combine chunks', logLevel);
     const filelistDir = renderer_1.RenderInternals.tmpDir(constants_1.REMOTION_FILELIST_TOKEN);
@@ -145,9 +145,9 @@ const concatVideosS3 = async ({ onProgress, numberOfFrames, codec, fps, numberOf
         preferLossless,
         separateAudioTo: null,
     });
-    const seamlessAudio = (0, can_concat_seamlessly_1.canConcatAudioSeamlessly)(resolvedAudioCodec);
+    const seamlessAudio = (0, can_concat_seamlessly_1.canConcatAudioSeamlessly)(resolvedAudioCodec, framesPerLambda);
     const seamlessVideo = (0, can_concat_seamlessly_1.canConcatVideoSeamlessly)(codec);
-    await renderer_1.RenderInternals.combineVideos({
+    await renderer_1.RenderInternals.combineChunks({
         files,
         filelistDir,
         output: outfile,
@@ -165,6 +165,7 @@ const concatVideosS3 = async ({ onProgress, numberOfFrames, codec, fps, numberOf
         cancelSignal,
         seamlessAudio,
         seamlessVideo,
+        muted,
     });
     combine.end();
     const cleanupChunksProm = node_fs_1.default.promises.rm(outdir, {

package/dist/functions/helpers/merge-chunks.js

@@ -99,6 +99,9 @@ const mergeChunksAndFinishRender = async (options) => {
         compositionStart: options.compositionStart,
     });
     const encodingStart = Date.now();
+    if (options.renderMetadata.type === 'still') {
+        throw new Error('Cannot merge stills');
+    }
     const { outfile, cleanupChunksProm } = await (0, concat_videos_1.concatVideosS3)({
         onProgress,
         numberOfFrames: options.frameCountLength,
@@ -114,6 +117,7 @@ const mergeChunksAndFinishRender = async (options) => {
         binariesDirectory: options.binariesDirectory,
         cancelSignal: undefined,
         preferLossless: options.preferLossless,
+        muted: options.renderMetadata.muted,
     });
     const encodingStop = Date.now();
     const outputSize = fs_1.default.statSync(outfile);

package/dist/functions/helpers/render-has-audio-video.js

@@ -6,10 +6,13 @@ const lambdaRenderHasAudioVideo = (renderMetadata) => {
     if (renderMetadata.type === 'still') {
         throw new Error('Cannot merge stills');
     }
+    const support = renderer_1.RenderInternals.codecSupportsMedia(renderMetadata.codec);
     const hasVideo = renderMetadata
         ? !renderer_1.RenderInternals.isAudioCodec(renderMetadata.codec)
         : false;
-    const hasAudio = renderMetadata ? !renderMetadata.muted : false;
+    const hasAudio = renderMetadata
+        ? !renderMetadata.muted && support.audio
+        : false;
     return {
         hasAudio,
         hasVideo,

package/dist/functions/launch.js

@@ -189,6 +189,7 @@ const innerLaunchHandler = async ({ functionName, params, options, onAllChunksAv
             colorSpace: params.colorSpace,
             preferLossless: params.preferLossless,
             compositionStart: realFrameRange[0],
+            framesPerLambda,
         };
         return payload;
     });

package/dist/functions/merge.js

@@ -23,9 +23,6 @@ const mergeHandler = async (params, options) => {
     if (!renderMetadata.codec) {
         throw new Error('expected codec');
     }
-    if (renderMetadata.type === 'still') {
-        throw new Error('Cannot merge stills');
-    }
     const { key, renderBucketName, customCredentials } = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, params.bucketName, typeof params.outName === 'string' || typeof params.outName === 'undefined'
         ? null
         : (_b = (_a = params.outName) === null || _a === void 0 ? void 0 : _a.s3OutputProvider) !== null && _b !== void 0 ? _b : null);

package/dist/functions/renderer.js

@@ -66,7 +66,7 @@ const renderHandler = async (params, options, logs) => {
         codec: params.codec,
         preferLossless: params.preferLossless,
     });
-    const seamlessAudio = (0, can_concat_seamlessly_1.canConcatAudioSeamlessly)(defaultAudioCodec);
+    const seamlessAudio = (0, can_concat_seamlessly_1.canConcatAudioSeamlessly)(defaultAudioCodec, params.framesPerLambda);
     const seamlessVideo = (0, can_concat_seamlessly_1.canConcatVideoSeamlessly)(params.codec);
     renderer_1.RenderInternals.Log.verbose({ indent: false, logLevel: params.logLevel }, `Preparing for rendering a chunk. Audio = ${seamlessAudio ? 'seamless' : 'normal'}, Video = ${seamlessVideo ? 'seamless' : 'normal'}`, params.logLevel);
     const chunkCodec = params.codec === 'gif'
@@ -82,11 +82,22 @@ const renderHandler = async (params, options, logs) => {
         ? renderer_1.RenderInternals.getExtensionFromAudioCodec(audioCodec)
         : null;
     const videoOutputLocation = node_path_1.default.join(outdir, `${chunk}.${videoExtension}`);
-    const audioOutputLocation = renderer_1.RenderInternals.isAudioCodec(params.codec)
+    const willRenderAudioEval = renderer_1.RenderInternals.getShouldRenderAudio({
+        assetsInfo: null,
+        codec: params.codec,
+        enforceAudioTrack: true,
+        muted: params.muted,
+    });
+    if (willRenderAudioEval === 'maybe') {
+        throw new Error('Cannot determine whether to render audio or not');
+    }
+    const audioOutputLocation = willRenderAudioEval === 'no'
         ? null
-        : audioExtension
-            ? node_path_1.default.join(outdir, `${chunk}.${audioExtension}`)
-            : null;
+        : renderer_1.RenderInternals.isAudioCodec(params.codec)
+            ? null
+            : audioExtension
+                ? node_path_1.default.join(outdir, `${chunk}.${audioExtension}`)
+                : null;
     const resolvedProps = await resolvedPropsPromise;
     const serializedInputPropsWithCustomSchema = await inputPropsPromise;
     await new Promise((resolve, reject) => {

package/dist/shared/constants.d.ts

@@ -263,6 +263,7 @@ export type LambdaPayloads = {
         deleteAfter: DeleteAfter | null;
         colorSpace: ColorSpace;
         compositionStart: number;
+        framesPerLambda: number;
     };
     still: {
         type: LambdaRoutines.still;
@@ -321,12 +322,14 @@ export type EncodingProgress = {
 type Discriminated = {
     type: 'still';
     imageFormat: StillImageFormat;
+    codec: null;
 } | {
     type: 'video';
     imageFormat: VideoImageFormat;
     muted: boolean;
     frameRange: [number, number];
     everyNthFrame: number;
+    codec: LambdaCodec;
 };
 export type RenderMetadata = Discriminated & {
     siteId: string;
@@ -336,7 +339,6 @@ export type RenderMetadata = Discriminated & {
     estimatedTotalLambdaInvokations: number;
     estimatedRenderLambdaInvokations: number;
     compositionId: string;
-    codec: LambdaCodec | null;
     audioCodec: AudioCodec | null;
     inputProps: SerializedInputProps;
     framesPerLambda: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/lambda",
-  "version": "4.0.132",
+  "version": "4.0.134",
   "description": "Distributed renderer for Remotion based on AWS Lambda",
   "main": "dist/index.js",
   "sideEffects": false,
@@ -26,10 +26,10 @@
     "aws-policies": "^1.0.1",
     "mime-types": "2.1.34",
     "zod": "3.22.3",
-    "@remotion/bundler": "4.0.132",
-    "@remotion/renderer": "4.0.132",
-    "@remotion/cli": "4.0.132",
-    "remotion": "4.0.132"
+    "@remotion/cli": "4.0.134",
+    "@remotion/bundler": "4.0.134",
+    "remotion": "4.0.134",
+    "@remotion/renderer": "4.0.134"
   },
   "devDependencies": {
     "@jonny/eslint-config": "3.0.276",
@@ -44,11 +44,11 @@
     "ts-node": "^10.8.0",
     "vitest": "0.31.1",
     "zip-lib": "^0.7.2",
-    "@remotion/bundler": "4.0.132",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.132"
+    "@remotion/bundler": "4.0.134",
+    "@remotion/compositor-linux-arm64-gnu": "4.0.134"
   },
   "peerDependencies": {
-    "@remotion/bundler": "4.0.132"
+    "@remotion/bundler": "4.0.134"
   },
   "publishConfig": {
     "access": "public"