@remotion/renderer 4.0.346 → 4.0.348

package/dist/assets/download-map.d.ts

@@ -1,6 +1,7 @@
 import { OffthreadVideoServerEmitter } from '../offthread-video-server';
 import type { FrameAndAssets } from '../render-frames';
 import type { RenderMediaOnDownload } from './download-and-map-assets-to-file';
+import { type InlineAudioMixing } from './inline-audio-mixing';
 export type AudioChannelsAndDurationResultCache = {
     channels: number;
     duration: number | null;
@@ -37,6 +38,7 @@ export type DownloadMap = {
     preventCleanup: () => void;
     allowCleanup: () => void;
     isPreventedFromCleanup: () => boolean;
+    inlineAudioMixing: InlineAudioMixing;
 };
 export type RenderAssetInfo = {
     assets: FrameAndAssets[];
@@ -48,5 +50,6 @@ export type RenderAssetInfo = {
     trimRightOffset: number;
     forSeamlessAacConcatenation: boolean;
 };
+export declare const makeAndReturn: (dir: string, name: string) => string;
 export declare const makeDownloadMap: () => DownloadMap;
 export declare const cleanDownloadMap: (downloadMap: DownloadMap) => void;

package/dist/assets/download-map.js

@@ -3,18 +3,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cleanDownloadMap = exports.makeDownloadMap = void 0;
+exports.cleanDownloadMap = exports.makeDownloadMap = exports.makeAndReturn = void 0;
 const node_fs_1 = require("node:fs");
 const node_path_1 = __importDefault(require("node:path"));
 const version_1 = require("remotion/version");
 const delete_directory_1 = require("../delete-directory");
 const offthread_video_server_1 = require("../offthread-video-server");
 const tmp_dir_1 = require("../tmp-dir");
+const inline_audio_mixing_1 = require("./inline-audio-mixing");
 const makeAndReturn = (dir, name) => {
     const p = node_path_1.default.join(dir, name);
     (0, node_fs_1.mkdirSync)(p);
     return p;
 };
+exports.makeAndReturn = makeAndReturn;
 const makeDownloadMap = () => {
     const dir = (0, tmp_dir_1.tmpDir)(`remotion-v${version_1.VERSION}-assets`);
     let prevented = false;
@@ -26,13 +28,13 @@ const makeDownloadMap = () => {
         id: String(Math.random()),
         assetDir: dir,
         downloadListeners: [],
-        downloadDir: makeAndReturn(dir, 'remotion-assets-dir'),
-        complexFilter: makeAndReturn(dir, 'remotion-complex-filter'),
-        preEncode: makeAndReturn(dir, 'pre-encode'),
-        audioMixing: makeAndReturn(dir, 'remotion-audio-mixing'),
-        audioPreprocessing: makeAndReturn(dir, 'remotion-audio-preprocessing'),
-        stitchFrames: makeAndReturn(dir, 'remotion-stitch-temp-dir'),
-        compositingDir: makeAndReturn(dir, 'remotion-compositing-temp-dir'),
+        downloadDir: (0, exports.makeAndReturn)(dir, 'remotion-assets-dir'),
+        complexFilter: (0, exports.makeAndReturn)(dir, 'remotion-complex-filter'),
+        preEncode: (0, exports.makeAndReturn)(dir, 'pre-encode'),
+        audioMixing: (0, exports.makeAndReturn)(dir, 'remotion-audio-mixing'),
+        audioPreprocessing: (0, exports.makeAndReturn)(dir, 'remotion-audio-preprocessing'),
+        stitchFrames: (0, exports.makeAndReturn)(dir, 'remotion-stitch-temp-dir'),
+        compositingDir: (0, exports.makeAndReturn)(dir, 'remotion-compositing-temp-dir'),
         emitter: new offthread_video_server_1.OffthreadVideoServerEmitter(),
         preventCleanup: () => {
             prevented = true;
@@ -43,6 +45,7 @@ const makeDownloadMap = () => {
         isPreventedFromCleanup: () => {
             return prevented;
         },
+        inlineAudioMixing: (0, inline_audio_mixing_1.makeInlineAudioMixing)(dir),
     };
 };
 exports.makeDownloadMap = makeDownloadMap;
@@ -53,6 +56,7 @@ const cleanDownloadMap = (downloadMap) => {
     (0, delete_directory_1.deleteDirectory)(downloadMap.downloadDir);
     (0, delete_directory_1.deleteDirectory)(downloadMap.complexFilter);
     (0, delete_directory_1.deleteDirectory)(downloadMap.compositingDir);
+    downloadMap.inlineAudioMixing.cleanup();
     // Assets dir must be last since the others are contained
     (0, delete_directory_1.deleteDirectory)(downloadMap.assetDir);
 };

package/dist/assets/inline-audio-mixing.d.ts

@@ -1,7 +1,14 @@
 import type { InlineAudioAsset } from 'remotion/no-react';
 export declare const makeInlineAudioMixing: (dir: string) => {
     cleanup: () => void;
-    addAsset: (asset: InlineAudioAsset, fps: number, totalNumberOfFrames: number) => void;
-    folder: string;
+    addAsset: ({ asset, fps, totalNumberOfFrames, firstFrame, trimLeftOffset, trimRightOffset, }: {
+        asset: InlineAudioAsset;
+        fps: number;
+        totalNumberOfFrames: number;
+        firstFrame: number;
+        trimLeftOffset: number;
+        trimRightOffset: number;
+    }) => void;
+    getListOfAssets: () => string[];
 };
 export type InlineAudioMixing = ReturnType<typeof makeInlineAudioMixing>;

package/dist/assets/inline-audio-mixing.js

@@ -59,25 +59,38 @@ const makeInlineAudioMixing = (dir) => {
     const folderToAdd = (0, download_map_1.makeAndReturn)(dir, 'remotion-inline-audio-mixing');
     // asset id -> file descriptor
     const openFiles = {};
+    const writtenHeaders = {};
     const cleanup = () => {
         for (const fd of Object.values(openFiles)) {
-            node_fs_1.default.closeSync(fd);
+            try {
+                node_fs_1.default.closeSync(fd);
+            }
+            catch (_a) { }
         }
         (0, delete_directory_1.deleteDirectory)(folderToAdd);
     };
-    const ensureAsset = (asset, fps, totalNumberOfFrames) => {
-        const filePath = node_path_1.default.join(folderToAdd, `${asset.id}.wav`);
-        if (!openFiles[asset.id]) {
-            openFiles[asset.id] = node_fs_1.default.openSync(filePath, 'w');
+    const getListOfAssets = () => {
+        return Object.keys(openFiles);
+    };
+    const getFilePath = (asset) => {
+        return node_path_1.default.join(folderToAdd, `${asset.id}.wav`);
+    };
+    const ensureAsset = ({ asset, fps, totalNumberOfFrames, trimLeftOffset, trimRightOffset, }) => {
+        const filePath = getFilePath(asset);
+        if (!openFiles[filePath]) {
+            openFiles[filePath] = node_fs_1.default.openSync(filePath, 'w');
+        }
+        if (writtenHeaders[filePath]) {
+            return;
         }
-        const expectedDataSize = Math.round((totalNumberOfFrames / fps) *
+        writtenHeaders[filePath] = true;
+        const expectedDataSize = Math.round((totalNumberOfFrames / fps - trimLeftOffset + trimRightOffset) *
             asset.numberOfChannels *
             sample_rate_1.DEFAULT_SAMPLE_RATE *
             BYTES_PER_SAMPLE);
-        console.log({ totalNumberOfFrames, fps });
         const expectedSize = 40 + expectedDataSize;
         const { numberOfChannels } = asset;
-        const fd = openFiles[asset.id];
+        const fd = openFiles[filePath];
         (0, node_fs_1.writeSync)(fd, new Uint8Array([0x52, 0x49, 0x46, 0x46]), 0, 4, 0); // "RIFF"
         (0, node_fs_1.writeSync)(fd, new Uint8Array(numberTo32BiIntLittleEndian(expectedSize)), 0, 4, 4); // Remaining size
         (0, node_fs_1.writeSync)(fd, new Uint8Array([0x57, 0x41, 0x56, 0x45]), 0, 4, 8); // "WAVE"
@@ -92,34 +105,56 @@ const makeInlineAudioMixing = (dir) => {
         (0, node_fs_1.writeSync)(fd, new Uint8Array([0x64, 0x61, 0x74, 0x61]), 0, 4, 36); // "data"
         (0, node_fs_1.writeSync)(fd, new Uint8Array(numberTo32BiIntLittleEndian(expectedDataSize)), 0, 4, 40); // Remaining size
     };
-    const addAsset = (asset, fps, totalNumberOfFrames) => {
-        ensureAsset(asset, fps, totalNumberOfFrames);
-        const fileDescriptor = openFiles[asset.id];
-        const arr = new Int16Array(asset.audio);
+    const addAsset = ({ asset, fps, totalNumberOfFrames, firstFrame, trimLeftOffset, trimRightOffset, }) => {
+        ensureAsset({
+            asset,
+            fps,
+            totalNumberOfFrames,
+            trimLeftOffset,
+            trimRightOffset,
+        });
+        const filePath = getFilePath(asset);
+        const fileDescriptor = openFiles[filePath];
+        let arr = new Int16Array(asset.audio);
+        const isFirst = asset.frame === firstFrame;
+        const isLast = asset.frame === totalNumberOfFrames + firstFrame - 1;
+        const samplesToShaveFromStart = trimLeftOffset * sample_rate_1.DEFAULT_SAMPLE_RATE;
+        const samplesToShaveFromEnd = trimRightOffset * sample_rate_1.DEFAULT_SAMPLE_RATE;
+        if (Math.abs(Math.round(samplesToShaveFromEnd) - samplesToShaveFromEnd) >
+            0.00000001) {
+            throw new Error('samplesToShaveFromEnd should be approximately an integer');
+        }
+        if (Math.abs(Math.round(samplesToShaveFromStart) - samplesToShaveFromStart) >
+            0.00000001) {
+            throw new Error('samplesToShaveFromStart should be approximately an integer');
+        }
+        if (isFirst) {
+            arr = arr.slice(Math.round(samplesToShaveFromStart) * asset.numberOfChannels);
+        }
+        if (isLast) {
+            arr = arr.slice(0, arr.length + Math.round(samplesToShaveFromEnd) * asset.numberOfChannels);
+        }
+        const positionInSeconds = (asset.frame - firstFrame) / fps - (isFirst ? 0 : trimLeftOffset);
+        const position = Math.round(positionInSeconds *
+            asset.numberOfChannels *
+            sample_rate_1.DEFAULT_SAMPLE_RATE *
+            BYTES_PER_SAMPLE);
         (0, node_fs_1.writeSync)(
         // fs
         fileDescriptor, 
         // data
         arr, 
-        // offset of dats
+        // offset of data
         0, 
         // length
         arr.byteLength, 
         // position
-        44 +
-            Math.round((asset.frame / fps) *
-                asset.numberOfChannels *
-                sample_rate_1.DEFAULT_SAMPLE_RATE *
-                BYTES_PER_SAMPLE));
-        console.log('wrote', arr.byteLength, 'bytes to', node_path_1.default.join(folderToAdd, `${asset.id}.wav`), Math.round((asset.frame / fps) *
-            asset.numberOfChannels *
-            sample_rate_1.DEFAULT_SAMPLE_RATE *
-            BYTES_PER_SAMPLE));
+        44 + position);
     };
     return {
         cleanup,
         addAsset,
-        folder: folderToAdd,
+        getListOfAssets,
     };
 };
 exports.makeInlineAudioMixing = makeInlineAudioMixing;

package/dist/collect-assets.d.ts

@@ -4,4 +4,4 @@ export declare const collectAssets: ({ frame, freePage, timeoutInMilliseconds, }
     frame: number;
     freePage: Page;
     timeoutInMilliseconds: number;
-}) => Promise<(import("remotion/no-react").AudioOrVideoAsset | ArtifactAsset)[]>;
+}) => Promise<(import("remotion/no-react").InlineAudioAsset | import("remotion/no-react").AudioOrVideoAsset | ArtifactAsset)[]>;

package/dist/create-audio.js

@@ -64,7 +64,18 @@ const createAudio = async ({ assets, onDownload, fps, logLevel, onProgress, down
         updateProgress();
         return result;
     }));
-    const preprocessed = audioTracks.filter(truthy_1.truthy);
+    const inlinedAudio = downloadMap.inlineAudioMixing.getListOfAssets();
+    const preprocessed = [
+        ...audioTracks.filter(truthy_1.truthy),
+        ...inlinedAudio.map((asset) => ({
+            outName: asset,
+            filter: {
+                filter: null,
+                pad_start: null,
+                pad_end: null,
+            },
+        })),
+    ];
     const merged = path_1.default.join(downloadMap.audioPreprocessing, 'merged.wav');
     const extension = (0, audio_codec_1.getExtensionFromAudioCodec)(audioCodec);
     const outName = path_1.default.join(downloadMap.audioPreprocessing, `audio.${extension}`);