ffmpeg-progress 1.0.2 → 1.1.1

package/README.md

@@ -52,8 +52,12 @@ export function parseToSeconds(str: string): number
 export function scanVideo(file: string): Promise<ScanVideoResult>
 
 export type ScanVideoResult = {
+  /** @description e.g. "00:03:00.03" */
   duration: string
+  /** @description e.g. 180.03 */
   seconds: number
+  /** @description e.g. "4032x3024" */
+  resolution: string
 }
 
 export type ProgressArgs = {

package/core.d.ts

@@ -1,8 +1,12 @@
 import { ChildProcessWithoutNullStreams } from 'child_process';
 export declare function parseToSeconds(str: string): number;
 export type ScanVideoResult = {
+    /** @description e.g. "00:03:00.03" */
     duration: string;
+    /** @description e.g. 180.03 */
     seconds: number;
+    /** @description e.g. "4032x3024" */
+    resolution: string;
 };
 export declare function scanVideo(file: string): Promise<ScanVideoResult>;
 export type ProgressArgs = {

package/core.js

@@ -16,17 +16,31 @@ function parseToSeconds(str) {
 function scanVideo(file) {
     return new Promise((resolve, reject) => {
         (0, child_process_1.exec)(`ffmpeg -i ${JSON.stringify(file)} 2>&1`, (err, stdout, stderr) => {
-            let match = stdout.match(/Duration: ([0-9:.]+),/);
-            if (match) {
+            try {
+                // e.g. "  Duration: 00:03:00.03, start: 0.000000, bitrate: 2234 kb/s"
+                let match = stdout.match(/Duration: ([0-9:.]+),/);
+                if (!match) {
+                    throw new Error('failed to find video duration');
+                }
                 let duration = match[1];
                 let seconds = parseToSeconds(duration);
-                resolve({ duration, seconds });
-                return;
+                // e.g. "  Stream #0:0[0x1](und): Video: h264 (Baseline) (avc1 / 0x31637661), yuvj420p(pc, progressive), 4032x3024, 2045 kb/s, 29.73 fps, 600 tbr, 600 tbn (default)"
+                // e.g. "  Stream #0:0[0x1](eng): Video: h264 (High) (avc1 / 0x31637661), yuv420p(tv, bt470bg/unknown/unknown, progressive), 1920x1080 [SAR 1:1 DAR 16:9], 3958 kb/s, 29.49 fps, 29.83 tbr, 11456 tbn (default)"
+                match = stdout.match(/Stream #0:\d.+: Video: .+ (\d+x\d+)[\s|,]/);
+                if (!match) {
+                    throw new Error('failed to find video resolution');
+                }
+                let resolution = match[1];
+                resolve({ duration, seconds, resolution });
+            }
+            catch (e) {
+                let error = e instanceof Error ? e : new Error(String(e));
+                if (err) {
+                    error.cause = err;
+                }
+                Object.assign(error, { stdout });
+                reject(error);
             }
-            let error = new Error('failed to find video duration');
-            error.cause = err;
-            Object.assign(error, { stdout });
-            reject(error);
         });
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ffmpeg-progress",
-  "version": "1.0.2",
+  "version": "1.1.1",
   "description": "Extract progress from ffmpeg child_process",
   "keywords": [
     "ffmpeg",