jassub 2.3.2 → 2.4.0

package/src/worker/util.ts

@@ -41,3 +41,67 @@ export async function fetchtext (url: string) {
   const res = await _fetch(url)
   return await res.text()
 }
+
+export const THREAD_COUNT = !IS_FIREFOX && self.crossOriginIsolated ? Math.min(Math.max(1, navigator.hardwareConcurrency - 2), 8) : 1
+
+// @ts-expect-error new experimental API
+export const SUPPORTS_GROWTH = !!WebAssembly.Memory.prototype.toResizableBuffer
+
+// HACK: 3 memory hacks to support here:
+// 1. Chrome WASM Growable memory which can use a reference to the buffer to fix visual artifacts, which happen both with multithreading or without [fastest]
+// 2. Chrome WASM non-growable, but mult-threaded only memory which needs to re-create the HEAPU8 on growth because of race conditions [medium]
+// 3. Firefox non-growable memory which needs a copy of the data into a non-resizable buffer and can't use a reference [fastest single threaded, but only on Firefox, on Chrome this is slowest]
+export const SHOULD_REFERENCE_MEMORY = !IS_FIREFOX && (SUPPORTS_GROWTH || THREAD_COUNT > 1)
+
+export const IDENTITY_MATRIX = new Float32Array([
+  1, 0, 0,
+  0, 1, 0,
+  0, 0, 1
+])
+
+// Color matrix conversion map - mat3x3 for WebGL2
+// Each matrix converts FROM the key color space TO the nested key color space
+export const colorMatrixConversionMap = {
+  BT601: {
+    BT709: new Float32Array([
+      1.0863, 0.0965, -0.01411,
+      -0.0723, 0.8451, -0.0277,
+      -0.0141, 0.0584, 1.0418
+    ]),
+    BT601: IDENTITY_MATRIX
+  },
+  BT709: {
+    BT601: new Float32Array([
+      0.9137, 0.0784, 0.0079,
+      -0.1049, 1.1722, -0.0671,
+      0.0096, 0.0322, 0.9582
+    ]),
+    BT709: IDENTITY_MATRIX
+  },
+  FCC: {
+    BT709: new Float32Array([
+      1.0873, -0.0736, -0.0137,
+      0.0974, 0.8494, 0.0531,
+      -0.0127, -0.0251, 1.0378
+    ]),
+    BT601: new Float32Array([
+      1.001, -0.0008, -0.0002,
+      0.0009, 1.005, -0.006,
+      0.0013, 0.0027, 0.996
+    ])
+  },
+  SMPTE240M: {
+    BT709: new Float32Array([
+      0.9993, 0.0006, 0.0001,
+      -0.0004, 0.9812, 0.0192,
+      -0.0034, -0.0114, 1.0148
+    ]),
+    BT601: new Float32Array([
+      0.913, 0.0774, 0.0096,
+      -0.1051, 1.1508, -0.0456,
+      0.0063, 0.0207, 0.973
+    ])
+  }
+} as const
+
+export type ColorSpace = keyof typeof colorMatrixConversionMap

package/src/worker/worker.ts

@@ -5,8 +5,10 @@ import { queryRemoteFonts } from 'lfa-ponyfill'
 
 import WASM from '../wasm/jassub-worker.js'
 
-import { _applyKeys, _fetch, fetchtext, IS_FIREFOX, LIBASS_YCBCR_MAP, WEIGHT_MAP, type ASSEvent, type ASSImage, type ASSStyle, type WeightValue } from './util.ts'
-import { WebGL2Renderer } from './webgl-renderer.ts'
+import { Canvas2DRenderer } from './renderers/2d-renderer.ts'
+import { WebGL1Renderer } from './renderers/webgl1-renderer.ts'
+import { WebGL2Renderer } from './renderers/webgl2-renderer.ts'
+import { _applyKeys, _fetch, fetchtext, LIBASS_YCBCR_MAP, THREAD_COUNT, WEIGHT_MAP, type ASSEvent, type ASSImage, type ASSStyle, type WeightValue } from './util.ts'
 
 import type { JASSUB, MainModule } from '../wasm/types.d.ts'
 // import { WebGPURenderer } from './webgpu-renderer'
@@ -38,7 +40,7 @@ export class ASSRenderer {
   _subtitleColorSpace?: 'BT601' | 'BT709' | 'SMPTE240M' | 'FCC' | null
   _videoColorSpace?: 'BT709' | 'BT601'
   _malloc!: (size: number) => number
-  _gpurender = new WebGL2Renderer()
+  _gpurender: WebGL2Renderer | WebGL1Renderer | Canvas2DRenderer
 
   debug = false
 
@@ -57,7 +59,7 @@ export class ASSRenderer {
     globalThis.fetch = _ => _fetch(data.wasmUrl)
 
     // TODO: abslink doesnt support transferables yet
-    const handleMessage = async ({ data }: MessageEvent) => {
+    const handleMessage = ({ data }: MessageEvent) => {
       if (data.name === 'offscreenCanvas') {
         // await this._ready // needed for webGPU
         this._offCanvas = data.ctrl
@@ -70,6 +72,16 @@ export class ASSRenderer {
     // const devicePromise = navigator.gpu?.requestAdapter({
     //   powerPreference: 'high-performance'
     // }).then(adapter => adapter?.requestDevice())
+    try {
+      const testCanvas = new OffscreenCanvas(1, 1)
+      if (testCanvas.getContext('webgl2')) {
+        this._gpurender = new WebGL2Renderer()
+      } else {
+        this._gpurender = testCanvas.getContext('webgl') ? new WebGL1Renderer() : new Canvas2DRenderer()
+      }
+    } catch {
+      this._gpurender = new Canvas2DRenderer()
+    }
 
     // eslint-disable-next-line @typescript-eslint/unbound-method
     this._ready = (WASM({ __url: data.wasmUrl, __out: (log: string) => this._log(log) }) as Promise<MainModule>).then(async ({ _malloc, JASSUB }) => {
@@ -78,7 +90,7 @@ export class ASSRenderer {
       this._wasm = new JASSUB(data.width, data.height, this._defaultFont)
       // Firefox seems to have issues with multithreading in workers
       // a worker inside a worker does not recieve messages properly
-      this._wasm.setThreads(!IS_FIREFOX && self.crossOriginIsolated ? Math.min(Math.max(1, navigator.hardwareConcurrency - 2), 8) : 1)
+      this._wasm.setThreads(THREAD_COUNT)
 
       this._loadInitialFonts(data.fonts)