Remove v in version and add locateFile func to fix worker script issue

This commit is contained in:
Jerome Wu 2020-11-03 17:41:42 +08:00
parent b08b3cda43
commit c398540992
2 changed files with 9 additions and 1 deletions

View File

@ -7,5 +7,5 @@ const { devDependencies } = require('../../package.json');
module.exports = { module.exports = {
corePath: (typeof process !== 'undefined' && process.env.FFMPEG_ENV === 'development') corePath: (typeof process !== 'undefined' && process.env.FFMPEG_ENV === 'development')
? resolveURL('/node_modules/@ffmpeg/core/dist/ffmpeg-core.js') ? 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`,
}; };

View File

@ -53,6 +53,14 @@ module.exports = (_options = {}) => {
Core = await createFFmpegCore({ Core = await createFFmpegCore({
printErr: (message) => parseMessage({ type: 'fferr', message }), printErr: (message) => parseMessage({ type: 'fferr', message }),
print: (message) => parseMessage({ type: 'ffout', 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']); ffmpeg = Core.cwrap('proxy_main', 'number', ['number', 'number']);
log('info', 'ffmpeg-core loaded'); log('info', 'ffmpeg-core loaded');