@marcuth/movie.js 0.1.2 → 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";
@@ -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 clip_1 = require("./clip");
 const easing_expr_1 = require("../utils/easing-expr");
+const clip_1 = require("./clip");
 class ImageClip extends clip_1.Clip {
     constructor({ duration, path, width, height, fadeIn, fadeOut, scroll }) {
         super();
@@ -31,11 +32,17 @@ class ImageClip extends clip_1.Clip {
             ]
         };
     }
-    build(data, context) {
+    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);
@@ -54,9 +61,12 @@ class ImageClip extends clip_1.Clip {
         const hasCanvas = this.width !== -1 || this.height !== -1;
         if (hasCanvas && this.scroll) {
             const scaleOutput = `scale${context.inputIndex}`;
-            const { axis = "auto" } = this.scroll;
+            let { axis = "auto" } = this.scroll;
             let scaleOptions = null;
-            if (axis === "y" || axis === "auto") {
+            if (axis === "auto") {
+                axis = metadata.format.width > metadata.format.height ? "x" : "y";
+            }
+            if (axis === "y") {
                 scaleOptions = {
                     w: this.width,
                     h: -1,
@@ -69,7 +79,7 @@ class ImageClip extends clip_1.Clip {
                 };
             }
             if (!scaleOptions) {
-                throw new Error("Invalid scale options");
+                throw new Error("Invalid scroll axis");
             }
             context.filters.push({
                 filter: "scale",
@@ -77,7 +87,14 @@ class ImageClip extends clip_1.Clip {
                 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;
         }
         else if (hasCanvas && !this.scroll) {
             const scaleOutput = `scale${context.inputIndex}`;

package/dist/template.js

@@ -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.js

@@ -4,13 +4,13 @@ exports.easingExpr = easingExpr;
 function easingExpr(easing, t) {
     switch (easing) {
         case "linear":
-            return `(${t})`; // Adicionar parênteses para garantir que a expressão seja avaliada
+            return `(${t})`;
         case "easeIn":
             return `pow(${t},2)`;
         case "easeOut":
-            return `1-pow(1-(${t}),2)`; // Adicionar parênteses extras
+            return `1-pow(1-(${t}),2)`;
         case "easeInOut":
-            return `if(lt(${t},0.5),2*pow(${t},2),1-2*pow(1-(${t}),2))`; // Adicionar parênteses extras
+            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.2",
+  "version": "0.1.3",
   "description": "Video template builder",
   "main": "./dist/index.js",
   "module": "./dist/index.js",