Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: use ffmpeg singlethread #74

Merged
merged 1 commit into from
May 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"start": "webpack serve --env dev",
"watch": "webpack --env devBuild --watch",
"dev": "python ./scripts/moveFFMpeg.py && webpack --env devBuild && python ./scripts/moveFFMpeg.py --build",
"build": "webpack --env prod && cp node_modules/@ffmpeg/core-mt/dist/umd/ffmpeg-core.js build/js/ffmpeg-core.js && cp node_modules/@ffmpeg/core-mt/dist/umd/ffmpeg-core.wasm build/js/ffmpeg-core.wasm && cp node_modules/@ffmpeg/core-mt/dist/umd/ffmpeg-core.worker.js build/js/ffmpeg-core.worker.js",
"build": "webpack --env prod && cp node_modules/@ffmpeg/core/dist/umd/ffmpeg-core.js build/js/ffmpeg-core.js && cp node_modules/@ffmpeg/core/dist/umd/ffmpeg-core.wasm build/js/ffmpeg-core.wasm && cp node_modules/@ffmpeg/core-mt/dist/umd/ffmpeg-core.worker.js build/js/ffmpeg-core.worker.js",
"dep": "git submodule update --remote --merge --recursive && yarn upgrade-interactive",
"compile": "tsc"
},
Expand Down Expand Up @@ -66,7 +66,7 @@
"dependencies": {
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@ffmpeg/core-mt": "^0.12.6",
"@ffmpeg/core": "^0.12.6",
"@ffmpeg/ffmpeg": "^0.12.10",
"@ffmpeg/util": "^0.12.1",
"@fontsource/roboto": "^5.0.13",
Expand Down
1 change: 0 additions & 1 deletion src/utils/ffmpeg/ffmpeg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ ffmpeg.on('log', ({ message }) => {
await ffmpeg.load({
coreURL: chrome.runtime.getURL('js/ffmpeg-core.js'),
wasmURL: chrome.runtime.getURL('js/ffmpeg-core.wasm'),
workerURL: chrome.runtime.getURL('js/ffmpeg-core.worker.js'),
});

export default async (url: string) => {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1925,10 +1925,10 @@ __metadata:
languageName: node
linkType: hard

"@ffmpeg/core-mt@npm:^0.12.6":
"@ffmpeg/core@npm:^0.12.6":
version: 0.12.6
resolution: "@ffmpeg/core-mt@npm:0.12.6"
checksum: 10c0/451044a9d2d59fefda9c1e7340910c3b5b484e5c2997b25bf261fa5cde5d2ee6fcdacb570dd3085466906562b3ae5abbe2a78ad3567106244c48c078fc32d782
resolution: "@ffmpeg/core@npm:0.12.6"
checksum: 10c0/7ae6828f3a45afb7c8eac9f2256cedc6c087356a8207e98fdc1ffbb5d12e93d299c1e59e4fa6835af914721c67c093cae6848c798b653f115b70c43c4620f96b
languageName: node
linkType: hard

Expand Down Expand Up @@ -9607,7 +9607,7 @@ __metadata:
"@babel/preset-typescript": "npm:^7.24.1"
"@emotion/react": "npm:^11.11.4"
"@emotion/styled": "npm:^11.11.5"
"@ffmpeg/core-mt": "npm:^0.12.6"
"@ffmpeg/core": "npm:^0.12.6"
"@ffmpeg/ffmpeg": "npm:^0.12.10"
"@ffmpeg/util": "npm:^0.12.1"
"@fontsource/roboto": "npm:^5.0.13"
Expand Down