0ct0pu5/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Same

Browse source
This commit is contained in:
Manav Rathi 2024-04-22 11:49:59 +05:30
parent 37f1a7b630
commit b1e9f863d7
No known key found for this signature in database
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
web/apps/photos/src/services/ffmpeg.ts
View file

@ -12,7 +12,7 @@ import { type DedicatedFFmpegWorker } from "worker/ffmpeg.worker";
/** Called during upload */
export async function generateVideoThumbnail(
file: File | ElectronFile,
fileOrPath: File | ElectronFile | string,
): Promise<File | ElectronFile> {
let seekTime = 1;
while (seekTime >= 0) {
@ -161,20 +161,24 @@ export async function convertToMP4(file: File) {
* 10-20x faster than the wasm one currently. See: [Note: ffmpeg in Electron].
*/
const ffmpegExec = async (
cmd: string[],
command: string[],
inputFile: File | ElectronFile,
outputFilename: string,
outputFileName: string,
timeoutMS: number = 0,
): Promise<File | ElectronFile> => {
const electron = globalThis.electron;
if (electron || false) {
/* TODO(MR): ElectronFile changes */
// return electron.runFFmpegCmd(cmd, inputFile, outputFilename, timeoutMS);
return electron.ffmpegExec(
command,
inputDataOrPath,
outputFileName,
timeoutMS
)
} else {
return workerFactory
.instance()
.then((worker) =>
worker.run(cmd, inputFile, outputFilename, timeoutMS),
worker.execute(command, inputFile, outputFileName, timeoutMS),
);
}
};