From 90cb1b77da72948b2147811173543b51b8370db1 Mon Sep 17 00:00:00 2001 From: Willy-JL Date: Tue, 23 Aug 2022 19:33:58 +0200 Subject: [PATCH] Use frames for progress ratio --- src/createFFmpeg.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/createFFmpeg.js b/src/createFFmpeg.js index d4af6f9..c8ce1fd 100644 --- a/src/createFFmpeg.js +++ b/src/createFFmpeg.js @@ -25,6 +25,8 @@ module.exports = (_options = {}) => { let logging = optLog; let progress = optProgress; let duration = 0; + let frames = 0; + let readFrames = false; let ratio = 0; const detectCompletion = (message) => { @@ -53,11 +55,17 @@ module.exports = (_options = {}) => { prog({ duration: d, ratio }); if (duration === 0 || duration > d) { duration = d; + readFrames = true; } + } else if (readFrames && message.startsWith(' Stream')) { + const fps = parseFloat(message.match(/(\d+) fps/)[1]); + frames = duration * fps; + readFrames = false; } else if (message.startsWith('frame') || message.startsWith('size')) { const ts = message.split('time=')[1].split(' ')[0]; const t = ts2sec(ts); - ratio = t / duration; + const f = parseFloat(message.match(/frame=\s*(\d+)/)[1]); + ratio = Math.min(f / frames, 1); prog({ ratio, time: t }); } else if (message.startsWith('video:')) { prog({ ratio: 1 });