From d04a7a95a371b8f9ddfa0556106414a97b0df1ab Mon Sep 17 00:00:00 2001 From: seminelee <747191197@qq.com> Date: Wed, 28 Jul 2021 20:44:04 +0800 Subject: [PATCH 1/4] U createFFmpeg.js --- src/createFFmpeg.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/createFFmpeg.js b/src/createFFmpeg.js index c5425ce..84d476c 100644 --- a/src/createFFmpeg.js +++ b/src/createFFmpeg.js @@ -88,7 +88,8 @@ module.exports = (_options = {}) => { return prefix + path; }, }); - ffmpeg = Core.cwrap('proxy_main', 'number', ['number', 'number']); + const mainName = options.pthread === 0 ? '_main' : 'proxy_main'; + ffmpeg = Core.cwrap(mainName, 'number', ['number', 'number']); log('info', 'ffmpeg-core loaded'); } else { throw Error('ffmpeg.wasm was loaded, you should not load it again, use ffmpeg.isLoaded() to check next time.'); From 0ab43d01d7e91acb44db3c7cb4939aa5dbfb5f84 Mon Sep 17 00:00:00 2001 From: seminelee <747191197@qq.com> Date: Thu, 29 Jul 2021 18:11:28 +0800 Subject: [PATCH 2/4] A mainName --- src/createFFmpeg.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/createFFmpeg.js b/src/createFFmpeg.js index 84d476c..a1f1f8c 100644 --- a/src/createFFmpeg.js +++ b/src/createFFmpeg.js @@ -88,8 +88,7 @@ module.exports = (_options = {}) => { return prefix + path; }, }); - const mainName = options.pthread === 0 ? '_main' : 'proxy_main'; - ffmpeg = Core.cwrap(mainName, 'number', ['number', 'number']); + ffmpeg = Core.cwrap(options.mainName || 'proxy_main', 'number', ['number', 'number']); log('info', 'ffmpeg-core loaded'); } else { throw Error('ffmpeg.wasm was loaded, you should not load it again, use ffmpeg.isLoaded() to check next time.'); From 8fc711d73928ccca78518702cfdd3736030e86d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Aug 2021 14:50:02 +0000 Subject: [PATCH 3/4] Bump path-parse from 1.0.6 to 1.0.7 Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7. - [Release notes](https://github.com/jbgutierrez/path-parse/releases) - [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7) --- updated-dependencies: - dependency-name: path-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 66855fd..a9a7809 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5646,9 +5646,9 @@ "dev": true }, "path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true }, "path-to-regexp": { From 846285c136b57fe857c1e3bc430ca10aa89c916c Mon Sep 17 00:00:00 2001 From: seminelee <747191197@qq.com> Date: Tue, 17 Aug 2021 20:12:45 +0800 Subject: [PATCH 4/4] catch exit error --- src/createFFmpeg.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/createFFmpeg.js b/src/createFFmpeg.js index a1f1f8c..cbf5d9f 100644 --- a/src/createFFmpeg.js +++ b/src/createFFmpeg.js @@ -178,7 +178,11 @@ module.exports = (_options = {}) => { throw NO_LOAD; } else { running = false; - Core.exit(1); + try { + Core.exit(1); + } catch(e) { + console.log('catch core exit error', e); + } Core = null; ffmpeg = null; runResolve = null;