From c398540992e0add04a9ecbba04a29971f5b0b0ed Mon Sep 17 00:00:00 2001 From: Jerome Wu Date: Tue, 3 Nov 2020 17:41:42 +0800 Subject: [PATCH] Remove `v` in version and add locateFile func to fix worker script issue --- src/browser/defaultOptions.js | 2 +- src/createFFmpeg.js | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/browser/defaultOptions.js b/src/browser/defaultOptions.js index 3f2f980..f1a9d07 100644 --- a/src/browser/defaultOptions.js +++ b/src/browser/defaultOptions.js @@ -7,5 +7,5 @@ const { devDependencies } = require('../../package.json'); module.exports = { corePath: (typeof process !== 'undefined' && process.env.FFMPEG_ENV === 'development') ? resolveURL('/node_modules/@ffmpeg/core/dist/ffmpeg-core.js') - : `https://unpkg.com/@ffmpeg/core@v${devDependencies['@ffmpeg/core'].substring(1)}/dist/ffmpeg-core.js`, + : `https://unpkg.com/@ffmpeg/core@${devDependencies['@ffmpeg/core'].substring(1)}/dist/ffmpeg-core.js`, }; diff --git a/src/createFFmpeg.js b/src/createFFmpeg.js index 4d66ce4..bd052c7 100644 --- a/src/createFFmpeg.js +++ b/src/createFFmpeg.js @@ -53,6 +53,14 @@ module.exports = (_options = {}) => { Core = await createFFmpegCore({ printErr: (message) => parseMessage({ type: 'fferr', message }), print: (message) => parseMessage({ type: 'ffout', message }), + locateFile: (path, prefix) => { + if (typeof window !== 'undefined' + && typeof window.FFMPEG_CORE_WORKER_SCRIPT !== 'undefined' + && path.endsWith('ffmpeg-core.worker.js')) { + return window.FFMPEG_CORE_WORKER_SCRIPT; + } + return prefix + path; + }, }); ffmpeg = Core.cwrap('proxy_main', 'number', ['number', 'number']); log('info', 'ffmpeg-core loaded');