Merge remote-tracking branch 'origin/main' into hls

README.md

@@ -34,15 +34,15 @@ Mediabunny is a JavaScript library for reading, writing, and converting media fi
   <a href="https://kino.ai/" target="_blank" rel="sponsored">
     <img src="./docs/public/sponsors/kino.jpg" width="60" height="60" alt="Kino">
   </a>
+  &nbsp;&nbsp;&nbsp;&nbsp;
+  <a href="https://screen.studio/" target="_blank" rel="sponsored">
+    <img src="./docs/public/sponsors/screen-studio.webp" width="60" height="60" alt="Screen Studio">
+  </a>
 </div>
 
 ### Silver sponsors
 
 <div align="center">
-  <a href="https://pqina.nl/pintura/" target="_blank" rel="sponsored">
-    <img src="./docs/public/sponsors/pintura-labs.png" width="50" height="50" alt="Pintura Labs">
-  </a>
-  &nbsp;&nbsp;&nbsp;&nbsp;
   <a href="https://ponder.ai/" target="_blank" rel="sponsored">
     <img src="./docs/public/sponsors/ponder.png" width="50" height="50" alt="Ponder">
   </a>

docs/index.md

@@ -95,9 +95,9 @@ const sponsors = {
 		{ image: '/sponsors/gling.svg', name: 'Gling AI', url: 'https://www.gling.ai/' },
 		{ image: '/sponsors/diffusionstudio.png', name: 'Diffusion Studio', url: 'https://diffusion.studio/' },
 		{ image: '/sponsors/kino.jpg', name: 'Kino', url: 'https://kino.ai/' },
+		{ image: '/sponsors/screen-studio.webp', name: 'Screen Studio', url: 'https://screen.studio/' },
 	],
 	silver: [
-		{ image: '/sponsors/pintura-labs.png', name: 'Pintura Labs', url: 'https://pqina.nl/pintura/' },
 		{ image: '/sponsors/ponder.png', name: 'Ponder', url: 'https://ponder.ai/' },
 	],
 	bronze: [
@@ -107,6 +107,7 @@ const sponsors = {
 		{ image: '/sponsors/jellypod.png', name: 'Jellypod', url: 'https://jellypod.ai/' },
 	],
 	individual: [
+		{ image: '/sponsors/pintura-labs.png', name: 'Pintura Labs', url: 'https://pqina.nl/pintura/' },
 		{ image: 'https://avatars.githubusercontent.com/u/82552321', name: 'Polotno', url: 'https://github.com/polotno-project' },
 		{ image: 'https://avatars.githubusercontent.com/u/489051', name: 'Roman Rädle', url: 'https://github.com/raedle' },
 		{ image: 'https://avatars.githubusercontent.com/u/197597', name: 'Christopher Chedeau', url: 'https://github.com/vjeux' },

examples/file-compression/file-compression.ts

@@ -143,7 +143,7 @@ loadUrlButton.addEventListener('click', () => {
 	const url = prompt(
 		'Please enter a URL of a media file. Note that it must be HTTPS and support cross-origin requests, so have the'
 		+ ' right CORS headers set.',
-		'https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4',
+		'https://remotion.media/BigBuckBunny.mp4',
 	);
 	if (!url) {
 		return;

examples/media-player/media-player.ts

@@ -712,7 +712,7 @@ loadUrlButton.addEventListener('click', () => {
 	const url = prompt(
 		'Please enter a URL of a media file. Note that it must be HTTPS and support cross-origin requests, so have the'
 		+ ' right CORS headers set.',
-		'https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4',
+		'https://remotion.media/BigBuckBunny.mp4',
 	);
 	if (!url) {
 		return;

examples/metadata-extraction/metadata-extraction.ts

@@ -221,7 +221,7 @@ loadUrlButton.addEventListener('click', () => {
 	const url = prompt(
 		'Please enter a URL of a media file. Note that it must be HTTPS and support cross-origin requests, so have the'
 		+ ' right CORS headers set.',
-		'https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4',
+		'https://remotion.media/BigBuckBunny.mp4',
 	);
 	if (!url) {
 		return;

examples/thumbnail-generation/thumbnail-generation.ts

@@ -137,7 +137,7 @@ loadUrlButton.addEventListener('click', () => {
 	const url = prompt(
 		'Please enter a URL of a media file. Note that it must be HTTPS and support cross-origin requests, so have the'
 		+ ' right CORS headers set.',
-		'https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4',
+		'https://remotion.media/BigBuckBunny.mp4',
 	);
 	if (!url) {
 		return;

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "mediabunny",
-  "version": "1.34.2",
+  "version": "1.34.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "mediabunny",
-      "version": "1.34.2",
+      "version": "1.34.4",
       "license": "MPL-2.0",
       "workspaces": [
         "packages/*"
@@ -7743,9 +7743,9 @@
       }
     },
     "node_modules/mediabunny": {
-      "version": "1.34.0",
+      "version": "1.34.3",
-      "resolved": "https://registry.npmjs.org/mediabunny/-/mediabunny-1.34.0.tgz",
+      "resolved": "https://registry.npmjs.org/mediabunny/-/mediabunny-1.34.3.tgz",
-      "integrity": "sha512-mjn/7QVEPbPEakuNKD8OIPDhaoe2NlgWVyyqftuLVWvsgLol7g2MQzXWCjx523CP8Y9jE2H09hbYCuTwSI7pSQ==",
+      "integrity": "sha512-Jb0x3jyvadGVpo8aZSn53NZduPbPdbx9foQsAGOmKBz7Hai9B38Kf+7eXbxXFcXoXxcTyNaZeDhoA0agoBQldA==",
       "license": "MPL-2.0",
       "peer": true,
       "workspaces": [
@@ -12069,7 +12069,7 @@
     },
     "packages/ac3": {
       "name": "@mediabunny/ac3",
-      "version": "1.34.2",
+      "version": "1.34.4",
       "license": "MPL-2.0",
       "devDependencies": {
         "@types/emscripten": "^1.40.1"
@@ -12084,7 +12084,7 @@
     },
     "packages/mp3-encoder": {
       "name": "@mediabunny/mp3-encoder",
-      "version": "1.34.2",
+      "version": "1.34.4",
       "license": "MPL-2.0",
       "devDependencies": {
         "@types/emscripten": "^1.40.1"

package.json

@@ -1,7 +1,7 @@
 {
   "name": "mediabunny",
   "author": "Vanilagy",
-  "version": "1.34.2",
+  "version": "1.34.4",
   "description": "Pure TypeScript media toolkit for reading, writing, and converting media files, directly in the browser.",
   "type": "module",
   "workspaces": [

packages/ac3/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mediabunny/ac3",
   "author": "Vanilagy",
-  "version": "1.34.2",
+  "version": "1.34.4",
   "description": "AC-3 and E-AC-3 (Dolby Digital) decoder and encoder extension for Mediabunny, based on FFmpeg.",
   "main": "./dist/bundles/mediabunny-ac3.mjs",
   "module": "./dist/bundles/mediabunny-ac3.mjs",

packages/ac3/src/decoder.ts

@@ -13,7 +13,7 @@ import {
 	EncodedPacket,
 	registerDecoder,
 } from 'mediabunny';
-import { sendCommand } from './worker-client';
+import { sendCommand, refWorker, unrefWorker } from './worker-client';
 
 class Ac3Decoder extends CustomAudioDecoder {
 	private ctx = 0;
@@ -23,6 +23,8 @@ class Ac3Decoder extends CustomAudioDecoder {
 	}
 
 	async init() {
+		await refWorker();
+
 		const result = await sendCommand({
 			type: 'init-decoder',
 			data: { codec: this.codec },
@@ -53,8 +55,9 @@ class Ac3Decoder extends CustomAudioDecoder {
 		await sendCommand({ type: 'flush-decoder', data: { ctx: this.ctx } });
 	}
 
-	close() {
+	async close() {
 		void sendCommand({ type: 'close-decoder', data: { ctx: this.ctx } });
+		await unrefWorker();
 	}
 }
 

packages/ac3/src/encoder.ts

@@ -13,7 +13,7 @@ import {
 	EncodedPacket,
 	registerEncoder,
 } from 'mediabunny';
-import { sendCommand } from './worker-client';
+import { sendCommand, refWorker, unrefWorker } from './worker-client';
 import { assert } from './shared';
 import { AC3_SAMPLE_RATES, EAC3_REDUCED_SAMPLE_RATES } from '../../../shared/ac3-misc';
 
@@ -38,11 +38,14 @@ class Ac3Encoder extends CustomAudioEncoder {
 		return (codec === 'ac3' || codec === 'eac3')
 			&& config.numberOfChannels >= 1
 			&& config.numberOfChannels <= 8
-			&& sampleRates.includes(config.sampleRate);
+			&& sampleRates.includes(config.sampleRate)
+			&& config.bitrate !== undefined;
 	}
 
 	async init() {
-		assert(this.config.bitrate);
+		await refWorker();
+
+		assert(this.config.bitrate !== undefined);
 		this.sampleRate = this.config.sampleRate;
 		this.numberOfChannels = this.config.numberOfChannels;
 
@@ -130,6 +133,7 @@ class Ac3Encoder extends CustomAudioEncoder {
 
 	close() {
 		void sendCommand({ type: 'close-encoder', data: { ctx: this.ctx } });
+		void unrefWorker();
 	}
 
 	private async encodeOneFrame() {

packages/ac3/src/worker-client.ts

@@ -10,13 +10,51 @@ import { assert, type WorkerCommand, type WorkerResponse, type WorkerResponseDat
 // @ts-expect-error An esbuild plugin handles this, TypeScript doesn't need to understand
 import createWorker from './codec.worker';
 
-let workerPromise: Promise<Worker> | null;
+type ExtendedWorker = Worker & {
+	ref?: () => void;
+	unref?: () => void;
+};
+
+let workerPromise: Promise<ExtendedWorker> | null;
 let nextMessageId = 0;
 const pendingMessages = new Map<number, {
 	resolve: (value: WorkerResponseData) => void;
 	reject: (reason?: unknown) => void;
 }>();
 
+let refCount = 0;
+let keepAliveInterval: ReturnType<typeof setInterval> | null = null;
+
+export const refWorker = async () => {
+	refCount++;
+	if (refCount === 1) {
+		keepAliveInterval = setInterval(() => {}, 2 ** 31 - 1);
+		const worker = await ensureWorker();
+		worker.ref?.();
+	}
+};
+
+export const unrefWorker = async () => {
+	refCount--;
+	if (refCount === 0) {
+		if (keepAliveInterval !== null) {
+			clearInterval(keepAliveInterval);
+			keepAliveInterval = null;
+		}
+
+		const worker = await workerPromise;
+		if (worker) {
+			if (worker.unref) {
+				worker.unref(); // If we don't do this, then the Node process never terminates by itself
+			} else if (typeof window === 'undefined') {
+				// Non-browser environment without unref - terminate instead
+				worker.terminate();
+				workerPromise = null;
+			}
+		}
+	}
+};
+
 export const sendCommand = async <T extends string>(
 	command: WorkerCommand & { type: T },
 	transferables?: Transferable[],
@@ -41,7 +79,8 @@ export const sendCommand = async <T extends string>(
 const ensureWorker = () => {
 	return workerPromise ??= (async () => {
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-call
-		const worker = (await createWorker()) as Worker;
+		const worker = (await createWorker()) as ExtendedWorker;
+		worker.unref?.(); // Start unreffed
 
 		const onMessage = (data: WorkerResponse) => {
 			const pending = pendingMessages.get(data.id);

packages/mp3-encoder/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mediabunny/mp3-encoder",
   "author": "Vanilagy",
-  "version": "1.34.2",
+  "version": "1.34.4",
   "description": "MP3 encoder extension for Mediabunny, based on LAME.",
   "main": "./dist/bundles/mediabunny-mp3-encoder.mjs",
   "module": "./dist/bundles/mediabunny-mp3-encoder.mjs",

scripts/esbuild/inlined-workers.ts

@@ -28,7 +28,7 @@ export default function Worker() {
 			const inlineWorkerFunctionCode = `
 export default async function inlineWorker(scriptText) {
 	if (typeof Worker !== 'undefined' && typeof Bun === 'undefined') {
-		// Browser, Deno
+		// Browser, Deno (Deno can't do dynamic import of worker_threads)
 
 		const blob = new Blob([scriptText], { type: "text/javascript" });
 		const url = URL.createObjectURL(blob);
@@ -39,10 +39,10 @@ export default async function inlineWorker(scriptText) {
 		// Node, Bun (Bun's Worker is flaky, worker_threads works much better)
 
 		let Worker;
+		const workerModule = 'node:worker_threads';
 		try {
-			Worker = (await import('worker_threads')).Worker;
+			Worker = (await import(workerModule)).Worker;
 		} catch {
-			const workerModule = 'worker_threads';
 			Worker = require(workerModule).Worker;
 		}