Mirrors/cobalt
1
0
Fork 0
mirror of https://github.com/wukko/cobalt.git synced 2025-05-10 10:44:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

web/workers: refactor remux worker into ffmpeg worker

Browse Source
This commit is contained in:
jj 2025-04-30 14:48:44 +00:00
parent 07443942fb
commit 0716f97a3a
No known key found for this signature in database
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/src/lib/task-manager/run-worker.ts
View File

@ -1,7 +1,7 @@
import { get } from "svelte/store";
import { queue } from "$lib/state/task-manager/queue";
import { runRemuxWorker } from "$lib/task-manager/runners/remux";
import { runFFmpegWorker } from "$lib/task-manager/runners/ffmpeg";
import { runFetchWorker } from "$lib/task-manager/runners/fetch";
import type { CobaltPipelineItem } from "$lib/types/workers";
@ -18,6 +18,7 @@ export const startWorker = async ({ worker, workerId, parentId, workerArgs }: Co
switch (worker) {
case "remux":
case "encode":
if (workerArgs.files) {
files = workerArgs.files;
}
@ -30,12 +31,13 @@ export const startWorker = async ({ worker, workerId, parentId, workerArgs }: Co
}
if (files.length > 0 && workerArgs.ffargs && workerArgs.output) {
await runRemuxWorker(
await runFFmpegWorker(
workerId,
parentId,
files,
workerArgs.ffargs,
workerArgs.output,
worker,
/*resetStartCounter=*/true,
);
}

16
web/src/lib/task-manager/runners/remux.ts → web/src/lib/task-manager/runners/ffmpeg.ts
View File

@ -1,4 +1,4 @@
import RemuxWorker from "$lib/task-manager/workers/remux?worker";
import FFmpegWorker from "$lib/task-manager/workers/ffmpeg?worker";
import { killWorker } from "$lib/task-manager/run-worker";
import { updateWorkerProgress } from "$lib/state/task-manager/current-tasks";
@ -10,15 +10,16 @@ import type { CobaltFileReference } from "$lib/types/storage";
let startAttempts = 0;
export const runRemuxWorker = async (
export const runFFmpegWorker = async (
workerId: string,
parentId: string,
files: CobaltFileReference[],
args: string[],
output: FileInfo,
variant: 'remux' | 'encode',
resetStartCounter = false
) => {
const worker = new RemuxWorker();
const worker = new FFmpegWorker();
// sometimes chrome refuses to start libav wasm,
// so we check if it started, try 10 more times if not, and kill self if it still doesn't work
@ -35,7 +36,7 @@ export const runRemuxWorker = async (
if (startAttempts <= 10) {
killWorker(worker, unsubscribe, startCheck);
console.error("worker didn't start after 5 seconds, so it was killed and started again");
return await runRemuxWorker(workerId, parentId, files, args, output);
return await runFFmpegWorker(workerId, parentId, files, args, output, variant);
} else {
killWorker(worker, unsubscribe, startCheck);
console.error("worker didn't start after 10 attempts, so we're giving up");
@ -55,7 +56,8 @@ export const runRemuxWorker = async (
});
worker.postMessage({
cobaltRemuxWorker: {
cobaltFFmpegWorker: {
variant,
files,
args,
output,
@ -63,7 +65,7 @@ export const runRemuxWorker = async (
});
worker.onerror = (e) => {
console.error("remux worker exploded:", e);
console.error("ffmpeg worker exploded:", e);
killWorker(worker, unsubscribe, startCheck);
// TODO: proper error code
@ -73,7 +75,7 @@ export const runRemuxWorker = async (
let totalDuration: number | null = null;
worker.onmessage = (event) => {
const eventData = event.data.cobaltRemuxWorker;
const eventData = event.data.cobaltFFmpegWorker;
if (!eventData) return;
clearInterval(startCheck);

20
web/src/lib/task-manager/workers/remux.ts → web/src/lib/task-manager/workers/ffmpeg.ts
View File

@ -5,18 +5,18 @@ import type { CobaltFileReference } from "$lib/types/storage";
const error = (code: string) => {
self.postMessage({
cobaltRemuxWorker: {
cobaltFFmpegWorker: {
error: `error.${code}`,
}
})
}
const remux = async (files: CobaltFileReference[], args: string[], output: FileInfo) => {
const remux = async (variant: string, files: CobaltFileReference[], args: string[], output: FileInfo) => {
if (!(files && output && args)) return;
const ff = new LibAVWrapper((progress) => {
self.postMessage({
cobaltRemuxWorker: {
cobaltFFmpegWorker: {
progress: {
durationProcessed: progress.out_time_sec,
speed: progress.speed,
@ -28,7 +28,7 @@ const remux = async (files: CobaltFileReference[], args: string[], output: FileI
})
});
ff.init();
ff.init({ variant });
try {
// probing just the first file in files array (usually audio) for duration progress
@ -50,7 +50,7 @@ const remux = async (files: CobaltFileReference[], args: string[], output: FileI
}
self.postMessage({
cobaltRemuxWorker: {
cobaltFFmpegWorker: {
progress: {
duration: Number(file_info.format.duration),
}
@ -85,7 +85,7 @@ const remux = async (files: CobaltFileReference[], args: string[], output: FileI
await ff.terminate();
self.postMessage({
cobaltRemuxWorker: {
cobaltFFmpegWorker: {
render
}
});
@ -96,10 +96,8 @@ const remux = async (files: CobaltFileReference[], args: string[], output: FileI
}
self.onmessage = async (event: MessageEvent) => {
const ed = event.data.cobaltRemuxWorker;
if (ed) {
if (ed.files && ed.args && ed.output) {
await remux(ed.files, ed.args, ed.output);
}
const ed = event.data.cobaltFFmpegWorker;
if (ed?.variant && ed?.files && ed?.args && ed?.output) {
await remux(ed.variant, ed.files, ed.args, ed.output);
}
}