From dbb58053ed6ee59c9e5faf6102751cb8454cb64e Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Wed, 19 Feb 2020 12:56:30 +0800 Subject: [PATCH] use correct extension for format --- src/ffmpeg.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ffmpeg.js b/src/ffmpeg.js index 5991de4f..3e182b6f 100644 --- a/src/ffmpeg.js +++ b/src/ffmpeg.js @@ -71,6 +71,15 @@ function isCuttingEnd(cutTo, duration) { return cutTo < duration; } +function getExtensionForFormat(format) { + const ext = { + matroska: 'mkv', + ipod: 'm4a', + }[format]; + + return ext || format; +} + async function cut({ filePath, outFormat, cutFrom, cutTo, videoDuration, rotation, onProgress, copyStreamIds, keyframeCut, outPath, @@ -146,7 +155,7 @@ async function cutMultiple({ let i = 0; // eslint-disable-next-line no-restricted-syntax,no-unused-vars for (const { cutFrom, cutTo } of segments) { - const ext = isOutFormatUserSelected ? `.${outFormat}` : extname(filePath); + const ext = isOutFormatUserSelected ? `.${getExtensionForFormat(outFormat)}` : extname(filePath); const cutSpecification = `${formatDuration({ seconds: cutFrom, fileNameFriendly: true })}-${formatDuration({ seconds: cutTo, fileNameFriendly: true })}`; const outPath = getOutPath(customOutDir, filePath, `${cutSpecification}${ext}`); @@ -292,15 +301,6 @@ function mapFormat(requestedFormat) { } } -function getExtensionForFormat(format) { - const ext = { - matroska: 'mkv', - ipod: 'm4a', - }[format]; - - return ext || format; -} - function determineOutputFormat(ffprobeFormats, ft) { if (ffprobeFormats.includes(ft.ext)) return ft.ext; return ffprobeFormats[0] || undefined;