From 7f1907c749e62269cc677d94dc84b568212df720 Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Sat, 25 Apr 2020 16:36:07 +0800 Subject: [PATCH] make fast flag override --- index.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/index.js b/index.js index 7fa2d5d..e071f6e 100644 --- a/index.js +++ b/index.js @@ -194,8 +194,9 @@ module.exports = async (config = {}) => { let height; let desiredWidth; - if (requestedWidth) desiredWidth = requestedWidth; - else if (fast) desiredWidth = 320; + + if (fast) desiredWidth = 320; + else if (requestedWidth) desiredWidth = requestedWidth; else if (isGif) desiredWidth = 320; else desiredWidth = 640; @@ -210,7 +211,7 @@ module.exports = async (config = {}) => { } // User override? - if (requestedWidth && requestedHeight) { + if (!fast && requestedWidth && requestedHeight) { width = requestedWidth; height = requestedHeight; } @@ -221,12 +222,12 @@ module.exports = async (config = {}) => { let fps; let framerateStr; - if (requestedFps && typeof requestedFps === 'number') { - fps = requestedFps; - framerateStr = String(requestedFps); - } else if (fast) { + if (fast) { fps = 15; framerateStr = String(fps); + } else if (requestedFps && typeof requestedFps === 'number') { + fps = requestedFps; + framerateStr = String(requestedFps); } else if (isGif) { fps = 10; framerateStr = String(fps);