From 58a9802392d94e31cf14125c9af7e38082dc885c Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Sun, 17 May 2020 20:54:36 +0800 Subject: [PATCH] improve onProgress --- src/ffmpeg.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/ffmpeg.js b/src/ffmpeg.js index 2d1c11f6..545e4fb2 100644 --- a/src/ffmpeg.js +++ b/src/ffmpeg.js @@ -85,10 +85,11 @@ function handleProgress(process, cutDuration, onProgress) { if (!match) return; const str = match[1]; - console.log(str); - const progressTime = moment.duration(str).asSeconds(); - console.log(progressTime); - onProgress(progressTime / cutDuration); + // console.log(str); + const progressTime = Math.max(0, moment.duration(str).asSeconds()); + // console.log(progressTime); + const progress = cutDuration ? progressTime / cutDuration : 0; + onProgress(progress); } catch (err) { console.log('Failed to parse ffmpeg progress line', err); } @@ -238,6 +239,8 @@ async function cut({ const ffmpegArgs = [ '-hide_banner', + // No progress if we set loglevel warning :( + // '-loglevel', 'warning', ...inputCutArgs, @@ -448,6 +451,8 @@ export async function mergeFiles({ paths, outPath, allStreams, outFormat, ffmpeg // Keep this similar to cut() const ffmpegArgs = [ '-hide_banner', + // No progress if we set loglevel warning :( + // '-loglevel', 'warning', // https://blog.yo1.dog/fix-for-ffmpeg-protocol-not-on-whitelist-error-for-urls/ '-f', 'concat', '-safe', '0', '-protocol_whitelist', 'file,pipe', '-i', '-',