ffmpeg-progress 1.2.0 → 1.2.2

package/core.d.ts

@@ -18,6 +18,7 @@ export type ScanVideoResult = {
     /** @description e.g. "4032x3024" */
     resolution: string;
 };
+export declare function parseVideoMetadata(stdout: string): ScanVideoResult;
 export declare function scanVideo(file: string): Promise<ScanVideoResult>;
 export type ProgressArgs = {
     onData?: (chunk: Buffer) => void;

package/core.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseToSeconds = parseToSeconds;
 exports.secondsToString = secondsToString;
+exports.parseVideoMetadata = parseVideoMetadata;
 exports.scanVideo = scanVideo;
 exports.convertFile = convertFile;
 exports.attachChildProcess = attachChildProcess;
@@ -31,36 +32,69 @@ function secondsToString(seconds) {
     let h = Math.floor(seconds / 3600);
     let m = Math.floor((seconds % 3600) / 60);
     let s = Math.floor(seconds % 60);
-    let ms = (seconds * 1000) % 1000;
-    return ms < 100
-        ? `${d2(h)}:${d2(m)}:${d2(s)}.${d2(ms / 10)}`
-        : `${d2(h)}:${d2(m)}:${d2(s)}.${ms}`;
+    // handle precision edge case, e.g. 60.1234 % 1 = 0.12339999999999662
+    let ms;
+    let str = seconds.toString();
+    if (str.includes('.')) {
+        ms = str.split('.')[1];
+    }
+    else {
+        ms = '';
+    }
+    if (!ms) {
+        return `${d2(h)}:${d2(m)}:${d2(s)}`;
+    }
+    return `${d2(h)}:${d2(m)}:${d2(s)}.${ms}`;
 }
 function d2(x) {
     if (x < 10)
         return '0' + x;
     return x;
 }
+function format_ms(ms) {
+    // round 0.123.39999999999418 to 0.123
+    let seconds = ms / 1000;
+    let str = seconds.toFixed(3);
+    seconds = +str;
+    ms = seconds * 1000;
+    if (ms < 10)
+        return '00' + ms;
+    if (ms < 100)
+        return '0' + ms;
+    return ms;
+}
+// e.g. "  Duration: 00:03:00.03, start: 0.000000, bitrate: 2234 kb/s"
+// e.g. "  Duration: N/A, start: 0.000000, bitrate: N/A"
+let duration_regex = /Duration: ([0-9:.]+|N\/A),/;
+// 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)"
+// e.g. "  Stream #0:0: Audio: mp3 (mp3float), 44100 Hz, stereo, fltp, 128 kb/s"
+// e.g. "  Stream #0:1: Video: flv1 (flv), yuv420p, 1080x1920, 200 kb/s, 60 fps, 60 tbr, 1k tbn"
+let resolution_regex = /Stream #0:\d[\w\[\]\(\)]*: Video: .+ (\d+x\d+)[\s|,]/;
+function parseVideoMetadata(stdout) {
+    let lines = stdout
+        .split('\n')
+        .map(line => line.trim())
+        .filter(line => line.length > 0);
+    let match = stdout.match(duration_regex);
+    if (!match) {
+        throw new Error('failed to find video duration');
+    }
+    let duration = match[1];
+    let seconds = parseToSeconds(duration);
+    let line = lines.find(line => resolution_regex.test(line));
+    match = line?.match(resolution_regex);
+    if (!match) {
+        throw new Error('failed to find video resolution');
+    }
+    let resolution = match[1];
+    return { duration, seconds, resolution };
+}
 function scanVideo(file) {
     return new Promise((resolve, reject) => {
         (0, child_process_1.exec)(`ffmpeg -i ${JSON.stringify(file)} 2>&1`, (err, stdout, stderr) => {
             try {
-                // e.g. "  Duration: 00:03:00.03, start: 0.000000, bitrate: 2234 kb/s"
-                // e.g. "  Duration: N/A, start: 0.000000, bitrate: N/A"
-                let match = stdout.match(/Duration: ([0-9:.]+|N\/A),/);
-                if (!match) {
-                    throw new Error('failed to find video duration');
-                }
-                let duration = match[1];
-                let seconds = parseToSeconds(duration);
-                // 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 });
+                resolve(parseVideoMetadata(stdout));
             }
             catch (e) {
                 let error = e instanceof Error ? e : new Error(String(e));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ffmpeg-progress",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Extract progress from ffmpeg child_process",
   "keywords": [
     "ffmpeg",
@@ -37,7 +37,7 @@
     "core.js"
   ],
   "scripts": {
-    "mocha": "ts-mocha *.test.ts",
+    "mocha": "rm -f *.js && ts-mocha \"*.{test,spec}.ts\"",
     "test": "npm run mocha && tsc --noEmit",
     "build": "tsc -p ."
   },
@@ -47,7 +47,7 @@
     "@types/mocha": "^10.0.10",
     "@types/node": "^22.9.0",
     "chai": "^4.5.0",
-    "mocha": "^11.0.1",
+    "mocha": "^10.8.2",
     "ts-mocha": "^10.0.0",
     "ts-node": "^10.9.2",
     "ts-node-dev": "^2.0.0",