@marcuth/movie.js 0.1.1 → 0.1.3

package/dist/clips/image-clip.d.ts

@@ -1,3 +1,4 @@
+import ffmpeg from "fluent-ffmpeg";
 import { Path } from "../utils/resolve-path";
 import { RenderContext } from "../render-context";
 import { FFmpegInput } from "../ffmpeg-input";
@@ -20,8 +21,8 @@ export declare class ImageClip<RenderData> extends Clip<RenderData> {
     readonly path: Path<RenderData>;
     readonly fadeIn?: number;
     readonly fadeOut?: number;
-    readonly width?: number;
-    readonly height?: number;
+    readonly width: number;
+    readonly height: number;
     readonly scroll?: {
         axis?: "auto" | "x" | "y";
         direction?: "forward" | "backward";
@@ -29,5 +30,6 @@ export declare class ImageClip<RenderData> extends Clip<RenderData> {
     };
     constructor({ duration, path, width, height, fadeIn, fadeOut, scroll }: ImageClipOptions<RenderData>);
     protected getInput(path: string, inputIndex: number, fps: number): FFmpegInput;
-    build(data: RenderData, context: RenderContext): void;
+    protected getMetadata(path: string): Promise<ffmpeg.FfprobeData>;
+    build(data: RenderData, context: RenderContext): Promise<void>;
 }

package/dist/clips/image-clip.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ImageClip = void 0;
+const fluent_ffmpeg_1 = require("fluent-ffmpeg");
 const resolve_path_1 = require("../utils/resolve-path");
+const easing_expr_1 = require("../utils/easing-expr");
 const clip_1 = require("./clip");
-const get_eased_expression_1 = require("../utils/get-eased-expression");
 class ImageClip extends clip_1.Clip {
     constructor({ duration, path, width, height, fadeIn, fadeOut, scroll }) {
         super();
@@ -11,8 +12,8 @@ class ImageClip extends clip_1.Clip {
         this.path = path;
         this.fadeIn = fadeIn;
         this.fadeOut = fadeOut;
-        this.width = width;
-        this.height = height;
+        this.width = width || -1;
+        this.height = height || -1;
         this.scroll = scroll;
     }
     getInput(path, inputIndex, fps) {
@@ -31,12 +32,17 @@ class ImageClip extends clip_1.Clip {
             ]
         };
     }
-    build(data, context) {
-        var _a, _b, _c, _d, _e;
+    getMetadata(path) {
+        return new Promise((resolve, reject) => {
+            (0, fluent_ffmpeg_1.ffprobe)(path, (err, data) => err ? reject(err) : resolve(data));
+        });
+    }
+    async build(data, context) {
         const path = (0, resolve_path_1.resolvePath)({ path: this.path, data: data, index: context.clipIndex });
         const input = this.getInput(path, context.inputIndex, context.fps);
         let currentVideoOutput = input.aliases.video;
         const currentAudioOutput = input.aliases.audio;
+        const metadata = await this.getMetadata(path);
         context.command
             .input(input.path)
             .inputOptions(input.options);
@@ -52,37 +58,101 @@ class ImageClip extends clip_1.Clip {
             inputs: anullSrcLabel,
             outputs: currentAudioOutput,
         });
-        if (this.width !== undefined || this.height !== undefined) {
+        const hasCanvas = this.width !== -1 || this.height !== -1;
+        if (hasCanvas && this.scroll) {
             const scaleOutput = `scale${context.inputIndex}`;
+            let { axis = "auto" } = this.scroll;
+            let scaleOptions = null;
+            if (axis === "auto") {
+                axis = metadata.format.width > metadata.format.height ? "x" : "y";
+            }
+            if (axis === "y") {
+                scaleOptions = {
+                    w: this.width,
+                    h: -1,
+                };
+            }
+            else if (axis === "x") {
+                scaleOptions = {
+                    w: -1,
+                    h: this.height,
+                };
+            }
+            if (!scaleOptions) {
+                throw new Error("Invalid scroll axis");
+            }
             context.filters.push({
                 filter: "scale",
-                options: { w: (_a = this.width) !== null && _a !== void 0 ? _a : -1, h: (_b = this.height) !== null && _b !== void 0 ? _b : -1 },
+                options: scaleOptions,
                 inputs: currentVideoOutput,
                 outputs: scaleOutput,
             });
-            currentVideoOutput = scaleOutput;
+            const setsarOutput = `setsar${context.inputIndex}`;
+            context.filters.push({
+                filter: "setsar",
+                options: { sar: "1/1" },
+                inputs: scaleOutput,
+                outputs: setsarOutput,
+            });
+            currentVideoOutput = setsarOutput;
         }
-        if (this.scroll) {
-            const cropOutput = `crop${context.inputIndex}`;
-            const easing = (_c = this.scroll.easing) !== null && _c !== void 0 ? _c : "linear";
-            const totalFrames = this.duration * context.fps;
-            const p = (0, get_eased_expression_1.getEasedExpression)(`min(n/${totalFrames},1)`, easing);
-            const xExpr = this.scroll.axis === "x" && this.width
-                ? `if(gt(iw,${this.width}),min((iw-${this.width})*(${p}),iw-${this.width}),0)`
-                : "0";
-            const yExpr = this.scroll.axis === "y" && this.height
-                ? `if(gt(ih,${this.height}),min((ih-${this.height})*(${p}),ih-${this.height}),0)`
-                : "0";
+        else if (hasCanvas && !this.scroll) {
+            const scaleOutput = `scale${context.inputIndex}`;
+            context.filters.push({
+                filter: "scale",
+                options: {
+                    w: this.width,
+                    h: this.height,
+                    force_original_aspect_ratio: "increase",
+                },
+                inputs: currentVideoOutput,
+                outputs: scaleOutput,
+            });
+            const fitOutput = `fit${context.inputIndex}`;
             context.filters.push({
                 filter: "crop",
                 options: {
-                    w: (_d = this.width) !== null && _d !== void 0 ? _d : "iw",
-                    h: (_e = this.height) !== null && _e !== void 0 ? _e : "ih",
-                    x: xExpr,
-                    y: yExpr
+                    w: this.width,
+                    h: this.height,
+                    x: "(iw-ow)/2",
+                    y: "(ih-oh)/2",
                 },
+                inputs: scaleOutput,
+                outputs: fitOutput,
+            });
+            currentVideoOutput = fitOutput;
+        }
+        if (this.scroll) {
+            const { axis = "auto", direction = "forward", easing = "linear", } = this.scroll;
+            const cropOutput = `scroll${context.inputIndex}`;
+            const tNorm = `t/${this.duration}`;
+            const eased = (0, easing_expr_1.easingExpr)(easing, tNorm);
+            const movement = direction === "backward" ? `1-(${eased})` : eased;
+            let cropOptions = null;
+            if (axis === "y" || axis === "auto") {
+                cropOptions = {
+                    w: this.width,
+                    h: this.height,
+                    x: 0,
+                    y: `(ih-oh)*(${movement})`,
+                };
+            }
+            if (axis === "x") {
+                cropOptions = {
+                    w: this.width,
+                    h: this.height,
+                    x: `(iw-ow)*(${movement})`,
+                    y: 0,
+                };
+            }
+            if (!cropOptions) {
+                throw new Error("Invalid crop options");
+            }
+            context.filters.push({
+                filter: "crop",
+                options: cropOptions,
                 inputs: currentVideoOutput,
-                outputs: cropOutput
+                outputs: cropOutput,
             });
             currentVideoOutput = cropOutput;
         }

package/dist/template.js

@@ -26,16 +26,16 @@ class Template {
                 video: []
             },
         };
-        // if (this.options.debug) {
-        //     command
-        //         .on("start", (commandLine) => {
-        //             console.log("Spawned Ffmpeg with command: " + commandLine)
-        //         })
-        //         .on("error", (err, stdout, stderr) => {
-        //             console.error("Error: " + err.message)
-        //             console.error("ffmpeg stderr: " + stderr)
-        //         })
-        // }
+        if (this.options.debug) {
+            command
+                .on("start", (commandLine) => {
+                console.log("Spawned Ffmpeg with command: " + commandLine);
+            })
+                .on("error", (err, stdout, stderr) => {
+                console.error("Error: " + err.message);
+                console.error("ffmpeg stderr: " + stderr);
+            });
+        }
         await this.runBuildWithProgress(data, context);
         const concatFilter = context.labels.video
             .map((v, i) => `${v}${context.labels.structuralAudio[i]}`)
@@ -53,18 +53,6 @@ class Template {
             mixFilter,
             finalAudioFilter
         ].filter((filter) => filter !== null);
-        // console.dir({
-        //     concatFilter,
-        //     finalAudioFilter,
-        //     mixFilter,
-        //     filterComplex,
-        //     context: {
-        //         ...context,
-        //         command: "<command>"
-        //     }
-        // }, {
-        //     depth: null
-        // })
         command.complexFilter(filterComplex);
         command.outputOptions([
             "-map [outv]",

package/dist/utils/easing-expr.d.ts

@@ -0,0 +1 @@
+export declare function easingExpr(easing: "linear" | "easeIn" | "easeOut" | "easeInOut", t: string): string;

package/dist/utils/easing-expr.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.easingExpr = easingExpr;
+function easingExpr(easing, t) {
+    switch (easing) {
+        case "linear":
+            return `(${t})`;
+        case "easeIn":
+            return `pow(${t},2)`;
+        case "easeOut":
+            return `1-pow(1-(${t}),2)`;
+        case "easeInOut":
+            return `if(lt(${t},0.5),2*pow(${t},2),1-2*pow(1-(${t}),2))`;
+        default:
+            return `(${t})`;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marcuth/movie.js",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Video template builder",
   "main": "./dist/index.js",
   "module": "./dist/index.js",

package/dist/utils/font-config.d.ts

@@ -1,9 +0,0 @@
-export type FontConfigOptions = {
-    color?: string;
-    filePath?: string;
-};
-export type PartialFontOptions = {
-    size: number;
-    color?: string;
-};
-export declare function fontConfig(options: FontConfigOptions): (partialOptions: PartialFontOptions) => TextClipFontOptions;

package/dist/utils/font-config.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fontConfig = fontConfig;
-function fontConfig(options) {
-    return (partialOptions) => {
-        var _a;
-        const color = (_a = options.color) !== null && _a !== void 0 ? _a : partialOptions.color;
-        const filePath = options.filePath;
-        const size = partialOptions.size;
-        if (!color) {
-            throw new Error("Font color is required");
-        }
-        return {
-            size: size,
-            color: color,
-            filePath: filePath,
-        };
-    };
-}

package/dist/utils/get-eased-expression.d.ts

@@ -1 +0,0 @@
-export declare function getEasedExpression(expr: string, easing: "linear" | "easeIn" | "easeOut" | "easeInOut"): string;

package/dist/utils/get-eased-expression.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEasedExpression = getEasedExpression;
-function getEasedExpression(expr, easing) {
-    switch (easing) {
-        case "easeIn":
-            return `${expr}*${expr}`;
-        case "easeOut":
-            return `1-(1-${expr})*(1-${expr})`;
-        case "easeInOut":
-            return `(1-cos(PI*${expr}))/2`;
-        default:
-            return expr;
-    }
-}

package/dist/utils/index.d.ts

@@ -1 +0,0 @@
-export * from "./font-config";

package/dist/utils/index.js

@@ -1,17 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./font-config"), exports);