Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Upgrade browser FFmpeg to 9.0.2

Neeraj Gupta615b5b6099f4
diff --git a/web/apps/space/src/utils/video-encoding/web-codecs.ts b/web/apps/space/src/utils/video-encoding/web-codecs.ts
index 70f0cd5ec9..9cd712f499 100644
--- a/web/apps/space/src/utils/video-encoding/web-codecs.ts
+++ b/web/apps/space/src/utils/video-encoding/web-codecs.ts
@@ -91,8 +91,7 @@ export const encodeVideoWithWebCodecs = async (
probePath,
inputPath,
]);
- if (status !== 0 && status !== -1)
- throw new Error("Couldn't read video packets");
+ if (status !== 0) throw new Error("Couldn't read video packets");
const json = await ffmpeg.readFile(probePath, "utf8");
if (typeof json !== "string")
throw new Error("Expected video information");
@@ -262,7 +261,7 @@ export const encodeVideoWithWebCodecs = async (
"-c:v",
"copy",
"-bsf:v",
- "setts=ts=N*1000:duration=1000:time_base=1/30000",
+ `setts=ts=N:duration=1:time_base=1/${frameRate}`,
"-video_track_timescale",
"30000",
...(edit.muted
diff --git a/web/apps/space/src/utils/video-encoding/web.ts b/web/apps/space/src/utils/video-encoding/web.ts
index 862ac0d6d6..a66548ea10 100644
--- a/web/apps/space/src/utils/video-encoding/web.ts
+++ b/web/apps/space/src/utils/video-encoding/web.ts
@@ -17,6 +17,17 @@ const _ffmpegTaskQueue = new PromiseQueue<unknown>();
const ffmpegLazy = () => {
if (!_ffmpeg) {
const instance = new FFmpeg();
+ const failed = (error: unknown): never => {
+ if (_ffmpeg?.instance == instance) {
+ instance.terminate();
+ _ffmpeg = undefined;
+ }
+ throw error;
+ };
+ const exec = instance.exec.bind(instance);
+ const probe = instance.ffprobe.bind(instance);
+ instance.exec = (...args) => exec(...args).catch(failed);
+ instance.ffprobe = (...args) => probe(...args).catch(failed);
_ffmpeg = { instance, ready: loadFFmpeg(instance) };
}
return _ffmpeg;
@@ -32,10 +43,9 @@ const loadFFmpeg = async (ffmpeg: FFmpeg) => {
logToDisk("[info] Space video encoder loading");
try {
await ffmpeg.load({
- coreURL:
- "https://assets.ente.com/ffmpeg-core-0.12.10/ffmpeg-core.js",
+ coreURL: "https://assets.ente.com/ffmpeg-core-9.0.2/ffmpeg-core.js",
wasmURL:
- "https://assets.ente.com/ffmpeg-core-0.12.10/ffmpeg-core.wasm",
+ "https://assets.ente.com/ffmpeg-core-9.0.2/ffmpeg-core.wasm",
});
logToDisk(
`[info] Space video encoder loaded elapsedMs=${Date.now() - startedAt}`,
@@ -282,8 +292,9 @@ export const transcodeVideoWeb = (
);
return result;
}
- } catch {
+ } catch (error) {
signal.throwIfAborted();
+ if (!ffmpeg.loaded) throw error;
logToDisk(
"[warn] Space video WebCodecs export failed, using software encoder",
);
@@ -514,7 +525,7 @@ const ffprobeOutput = async (
try {
status = await ffmpeg.ffprobe(cmd);
- if (status !== 0 && status != -1) {
+ if (status !== 0) {
log.info(
`[wasm] ffprobe command failed with exit code ${status}: ${cmd.join(" ")}`,
);
@@ -529,7 +540,7 @@ const ffprobeOutput = async (
try {
if (ffmpeg.loaded) await ffmpeg.deleteFile(outputPath);
} catch (e) {
- if (status === 0 || status == -1) {
+ if (status === 0) {
log.error(`Failed to remove output ${outputPath}`, e);
}
}
diff --git a/web/apps/space/tests/video-export.test.ts b/web/apps/space/tests/video-export.test.ts
index 95782f2c4f..0da1b00e4a 100644
--- a/web/apps/space/tests/video-export.test.ts
+++ b/web/apps/space/tests/video-export.test.ts
@@ -24,7 +24,13 @@ vi.mock("@ffmpeg/ffmpeg", () => ({
FFmpeg: class {
loaded = true;
constructor() {
- mocks.workers.push(this);
+ mocks.workers.push({
+ loaded: this.loaded,
+ terminate: this.terminate,
+ exec: this.exec,
+ unmount: this.unmount,
+ readFile: this.readFile,
+ });
}
rejectLoad: ((error: Error) => void) | undefined;
load = (...args: unknown[]) =>
diff --git a/web/packages/gallery/services/ffmpeg/web.ts b/web/packages/gallery/services/ffmpeg/web.ts
index 229ecb6c20..fbdfd511e6 100644
--- a/web/packages/gallery/services/ffmpeg/web.ts
+++ b/web/packages/gallery/services/ffmpeg/web.ts
@@ -19,34 +19,41 @@ const _ffmpegTaskQueue = new PromiseQueue<Uint8Array<ArrayBuffer> | number>();
const ffmpegLazy = (): Promise<FFmpeg> => (_ffmpeg ??= createFFmpeg());
-const createFFmpeg = async () => {
+const createFFmpeg = () => {
const ffmpeg = new FFmpeg();
- await ffmpeg.load({
- coreURL: "https://assets.ente.com/ffmpeg-core-0.12.10/ffmpeg-core.js",
- wasmURL: "https://assets.ente.com/ffmpeg-core-0.12.10/ffmpeg-core.wasm",
- });
- return ffmpeg;
+ const failed = (error: unknown): never => {
+ ffmpeg.terminate();
+ if (_ffmpeg === loading) _ffmpeg = undefined;
+ throw error;
+ };
+ const loading = ffmpeg
+ .load({
+ coreURL: "https://assets.ente.com/ffmpeg-core-9.0.2/ffmpeg-core.js",
+ wasmURL:
+ "https://assets.ente.com/ffmpeg-core-9.0.2/ffmpeg-core.wasm",
+ })
+ .then(() => ffmpeg)
+ .catch(failed);
+ const exec = ffmpeg.exec.bind(ffmpeg);
+ const probe = ffmpeg.ffprobe.bind(ffmpeg);
+ ffmpeg.exec = (...args) => exec(...args).catch(failed);
+ ffmpeg.ffprobe = (...args) => probe(...args).catch(failed);
+ return loading;
};
export const ffmpegExecWeb = async (
command: FFmpegCommand,
blob: Blob,
outputFileExtension: string,
-): Promise<Uint8Array<ArrayBuffer>> => {
- const ffmpeg = await ffmpegLazy();
- return _ffmpegTaskQueue.add(() =>
- ffmpegExec(ffmpeg, command, outputFileExtension, blob),
+): Promise<Uint8Array<ArrayBuffer>> =>
+ _ffmpegTaskQueue.add(async () =>
+ ffmpegExec(await ffmpegLazy(), command, outputFileExtension, blob),
) as Promise<Uint8Array<ArrayBuffer>>;
-};
-export const determineVideoDurationWeb = async (
- blob: Blob,
-): Promise<number> => {
- const ffmpeg = await ffmpegLazy();
- return _ffmpegTaskQueue.add(() =>
- ffprobeExecVideoDuration(ffmpeg, blob),
+export const determineVideoDurationWeb = async (blob: Blob): Promise<number> =>
+ _ffmpegTaskQueue.add(async () =>
+ ffprobeExecVideoDuration(await ffmpegLazy(), blob),
) as Promise<number>;
-};
const ffmpegExec = async (
ffmpeg: FFmpeg,
@@ -200,8 +207,7 @@ const ffprobeOutput = async (
try {
status = await ffmpeg.ffprobe(cmd);
- // ffmpeg.wasm currently returns -1 on success.
- if (status !== 0 && status != -1) {
+ if (status !== 0) {
log.info(
`[wasm] ffprobe command failed with exit code ${status}: ${cmd.join(" ")}`,
);
@@ -218,7 +224,7 @@ const ffprobeOutput = async (
} catch (e) {
// Output file might not even exist if the command did not succeed,
// so only log on success.
- if (status === 0 || status == -1) {
+ if (status === 0) {
log.error(`Failed to remove output ${outputPath}`, e);
}
}