mirror of
https://github.com/DustinBrett/daedalOS.git
synced 2025-12-06 12:20:20 +01:00
Revert "Add MT support to ffmpeg when possible"
Some checks are pending
Tests / tests (push) Waiting to run
Some checks are pending
Tests / tests (push) Waiting to run
This reverts commit e66a9d87b8.
This commit is contained in:
parent
6e2eec0e5f
commit
e0cff33fbd
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
|
|
@ -1 +0,0 @@
|
|||
"use strict";var Module={};var initializedJS=false;function threadPrintErr(){var text=Array.prototype.slice.call(arguments).join(" ");console.error(text)}function threadAlert(){var text=Array.prototype.slice.call(arguments).join(" ");postMessage({cmd:"alert",text:text,threadId:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=(info,receiveInstance)=>{var module=Module["wasmModule"];Module["wasmModule"]=null;var instance=new WebAssembly.Instance(module,info);return receiveInstance(instance)};self.onunhandledrejection=e=>{throw e.reason??e};function handleMessage(e){try{if(e.data.cmd==="load"){let messageQueue=[];self.onmessage=e=>messageQueue.push(e);self.startWorker=instance=>{Module=instance;postMessage({"cmd":"loaded"});for(let msg of messageQueue){handleMessage(msg)}self.onmessage=handleMessage};Module["wasmModule"]=e.data.wasmModule;for(const handler of e.data.handlers){Module[handler]=function(){postMessage({cmd:"callHandler",handler:handler,args:[...arguments]})}}Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["ENVIRONMENT_IS_PTHREAD"]=true;if(typeof e.data.urlOrBlob=="string"){importScripts(e.data.urlOrBlob)}else{var objectUrl=URL.createObjectURL(e.data.urlOrBlob);importScripts(objectUrl);URL.revokeObjectURL(objectUrl)}createFFmpegCore(Module)}else if(e.data.cmd==="run"){Module["__emscripten_thread_init"](e.data.pthread_ptr,0,0,1);Module["__emscripten_thread_mailbox_await"](e.data.pthread_ptr);Module["establishStackSpace"]();Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInitTLS();if(!initializedJS){initializedJS=true}try{Module["invokeEntryPoint"](e.data.start_routine,e.data.arg)}catch(ex){if(ex!="unwind"){throw ex}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["__emscripten_thread_exit"](-1)}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="checkMailbox"){if(initializedJS){Module["checkMailbox"]()}}else if(e.data.cmd){err("worker.js received unknown command "+e.data.cmd);err(e.data)}}catch(ex){if(Module["__emscripten_thread_crashed"]){Module["__emscripten_thread_crashed"]()}throw ex}}self.onmessage=handleMessage;
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
import { basename, dirname, extname, join } from "path";
|
||||
import { type FFmpeg } from "@ffmpeg/ffmpeg";
|
||||
import { type FFmpegTranscodeFile } from "utils/ffmpeg/types";
|
||||
import { fetchBlob, hasSharedArrayBuffer } from "utils/functions";
|
||||
import { fetchBlob } from "utils/functions";
|
||||
|
||||
export const getFFmpeg = async (
|
||||
printLn: (message: string) => void = console.info
|
||||
|
|
@ -11,24 +11,13 @@ export const getFFmpeg = async (
|
|||
|
||||
ffmpeg.on("log", ({ message }) => printLn(message));
|
||||
|
||||
const canMultiThread = hasSharedArrayBuffer();
|
||||
|
||||
await ffmpeg.load({
|
||||
coreURL: URL.createObjectURL(
|
||||
await fetchBlob(
|
||||
`/Program Files/ffmpeg${canMultiThread ? "/mt" : ""}/ffmpeg-core.js`
|
||||
)
|
||||
await fetchBlob("/Program Files/ffmpeg/ffmpeg-core.js")
|
||||
),
|
||||
wasmURL: URL.createObjectURL(
|
||||
await fetchBlob(
|
||||
`/Program Files/ffmpeg${canMultiThread ? "/mt" : ""}/ffmpeg-core.wasm`
|
||||
)
|
||||
await fetchBlob("/Program Files/ffmpeg/ffmpeg-core.wasm")
|
||||
),
|
||||
...(canMultiThread && {
|
||||
workerURL: URL.createObjectURL(
|
||||
await fetchBlob("/Program Files/ffmpeg/mt/ffmpeg-core.worker.js")
|
||||
),
|
||||
}),
|
||||
});
|
||||
|
||||
return ffmpeg;
|
||||
|
|
|
|||
|
|
@ -1170,9 +1170,6 @@ export const generatePrettyTimestamp = (): string =>
|
|||
export const isFileSystemMappingSupported = (): boolean =>
|
||||
typeof FileSystemHandle === "function" && "showDirectoryPicker" in window;
|
||||
|
||||
export const hasSharedArrayBuffer = (): boolean =>
|
||||
window.crossOriginIsolated && typeof SharedArrayBuffer === "function";
|
||||
|
||||
export const hasFinePointer = (): boolean =>
|
||||
window.matchMedia("(pointer: fine)").matches;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user