Update to latest AOM

README.md

@@ -3,9 +3,9 @@
 [Squoosh] is an image compression web app that allows you to dive into the advanced options provided
 by various image compressors.
 
-# API & CLI
+# CLI
 
-Squoosh now has [an API](https://github.com/GoogleChromeLabs/squoosh/tree/dev/libsquoosh) and [a CLI](https://github.com/GoogleChromeLabs/squoosh/tree/dev/cli) that allows you to compress many images at once.
+[Squoosh now has a CLI](https://github.com/GoogleChromeLabs/squoosh/tree/dev/cli) that allows you to compress many images at once.
 
 # Privacy
 

cli/README.md

@@ -55,5 +55,5 @@ $ npx @squoosh/cli --wp2 auto test.png
 ```
 
 [squoosh]: https://squoosh.app
-[codecs.js]: https://github.com/GoogleChromeLabs/squoosh/blob/dev/libsquoosh/src/codecs.js
+[codecs.js]: https://github.com/GoogleChromeLabs/squoosh/blob/dev/cli/src/codecs.js
 [butteraugli]: https://github.com/google/butteraugli

cli/lib/asset-plugin.js

@@ -10,11 +10,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { promises as fs } from 'fs';
-import { basename } from 'path';
+import { promises as fs } from "fs";
+import { basename } from "path";
 
 const defaultOpts = {
-  prefix: 'asset-url',
+  prefix: "asset-url"
 };
 
 export default function assetPlugin(opts) {
@@ -23,16 +23,16 @@ export default function assetPlugin(opts) {
   /** @type {Map<string, Buffer>} */
   let assetIdToSourceBuffer;
 
-  const prefix = opts.prefix + ':';
+  const prefix = opts.prefix + ":";
   return {
-    name: 'asset-plugin',
+    name: "asset-plugin",
     buildStart() {
       assetIdToSourceBuffer = new Map();
     },
     augmentChunkHash(info) {
       // Get the sources for all assets imported by this chunk.
       const buffers = Object.keys(info.modules)
-        .map((moduleId) => assetIdToSourceBuffer.get(moduleId))
+        .map(moduleId => assetIdToSourceBuffer.get(moduleId))
         .filter(Boolean);
 
       if (buffers.length === 0) return;
@@ -56,20 +56,20 @@ export default function assetPlugin(opts) {
         throw Error(`Cannot find ${realId}`);
       }
       // Add an additional .js to the end so it ends up with .js at the end in the _virtual folder.
-      return prefix + resolveResult.id + '.js';
+      return prefix + resolveResult.id + ".js";
     },
     async load(id) {
       if (!id.startsWith(prefix)) return;
-      const realId = id.slice(prefix.length, -'.js'.length);
+      const realId = id.slice(prefix.length, -".js".length);
       const source = await fs.readFile(realId);
       assetIdToSourceBuffer.set(id, source);
       this.addWatchFile(realId);
 
       return `export default import.meta.ROLLUP_FILE_URL_${this.emitFile({
-        type: 'asset',
+        type: "asset",
         source,
-        name: basename(realId),
+        name: basename(realId)
       })}`;
-    },
+    }
   };
 }

cli/lib/autojson-plugin.js

@@ -5,8 +5,8 @@ export default function autojsonPlugin() {
     name: 'autojson-plugin',
     async load(id) {
       if (id.endsWith('.json') && !id.startsWith('json:')) {
-        return 'export default ' + (await fsp.readFile(id, 'utf8'));
+        return 'export default ' + await fsp.readFile(id, 'utf8');
+      }
     }
-    },
   };
-}
+};

cli/package.json

@@ -1,24 +1,32 @@
 {
   "name": "@squoosh/cli",
-  "version": "0.7.0",
+  "version": "0.6.0",
   "description": "A CLI for Squoosh",
   "public": true,
-  "type": "module",
   "bin": {
-    "squoosh-cli": "src/index.js",
-    "@squoosh/cli": "src/index.js"
+    "squoosh-cli": "build/index.js",
+    "@squoosh/cli": "build/index.js"
+  },
+  "scripts": {
+    "build": "rollup -c"
   },
-  "files": [
-    "/src/index.js"
-  ],
   "keywords": [],
   "author": "Google Chrome Developers <chromium-dev@google.com>",
   "license": "Apache-2.0",
   "dependencies": {
-    "@squoosh/lib": "^0.2.0",
-    "commander": "^7.2.0",
-    "json5": "^2.2.0",
-    "kleur": "^4.1.4",
-    "ora": "^5.4.0"
+    "web-streams-polyfill": "^3.0.0"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.11.6",
+    "@babel/preset-env": "^7.11.5",
+    "@rollup/plugin-babel": "^5.2.1",
+    "@rollup/plugin-commonjs": "^15.0.0",
+    "@rollup/plugin-node-resolve": "^9.0.0",
+    "commander": "^6.0.0",
+    "json5": "^2.1.3",
+    "kleur": "^4.1.3",
+    "ora": "^5.1.0",
+    "rollup": "^2.26.11",
+    "rollup-plugin-terser": "^7.0.2"
   }
 }

cli/rollup.config.js

@@ -13,6 +13,9 @@ export default {
     dir: 'build',
     format: 'cjs',
     assetFileNames: '[name]-[hash][extname]',
+    // This is needed so the resulting `index.js` can be
+    // executed by `npx`.
+    banner: '#!/usr/bin/env node',
   },
   plugins: [
     resolve(),
@@ -24,7 +27,7 @@ export default {
       babelrc: false,
       configFile: false,
       minified: process.env.DEBUG != '',
-      comments: true,
+      comments: false,
       presets: [
         [
           '@babel/preset-env',
@@ -38,5 +41,5 @@ export default {
       ],
     }),
   ],
-  external: [...builtinModules, 'web-streams-polyfill'],
+  external: builtinModules,
 };

cli/src/auto-optimizer.js

@@ -1,7 +1,7 @@
-import { instantiateEmscriptenWasm } from './emscripten-utils.js';
+import { instantiateEmscriptenWasm } from "./emscripten-utils.js";
 
-import visdif from '../../codecs/visdif/visdif.js';
-import visdifWasm from 'asset-url:../../codecs/visdif/visdif.wasm';
+import visdif from "../../codecs/visdif/visdif.js";
+import visdifWasm from "asset-url:../../codecs/visdif/visdif.wasm";
 
 // `measure` is a (async) function that takes exactly one numeric parameter and
 // returns a value. The function is assumed to be monotonic (an increase in `parameter`
@@ -11,7 +11,7 @@ import visdifWasm from 'asset-url:../../codecs/visdif/visdif.wasm';
 export async function binarySearch(
   measureGoal,
   measure,
-  { min = 0, max = 100, epsilon = 0.1, maxRounds = 8 } = {},
+  { min = 0, max = 100, epsilon = 0.1, maxRounds = 8 } = {}
 ) {
   let parameter = (max - min) / 2 + min;
   let delta = (max - min) / 4;
@@ -36,14 +36,14 @@ export async function autoOptimize(
   bitmapIn,
   encode,
   decode,
-  { butteraugliDistanceGoal = 1.4, ...otherOpts } = {},
+  { butteraugliDistanceGoal = 1.4, ...otherOpts } = {}
 ) {
   const { VisDiff } = await instantiateEmscriptenWasm(visdif, visdifWasm);
 
   const comparator = new VisDiff(
     bitmapIn.data,
     bitmapIn.width,
-    bitmapIn.height,
+    bitmapIn.height
   );
 
   let bitmapOut;
@@ -53,18 +53,18 @@ export async function autoOptimize(
   // increase the metric value. So multipliy Butteraugli values by -1.
   const { parameter } = await binarySearch(
     -1 * butteraugliDistanceGoal,
-    async (quality) => {
+    async quality => {
       binaryOut = await encode(bitmapIn, quality);
       bitmapOut = await decode(binaryOut);
       return -1 * comparator.distance(bitmapOut.data);
     },
-    otherOpts,
+    otherOpts
   );
   comparator.delete();
 
   return {
     bitmap: bitmapOut,
     binary: binaryOut,
-    quality: parameter,
+    quality: parameter
   };
 }

cli/src/codecs.js

@@ -344,11 +344,7 @@ export const codecs = {
       await oxipngPromise;
       return {
         encode: (buffer, width, height, opts) => {
-          const simplePng = pngEncDec.encode(
-            new Uint8Array(buffer),
-            width,
-            height,
-          );
+          const simplePng = pngEncDec.encode(new Uint8Array(buffer), width, height);
           return oxipng.optimise(simplePng, opts.level);
         },
       };

cli/src/index.js

@@ -1,13 +1,17 @@
-#!/usr/bin/env node
-
-import { program } from 'commander/esm.mjs';
+import { program } from 'commander';
 import JSON5 from 'json5';
-import path from 'path';
+import { isMainThread } from 'worker_threads';
+import { cpus } from 'os';
+import { extname, join, basename } from 'path';
 import { promises as fsp } from 'fs';
+import { resolve as resolvePath } from 'path';
+import { version } from 'json:../package.json';
 import ora from 'ora';
 import kleur from 'kleur';
 
-import { ImagePool, preprocessors, encoders } from '@squoosh/lib';
+import { codecs as supportedFormats, preprocessors } from './codecs.js';
+import WorkerPool from './worker_pool.js';
+import { autoOptimize } from './auto-optimizer.js';
 
 function clamp(v, min, max) {
   if (v < min) return min;
@@ -22,6 +26,114 @@ function prettyPrintSize(size) {
   return (size / 2 ** (10 * index)).toFixed(2) + suffix[index];
 }
 
+async function decodeFile(file) {
+  const buffer = await fsp.readFile(file);
+  const firstChunk = buffer.slice(0, 16);
+  const firstChunkString = Array.from(firstChunk)
+    .map((v) => String.fromCodePoint(v))
+    .join('');
+  const key = Object.entries(supportedFormats).find(([name, { detectors }]) =>
+    detectors.some((detector) => detector.exec(firstChunkString)),
+  )?.[0];
+  if (!key) {
+    throw Error(`${file} has an unsupported format`);
+  }
+  const rgba = (await supportedFormats[key].dec()).decode(
+    new Uint8Array(buffer),
+  );
+  return {
+    file,
+    bitmap: rgba,
+    size: buffer.length,
+  };
+}
+
+async function preprocessImage({ preprocessorName, options, file }) {
+  const preprocessor = await preprocessors[preprocessorName].instantiate();
+  file.bitmap = await preprocessor(
+    file.bitmap.data,
+    file.bitmap.width,
+    file.bitmap.height,
+    options,
+  );
+  return file;
+}
+
+async function encodeFile({
+  file,
+  size,
+  bitmap: bitmapIn,
+  outputFile,
+  encName,
+  encConfig,
+  optimizerButteraugliTarget,
+  maxOptimizerRounds,
+}) {
+  let out, infoText;
+  const encoder = await supportedFormats[encName].enc();
+  if (encConfig === 'auto') {
+    const optionToOptimize = supportedFormats[encName].autoOptimize.option;
+    const decoder = await supportedFormats[encName].dec();
+    const encode = (bitmapIn, quality) =>
+      encoder.encode(
+        bitmapIn.data,
+        bitmapIn.width,
+        bitmapIn.height,
+        Object.assign({}, supportedFormats[encName].defaultEncoderOptions, {
+          [optionToOptimize]: quality,
+        }),
+      );
+    const decode = (binary) => decoder.decode(binary);
+    const { bitmap, binary, quality } = await autoOptimize(
+      bitmapIn,
+      encode,
+      decode,
+      {
+        min: supportedFormats[encName].autoOptimize.min,
+        max: supportedFormats[encName].autoOptimize.max,
+        butteraugliDistanceGoal: optimizerButteraugliTarget,
+        maxRounds: maxOptimizerRounds,
+      },
+    );
+    out = binary;
+    const opts = {
+      // 5 significant digits is enough
+      [optionToOptimize]: Math.round(quality * 10000) / 10000,
+    };
+    infoText = ` using --${encName} '${JSON5.stringify(opts)}'`;
+  } else {
+    out = encoder.encode(
+      bitmapIn.data.buffer,
+      bitmapIn.width,
+      bitmapIn.height,
+      encConfig,
+    );
+  }
+  await fsp.writeFile(outputFile, out);
+  return {
+    infoText,
+    inputSize: size,
+    inputFile: file,
+    outputFile,
+    outputSize: out.length,
+  };
+}
+
+// both decoding and encoding go through the worker pool
+function handleJob(params) {
+  const { operation } = params;
+  switch (operation) {
+    case 'encode':
+      return encodeFile(params);
+    case 'decode':
+      return decodeFile(params.file);
+    case 'preprocess':
+      return preprocessImage(params);
+    default:
+      throw Error(`Invalid job "${operation}"`);
+  }
+}
+
 function progressTracker(results) {
   const spinner = ora();
   const tracker = {};
@@ -51,12 +163,13 @@ function progressTracker(results) {
   };
   function getResultsText() {
     let out = '';
-    for (const result of results.values()) {
-      out += `\n ${kleur.cyan(result.file)}: ${prettyPrintSize(result.size)}`;
-      for (const { outputFile, size: outputSize, infoText } of result.outputs) {
-        out += `\n  ${kleur.dim('└')} ${kleur.cyan(
-          outputFile.padEnd(5),
-        )} → ${prettyPrintSize(outputSize)}`;
+    for (const [filename, result] of results.entries()) {
+      out += `\n ${kleur.cyan(filename)}: ${prettyPrintSize(result.size)}`;
+      for (const { outputFile, outputSize, infoText } of result.outputs) {
+        const name = (program.suffix + extname(outputFile)).padEnd(5);
+        out += `\n  ${kleur.dim('└')} ${kleur.cyan(name)} → ${prettyPrintSize(
+          outputSize,
+        )}`;
         const percent = ((outputSize / result.size) * 100).toPrecision(3);
         out += ` (${kleur[outputSize > result.size ? 'red' : 'green'](
           percent + '%',
@@ -73,17 +186,17 @@ function progressTracker(results) {
 async function getInputFiles(paths) {
   const validFiles = [];
 
-  for (const inputPath of paths) {
-    const files = (await fsp.lstat(inputPath)).isDirectory()
-      ? (await fsp.readdir(inputPath, {withFileTypes: true})).filter(dirent => dirent.isFile()).map(dirent => path.join(inputPath, dirent.name))
-      : [inputPath];
+  for (const path of paths) {
+    const files = (await fsp.lstat(path)).isDirectory()
+      ? (await fsp.readdir(path)).map(file => join(path, file))
+      : [path];
     for (const file of files) {
       try {
         await fsp.stat(file);
       } catch (err) {
         if (err.code === 'ENOENT') {
           console.warn(
-            `Warning: Input file does not exist: ${path.resolve(file)}`,
+            `Warning: Input file does not exist: ${resolvePath(file)}`,
           );
           continue;
         } else {
@@ -101,7 +214,7 @@ async function getInputFiles(paths) {
 async function processFiles(files) {
   files = await getInputFiles(files);
 
-  const imagePool = new ImagePool();
+  const parallelism = cpus().length;
 
   const results = new Map();
   const progress = progressTracker(results);
@@ -110,98 +223,112 @@ async function processFiles(files) {
   progress.totalOffset = files.length;
   progress.setProgress(0, files.length);
 
+  const workerPool = new WorkerPool(parallelism, __filename);
   // Create output directory
-  await fsp.mkdir(program.opts().outputDir, { recursive: true });
+  await fsp.mkdir(program.outputDir, { recursive: true });
 
   let decoded = 0;
   let decodedFiles = await Promise.all(
     files.map(async (file) => {
-      const image = imagePool.ingestImage(file);
-      await image.decoded;
-      results.set(image, {
+      const result = await workerPool.dispatchJob({
+        operation: 'decode',
         file,
-        size: (await image.decoded).size,
+      });
+      results.set(file, {
+        file: result.file,
+        size: result.size,
         outputs: [],
       });
       progress.setProgress(++decoded, files.length);
-      return image;
+      return result;
     }),
   );
 
-  const preprocessOptions = {};
-
-  for (const preprocessorName of Object.keys(preprocessors)) {
-    if (!program.opts()[preprocessorName]) {
+  for (const [preprocessorName, value] of Object.entries(preprocessors)) {
+    if (!program[preprocessorName]) {
       continue;
     }
-    preprocessOptions[preprocessorName] = JSON5.parse(
-      program.opts()[preprocessorName],
+    const preprocessorParam = program[preprocessorName];
+    const preprocessorOptions = Object.assign(
+      {},
+      value.defaultOptions,
+      JSON5.parse(preprocessorParam),
+    );
+
+    decodedFiles = await Promise.all(
+      decodedFiles.map(async (file) => {
+        return workerPool.dispatchJob({
+          file,
+          operation: 'preprocess',
+          preprocessorName,
+          options: preprocessorOptions,
+        });
+      }),
     );
   }
 
-  for (const image of decodedFiles) {
-    image.preprocess(preprocessOptions);
-  }
-
-  await Promise.all(decodedFiles.map((image) => image.decoded));
-
   progress.progressOffset = decoded;
-  progress.setStatus(
-    'Encoding ' + kleur.dim(`(${imagePool.workerPool.numWorkers} threads)`),
-  );
+  progress.setStatus('Encoding ' + kleur.dim(`(${parallelism} threads)`));
   progress.setProgress(0, files.length);
 
   const jobs = [];
   let jobsStarted = 0;
   let jobsFinished = 0;
-  for (const image of decodedFiles) {
-    const originalFile = results.get(image).file;
+  for (const { file, bitmap, size } of decodedFiles) {
+    const ext = extname(file);
+    const base = basename(file, ext) + program.suffix;
 
-    const encodeOptions = {
-      optimizerButteraugliTarget: Number(
-        program.opts().optimizerButteraugliTarget,
-      ),
-      maxOptimizerRounds: Number(program.opts().maxOptimizerRounds),
-    };
-    for (const encName of Object.keys(encoders)) {
-      if (!program.opts()[encName]) {
+    for (const [encName, value] of Object.entries(supportedFormats)) {
+      if (!program[encName]) {
         continue;
       }
-      const encParam = program.opts()[encName];
+      const encParam =
+        typeof program[encName] === 'string' ? program[encName] : '{}';
       const encConfig =
-        encParam.toLowerCase() === 'auto' ? 'auto' : JSON5.parse(encParam);
-      encodeOptions[encName] = encConfig;
-    }
-    jobsStarted++;
-    const job = image.encode(encodeOptions).then(async () => {
-      jobsFinished++;
-      const outputPath = path.join(
-        program.opts().outputDir,
-        program.opts().suffix +
-          path.basename(originalFile, path.extname(originalFile)),
+        encParam.toLowerCase() === 'auto'
+          ? 'auto'
+          : Object.assign(
+              {},
+              value.defaultEncoderOptions,
+              JSON5.parse(encParam),
             );
-      for (const output of Object.values(image.encodedWith)) {
-        const outputFile = `${outputPath}.${(await output).extension}`;
-        await fsp.writeFile(outputFile, (await output).binary);
-        results
-          .get(image)
-          .outputs.push(Object.assign(await output, { outputFile }));
-      }
+      const outputFile = join(program.outputDir, `${base}.${value.extension}`);
+      jobsStarted++;
+      const p = workerPool
+        .dispatchJob({
+          operation: 'encode',
+          file,
+          size,
+          bitmap,
+          outputFile,
+          encName,
+          encConfig,
+          optimizerButteraugliTarget: Number(
+            program.optimizerButteraugliTarget,
+          ),
+          maxOptimizerRounds: Number(program.maxOptimizerRounds),
+        })
+        .then((output) => {
+          jobsFinished++;
+          results.get(file).outputs.push(output);
           progress.setProgress(jobsFinished, jobsStarted);
         });
-    jobs.push(job);
+      jobs.push(p);
+    }
   }
 
   // update the progress to account for multi-format
   progress.setProgress(jobsFinished, jobsStarted);
   // Wait for all jobs to finish
+  await workerPool.join();
   await Promise.all(jobs);
-  await imagePool.close();
   progress.finish('Squoosh results:');
 }
 
-program
+if (isMainThread) {
+  program
     .name('squoosh-cli')
+    .version(version)
     .arguments('<files...>')
     .option('-d, --output-dir <dir>', 'Output directory', '.')
     .option('-s, --suffix <suffix>', 'Append suffix to output files', '')
@@ -217,16 +344,19 @@ program
     )
     .action(processFiles);
 
-// Create a CLI option for each supported preprocessor
-for (const [key, value] of Object.entries(preprocessors)) {
+  // Create a CLI option for each supported preprocessor
+  for (const [key, value] of Object.entries(preprocessors)) {
     program.option(`--${key} [config]`, value.description);
-}
-// Create a CLI option for each supported encoder
-for (const [key, value] of Object.entries(encoders)) {
+  }
+  // Create a CLI option for each supported encoder
+  for (const [key, value] of Object.entries(supportedFormats)) {
     program.option(
       `--${key} [config]`,
       `Use ${value.name} to generate a .${value.extension} file with the given configuration`,
     );
-}
+  }
 
-program.parse(process.argv);
+  program.parse(process.argv);
+} else {
+  WorkerPool.useThisThreadAsWorker(handleJob);
+}

codecs/avif/Makefile

@@ -1,15 +1,16 @@
-# libavif and libaom versions are from
-# https://docs.google.com/document/d/1wEEA5rRU7wT54k41u3qyZIZHDCJArIMzLuzsrLAwaK8/edit
-CODEC_URL = https://github.com/AOMediaCodec/libavif/archive/1c39e772c2c0d687691dd4b589a12c323f5f767d.tar.gz
+CODEC_URL = https://github.com/AOMediaCodec/libavif/archive/31d7c6d1e32cf467ac24fb8c7a76c4902a4c00db.tar.gz
 CODEC_PACKAGE = node_modules/libavif.tar.gz
 
-LIBAOM_URL = https://aomedia.googlesource.com/aom/+archive/v3.1.0.tar.gz
+LIBAOM_URL = https://aomedia.googlesource.com/aom/+archive/4a8e276e3e0ef3c76083f3975d5caa85bc9593ce.tar.gz
 LIBAOM_PACKAGE = node_modules/libaom.tar.gz
 
 export CODEC_DIR = node_modules/libavif
 export BUILD_DIR = node_modules/build
 export LIBAOM_DIR = node_modules/libaom
 
+export CFLAGS += -g
+export CXXFLAGS += -g
+
 OUT_ENC_JS = enc/avif_enc.js
 OUT_NODE_ENC_JS = enc/avif_node_enc.js
 OUT_ENC_MT_JS = enc/avif_enc_mt.js
@@ -52,7 +53,7 @@ $(OUT_ENC_MT_JS): $(OUT_ENC_CPP) $(CODEC_DIR)/CMakeLists.txt $(LIBAOM_DIR)/CMake
 		" \
 		ENVIRONMENT=$(ENVIRONMENT) \
 		LIBAVIF_FLAGS="-DAVIF_CODEC_AOM_DECODE=0" \
-		OUT_FLAGS="-pthread"
+		OUT_FLAGS="-pthread -s PROXY_TO_PTHREAD=1 -g"
 
 $(OUT_NODE_DEC_JS): ENVIRONMENT=node
 $(OUT_NODE_DEC_JS) $(OUT_DEC_JS): $(OUT_DEC_CPP) $(CODEC_DIR)/CMakeLists.txt $(LIBAOM_DIR)/CMakeLists.txt

codecs/avif/enc/avif_enc.cpp

@@ -9,9 +9,10 @@ struct AvifOptions {
   // [0 - 63]
   // 0 = lossless
   // 63 = worst quality
-  int cqLevel;
-  // As above, but -1 means 'use cqLevel'
-  int cqAlphaLevel;
+  int minQuantizer;
+  int maxQuantizer;
+  int minQuantizerAlpha;
+  int maxQuantizerAlpha;
   // [0 - 6]
   // Creates 2^n tiles in that dimension
   int tileRowsLog2;
@@ -25,16 +26,6 @@ struct AvifOptions {
   // 2 = 4:2:2
   // 3 = 4:4:4
   int subsample;
-  // Extra chroma compression
-  bool chromaDeltaQ;
-  // 0-7
-  int sharpness;
-  // 0 = auto
-  // 1 = PSNR
-  // 2 = SSIM
-  int tune;
-  // 0-50
-  int denoiseLevel;
 };
 
 thread_local const val Uint8Array = val::global("Uint8Array");
@@ -58,19 +49,18 @@ val encode(std::string buffer, int width, int height, AvifOptions options) {
       break;
   }
 
-  bool lossless = options.cqLevel == AVIF_QUANTIZER_LOSSLESS &&
-                  options.cqAlphaLevel <= AVIF_QUANTIZER_LOSSLESS &&
-                  format == AVIF_PIXEL_FORMAT_YUV444;
-
   avifImage* image = avifImageCreate(width, height, depth, format);
 
-  if (lossless) {
+  if (options.maxQuantizer == AVIF_QUANTIZER_LOSSLESS &&
+      options.minQuantizer == AVIF_QUANTIZER_LOSSLESS &&
+      options.minQuantizerAlpha == AVIF_QUANTIZER_LOSSLESS &&
+      options.maxQuantizerAlpha == AVIF_QUANTIZER_LOSSLESS && format == AVIF_PIXEL_FORMAT_YUV444) {
     image->matrixCoefficients = AVIF_MATRIX_COEFFICIENTS_IDENTITY;
   } else {
-    image->matrixCoefficients = AVIF_MATRIX_COEFFICIENTS_BT601;
+    image->matrixCoefficients = AVIF_MATRIX_COEFFICIENTS_BT709;
   }
 
-  uint8_t* rgba = reinterpret_cast<uint8_t*>(const_cast<char*>(buffer.data()));
+  uint8_t* rgba = (uint8_t*)buffer.c_str();
 
   avifRGBImage srcRGB;
   avifRGBImageSetDefaults(&srcRGB, image);
@@ -79,44 +69,14 @@ val encode(std::string buffer, int width, int height, AvifOptions options) {
   avifImageRGBToYUV(image, &srcRGB);
 
   avifEncoder* encoder = avifEncoderCreate();
-
-  if (lossless) {
-    encoder->minQuantizer = AVIF_QUANTIZER_LOSSLESS;
-    encoder->maxQuantizer = AVIF_QUANTIZER_LOSSLESS;
-    encoder->minQuantizerAlpha = AVIF_QUANTIZER_LOSSLESS;
-    encoder->maxQuantizerAlpha = AVIF_QUANTIZER_LOSSLESS;
-  } else {
-    encoder->minQuantizer = AVIF_QUANTIZER_BEST_QUALITY;
-    encoder->maxQuantizer = AVIF_QUANTIZER_WORST_QUALITY;
-    encoder->minQuantizerAlpha = AVIF_QUANTIZER_BEST_QUALITY;
-    encoder->maxQuantizerAlpha = AVIF_QUANTIZER_WORST_QUALITY;
-    avifEncoderSetCodecSpecificOption(encoder, "end-usage", "q");
-    avifEncoderSetCodecSpecificOption(encoder, "cq-level", std::to_string(options.cqLevel).c_str());
-    avifEncoderSetCodecSpecificOption(encoder, "sharpness",
-                                      std::to_string(options.sharpness).c_str());
-
-    if (options.cqAlphaLevel != -1) {
-      avifEncoderSetCodecSpecificOption(encoder, "alpha:cq-level",
-                                        std::to_string(options.cqAlphaLevel).c_str());
-    }
-
-    if (options.tune == 2 || (options.tune == 0 && options.cqLevel <= 32)) {
-      avifEncoderSetCodecSpecificOption(encoder, "tune", "ssim");
-    }
-
-    if (options.chromaDeltaQ) {
-      avifEncoderSetCodecSpecificOption(encoder, "enable-chroma-deltaq", "1");
-    }
-
-    avifEncoderSetCodecSpecificOption(encoder, "color:denoise-noise-level",
-                                      std::to_string(options.denoiseLevel).c_str());
-  }
-
   encoder->maxThreads = emscripten_num_logical_cores();
+  encoder->minQuantizer = options.minQuantizer;
+  encoder->maxQuantizer = options.maxQuantizer;
+  encoder->minQuantizerAlpha = options.minQuantizerAlpha;
+  encoder->maxQuantizerAlpha = options.maxQuantizerAlpha;
   encoder->tileRowsLog2 = options.tileRowsLog2;
   encoder->tileColsLog2 = options.tileColsLog2;
   encoder->speed = options.speed;
-
   avifResult encodeResult = avifEncoderWrite(encoder, image, &output);
   auto js_result = val::null();
   if (encodeResult == AVIF_RESULT_OK) {
@@ -131,15 +91,13 @@ val encode(std::string buffer, int width, int height, AvifOptions options) {
 
 EMSCRIPTEN_BINDINGS(my_module) {
   value_object<AvifOptions>("AvifOptions")
-      .field("cqLevel", &AvifOptions::cqLevel)
-      .field("cqAlphaLevel", &AvifOptions::cqAlphaLevel)
+      .field("minQuantizer", &AvifOptions::minQuantizer)
+      .field("maxQuantizer", &AvifOptions::maxQuantizer)
+      .field("minQuantizerAlpha", &AvifOptions::minQuantizerAlpha)
+      .field("maxQuantizerAlpha", &AvifOptions::maxQuantizerAlpha)
       .field("tileRowsLog2", &AvifOptions::tileRowsLog2)
       .field("tileColsLog2", &AvifOptions::tileColsLog2)
       .field("speed", &AvifOptions::speed)
-      .field("chromaDeltaQ", &AvifOptions::chromaDeltaQ)
-      .field("sharpness", &AvifOptions::sharpness)
-      .field("tune", &AvifOptions::tune)
-      .field("denoiseLevel", &AvifOptions::denoiseLevel)
       .field("subsample", &AvifOptions::subsample);
 
   function("encode", &encode);

codecs/avif/enc/avif_enc.d.ts

@@ -1,20 +1,12 @@
-export const enum AVIFTune {
-  auto,
-  psnr,
-  ssim,
-}
-
 export interface EncodeOptions {
-  cqLevel: number;
-  denoiseLevel: number;
-  cqAlphaLevel: number;
+  minQuantizer: number;
+  maxQuantizer: number;
+  minQuantizerAlpha: number;
+  maxQuantizerAlpha: number;
   tileRowsLog2: number;
   tileColsLog2: number;
   speed: number;
   subsample: number;
-  chromaDeltaQ: boolean;
-  sharpness: number;
-  tune: AVIFTune;
 }
 
 export interface AVIFModule extends EmscriptenWasm.Module {

codecs/avif/enc/avif_enc_mt.worker.js

@@ -1 +1,144 @@
-var threadInfoStruct=0;var selfThreadId=0;var parentThreadId=0;var initializedJS=false;var Module={};function threadPrintErr(){var text=Array.prototype.slice.call(arguments).join(" ");console.error(text)}function threadAlert(){var text=Array.prototype.slice.call(arguments).join(" ");postMessage({cmd:"alert",text:text,threadId:selfThreadId})}var err=threadPrintErr;this.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);Module["wasmModule"]=null;receiveInstance(instance);return instance.exports};this.onmessage=function(e){try{if(e.data.cmd==="load"){Module["wasmModule"]=e.data.wasmModule;Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["ENVIRONMENT_IS_PTHREAD"]=true;import(e.data.urlOrBlob).then(function(avif_enc_mt){return avif_enc_mt.default(Module)}).then(function(instance){Module=instance;postMessage({"cmd":"loaded"})})}else if(e.data.cmd==="objectTransfer"){Module["PThread"].receiveObjectTransfer(e.data)}else if(e.data.cmd==="run"){Module["__performance_now_clock_drift"]=performance.now()-e.data.time;threadInfoStruct=e.data.threadInfoStruct;Module["registerPthreadPtr"](threadInfoStruct,/*isMainBrowserThread=*/0,/*isMainRuntimeThread=*/0);selfThreadId=e.data.selfThreadId;parentThreadId=e.data.parentThreadId;var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["_emscripten_tls_init"]();Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].setThreadStatus(Module["_pthread_self"](),1);if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["dynCall"]("ii",e.data.start_routine,[e.data.arg]);if(!Module["getNoExitRuntime"]())Module["PThread"].threadExit(result)}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){Atomics.store(Module["HEAPU32"],(threadInfoStruct+4)>>/*C_STRUCTS.pthread.threadExitCode*/2,(ex instanceof Module["ExitStatus"])?ex.status:-2);/*A custom entry specific to Emscripten denoting that the thread crashed.*/Atomics.store(Module["HEAPU32"],(threadInfoStruct+0)>>/*C_STRUCTS.pthread.threadStatus*/2,1);Module["_emscripten_futex_wake"](threadInfoStruct+0,/*C_STRUCTS.pthread.threadStatus*/2147483647);if(!(ex instanceof Module["ExitStatus"]))throw ex}}}else if(e.data.cmd==="cancel"){if(threadInfoStruct){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(threadInfoStruct){Module["_emscripten_current_thread_process_queued_calls"]()}}else{err("worker.js received unknown command "+e.data.cmd);err(e.data)}}catch(ex){err("worker.js onmessage() captured an uncaught exception: "+ex);if(ex&&ex.stack)err(ex.stack);throw ex}};
+/**
+ * @license
+ * Copyright 2015 The Emscripten Authors
+ * SPDX-License-Identifier: MIT
+ */
+
+// Pthread Web Worker startup routine:
+// This is the entry point file that is loaded first by each Web Worker
+// that executes pthreads on the Emscripten application.
+
+// Thread-local:
+var threadInfoStruct = 0; // Info area for this thread in Emscripten HEAP (shared). If zero, this worker is not currently hosting an executing pthread.
+var selfThreadId = 0; // The ID of this thread. 0 if not hosting a pthread.
+var parentThreadId = 0; // The ID of the parent pthread that launched this thread.
+var initializedJS = false; // Guard variable for one-time init of the JS state (currently only embind types registration)
+
+var Module = {};
+
+function threadPrintErr() {
+  var text = Array.prototype.slice.call(arguments).join(' ');
+  console.error(text);
+}
+function threadAlert() {
+  var text = Array.prototype.slice.call(arguments).join(' ');
+  postMessage({cmd: 'alert', text: text, threadId: selfThreadId});
+}
+var err = threadPrintErr;
+this.alert = threadAlert;
+
+Module['instantiateWasm'] = function(info, receiveInstance) {
+  // Instantiate from the module posted from the main thread.
+  // We can just use sync instantiation in the worker.
+  var instance = new WebAssembly.Instance(Module['wasmModule'], info);
+  // We don't need the module anymore; new threads will be spawned from the main thread.
+  Module['wasmModule'] = null;
+  receiveInstance(instance); // The second 'module' parameter is intentionally null here, we don't need to keep a ref to the Module object from here.
+  return instance.exports;
+};
+
+this.onmessage = function(e) {
+  try {
+    if (e.data.cmd === 'load') { // Preload command that is called once per worker to parse and load the Emscripten code.
+
+      // Module and memory were sent from main thread
+      Module['wasmModule'] = e.data.wasmModule;
+
+      Module['wasmMemory'] = e.data.wasmMemory;
+
+      Module['buffer'] = Module['wasmMemory'].buffer;
+
+      Module['ENVIRONMENT_IS_PTHREAD'] = true;
+
+      import(e.data.urlOrBlob).then(function(avif_enc_mt) {
+        return avif_enc_mt.default(Module);
+      }).then(function(instance) {
+        Module = instance;
+        postMessage({ 'cmd': 'loaded' });
+      });
+    } else if (e.data.cmd === 'objectTransfer') {
+      Module['PThread'].receiveObjectTransfer(e.data);
+    } else if (e.data.cmd === 'run') {
+      // This worker was idle, and now should start executing its pthread entry
+      // point.
+      // performance.now() is specced to return a wallclock time in msecs since
+      // that Web Worker/main thread launched. However for pthreads this can
+      // cause subtle problems in emscripten_get_now() as this essentially
+      // would measure time from pthread_create(), meaning that the clocks
+      // between each threads would be wildly out of sync. Therefore sync all
+      // pthreads to the clock on the main browser thread, so that different
+      // threads see a somewhat coherent clock across each of them
+      // (+/- 0.1msecs in testing).
+      Module['__performance_now_clock_drift'] = performance.now() - e.data.time;
+      threadInfoStruct = e.data.threadInfoStruct;
+
+      // Pass the thread address inside the asm.js scope to store it for fast access that avoids the need for a FFI out.
+      Module['registerPthreadPtr'](threadInfoStruct, /*isMainBrowserThread=*/0, /*isMainRuntimeThread=*/0);
+
+      selfThreadId = e.data.selfThreadId;
+      parentThreadId = e.data.parentThreadId;
+      // Establish the stack frame for this thread in global scope
+      // The stack grows downwards
+      var max = e.data.stackBase;
+      var top = e.data.stackBase + e.data.stackSize;
+      // Also call inside JS module to set up the stack frame for this pthread in JS module scope
+      Module['establishStackSpace'](top, max);
+      Module['_emscripten_tls_init']();
+
+      Module['PThread'].receiveObjectTransfer(e.data);
+      Module['PThread'].setThreadStatus(Module['_pthread_self'](), 1/*EM_THREAD_STATUS_RUNNING*/);
+
+      // Embind must initialize itself on all threads, as it generates support JS.
+      // We only do this once per worker since they get reused
+      if (!initializedJS) {
+        Module['___embind_register_native_and_builtin_types']();
+        initializedJS = true;
+      }
+
+      try {
+        // pthread entry points are always of signature 'void *ThreadMain(void *arg)'
+        // Native codebases sometimes spawn threads with other thread entry point signatures,
+        // such as void ThreadMain(void *arg), void *ThreadMain(), or void ThreadMain().
+        // That is not acceptable per C/C++ specification, but x86 compiler ABI extensions
+        // enable that to work. If you find the following line to crash, either change the signature
+        // to "proper" void *ThreadMain(void *arg) form, or try linking with the Emscripten linker
+        // flag -s EMULATE_FUNCTION_POINTER_CASTS=1 to add in emulation for this x86 ABI extension.
+        var result = Module['dynCall']('ii', e.data.start_routine, [e.data.arg]);
+
+        // The thread might have finished without calling pthread_exit(). If so, then perform the exit operation ourselves.
+        // (This is a no-op if explicit pthread_exit() had been called prior.)
+        if (!Module['getNoExitRuntime']())
+          Module['PThread'].threadExit(result);
+      } catch(ex) {
+        if (ex === 'Canceled!') {
+          Module['PThread'].threadCancel();
+        } else if (ex != 'unwind') {
+          Atomics.store(Module['HEAPU32'], (threadInfoStruct + 4 /*C_STRUCTS.pthread.threadExitCode*/ ) >> 2, (ex instanceof Module['ExitStatus']) ? ex.status : -2 /*A custom entry specific to Emscripten denoting that the thread crashed.*/);
+
+          Atomics.store(Module['HEAPU32'], (threadInfoStruct + 0 /*C_STRUCTS.pthread.threadStatus*/ ) >> 2, 1); // Mark the thread as no longer running.
+          Module['_emscripten_futex_wake'](threadInfoStruct + 0 /*C_STRUCTS.pthread.threadStatus*/, 0x7FFFFFFF/*INT_MAX*/); // Wake all threads waiting on this thread to finish.
+          if (!(ex instanceof Module['ExitStatus'])) throw ex;
+        }
+      }
+    } else if (e.data.cmd === 'cancel') { // Main thread is asking for a pthread_cancel() on this thread.
+      if (threadInfoStruct) {
+        Module['PThread'].threadCancel();
+      }
+    } else if (e.data.target === 'setimmediate') {
+      // no-op
+    } else if (e.data.cmd === 'processThreadQueue') {
+      if (threadInfoStruct) { // If this thread is actually running?
+        Module['_emscripten_current_thread_process_queued_calls']();
+      }
+    } else {
+      err('worker.js received unknown command ' + e.data.cmd);
+      err(e.data);
+    }
+  } catch(ex) {
+    err('worker.js onmessage() captured an uncaught exception: ' + ex);
+    if (ex && ex.stack) err(ex.stack);
+    throw ex;
+  }
+};
+
+

codecs/avif/helper.Makefile

@@ -32,7 +32,6 @@ $(OUT_JS): $(OUT_CPP) $(LIBAOM_OUT) $(CODEC_OUT)
 		$(LDFLAGS) \
 		$(OUT_FLAGS) \
 		--bind \
-		--closure 1 \
 		-s ALLOW_MEMORY_GROWTH=1 \
 		-s MODULARIZE=1 \
 		-s TEXTDECODER=2 \
@@ -44,7 +43,7 @@ $(OUT_JS): $(OUT_CPP) $(LIBAOM_OUT) $(CODEC_OUT)
 
 $(CODEC_OUT): $(CODEC_DIR)/CMakeLists.txt $(LIBAOM_OUT)
 	emcmake cmake \
-		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DBUILD_SHARED_LIBS=0 \
 		-DAVIF_CODEC_AOM=1 \
 		-DAOM_LIBRARY=$(LIBAOM_OUT) \
@@ -56,7 +55,7 @@ $(CODEC_OUT): $(CODEC_DIR)/CMakeLists.txt $(LIBAOM_OUT)
 
 $(LIBAOM_OUT): $(LIBAOM_DIR)/CMakeLists.txt
 	emcmake cmake \
-		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DENABLE_CCACHE=0 \
 		-DAOM_TARGET_CPU=generic \
 		-DENABLE_DOCS=0 \

codecs/hqx/pkg/squooshhqx.d.ts

@@ -14,6 +14,7 @@ export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembl
 export interface InitOutput {
   readonly memory: WebAssembly.Memory;
   readonly resize: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
+  readonly __wbindgen_add_to_stack_pointer: (a: number) => number;
   readonly __wbindgen_malloc: (a: number) => number;
   readonly __wbindgen_free: (a: number, b: number) => void;
 }
@@ -27,4 +28,3 @@ export interface InitOutput {
 * @returns {Promise<InitOutput>}
 */
 export default function init (module_or_path?: InitInput | Promise<InitInput>): Promise<InitOutput>;
-        

codecs/hqx/pkg/squooshhqx.js

@@ -37,14 +37,19 @@ function getArrayU32FromWasm0(ptr, len) {
 * @returns {Uint32Array}
 */
 export function resize(input_image, input_width, input_height, factor) {
+    try {
+        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
         var ptr0 = passArray32ToWasm0(input_image, wasm.__wbindgen_malloc);
         var len0 = WASM_VECTOR_LEN;
-    wasm.resize(8, ptr0, len0, input_width, input_height, factor);
-    var r0 = getInt32Memory0()[8 / 4 + 0];
-    var r1 = getInt32Memory0()[8 / 4 + 1];
+        wasm.resize(retptr, ptr0, len0, input_width, input_height, factor);
+        var r0 = getInt32Memory0()[retptr / 4 + 0];
+        var r1 = getInt32Memory0()[retptr / 4 + 1];
         var v1 = getArrayU32FromWasm0(r0, r1).slice();
         wasm.__wbindgen_free(r0, r1 * 4);
         return v1;
+    } finally {
+        wasm.__wbindgen_add_to_stack_pointer(16);
+    }
 }
 
 async function load(module, imports) {
@@ -82,7 +87,7 @@ async function load(module, imports) {
 
 async function init(input) {
     if (typeof input === 'undefined') {
-        input = import.meta.url.replace(/\.js$/, '_bg.wasm');
+        input = new URL('squooshhqx_bg.wasm', import.meta.url);
     }
     const imports = {};
 

codecs/hqx/pkg/squooshhqx_bg.d.ts

@@ -1,6 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-export const memory: WebAssembly.Memory;
-export function resize(a: number, b: number, c: number, d: number, e: number, f: number): void;
-export function __wbindgen_malloc(a: number): number;
-export function __wbindgen_free(a: number, b: number): void;

codecs/jxl/Makefile

@@ -1,5 +1,5 @@
 CODEC_URL = https://gitlab.com/wg1/jpeg-xl.git
-CODEC_VERSION = ab7c5e9b6795134377aa4846ceaae2c5bc504f76
+CODEC_VERSION = 5175d11717f3c48cf506a2c0e0afb070392ae296
 CODEC_DIR = node_modules/jxl
 CODEC_BUILD_ROOT := $(CODEC_DIR)/build
 CODEC_MT_BUILD_DIR := $(CODEC_BUILD_ROOT)/mt

codecs/jxl/enc/jxl_enc.cpp

@@ -2,8 +2,8 @@
 #include <emscripten/val.h>
 
 #include "lib/jxl/base/thread_pool_internal.h"
-#include "lib/jxl/enc_external_image.h"
 #include "lib/jxl/enc_file.h"
+#include "lib/jxl/external_image.h"
 
 using namespace emscripten;
 
@@ -18,7 +18,6 @@ struct JXLOptions {
   int epf;
   int nearLossless;
   bool lossyPalette;
-  size_t decodingSpeedTier;
 };
 
 val encode(std::string image, int width, int height, JXLOptions options) {
@@ -36,7 +35,6 @@ val encode(std::string image, int width, int height, JXLOptions options) {
   cparams.epf = options.epf;
   cparams.speed_tier = static_cast<jxl::SpeedTier>(options.speed);
   cparams.near_lossless = options.nearLossless;
-  cparams.decoding_speed_tier = options.decodingSpeedTier;
 
   if (options.lossyPalette) {
     cparams.lossy_palette = true;
@@ -90,7 +88,7 @@ val encode(std::string image, int width, int height, JXLOptions options) {
 
   uint8_t* inBuffer = (uint8_t*)image.c_str();
 
-  auto result = jxl::ConvertFromExternal(
+  auto result = jxl::ConvertImage(
       jxl::Span<const uint8_t>(reinterpret_cast<const uint8_t*>(image.data()), image.size()), width,
       height, jxl::ColorEncoding::SRGB(/*is_gray=*/false), /*has_alpha=*/true,
       /*alpha_is_premultiplied=*/false, /*bits_per_sample=*/8, /*endiannes=*/JXL_LITTLE_ENDIAN,
@@ -115,7 +113,6 @@ EMSCRIPTEN_BINDINGS(my_module) {
       .field("progressive", &JXLOptions::progressive)
       .field("nearLossless", &JXLOptions::nearLossless)
       .field("lossyPalette", &JXLOptions::lossyPalette)
-      .field("decodingSpeedTier", &JXLOptions::decodingSpeedTier)
       .field("epf", &JXLOptions::epf);
 
   function("encode", &encode);

codecs/jxl/enc/jxl_enc.d.ts

@@ -5,7 +5,6 @@ export interface EncodeOptions {
   epf: number;
   nearLossless: number;
   lossyPalette: boolean;
-  decodingSpeedTier: number;
 }
 
 export interface JXLModule extends EmscriptenWasm.Module {

codecs/jxl/enc/jxl_enc.js

@@ -50,9 +50,9 @@ v.push(p+"}\n");k=Ya(v).apply(null,q);l=b-1;if(!f.hasOwnProperty(n))throw new Oa
 readValueFromPointer:d},{ja:!0})},k:function(a,b){b=U(b);var c="std::string"===b;T(a,{name:b,fromWireType:function(d){var g=K[d>>2];if(c)for(var h=d+4,m=0;m<=g;++m){var k=d+4+m;if(m==g||0==E[k]){h=ia(h,k-h);if(void 0===n)var n=h;else n+=String.fromCharCode(0),n+=h;h=k+1}}else{n=Array(g);for(m=0;m<g;++m)n[m]=String.fromCharCode(E[d+4+m]);n=n.join("")}Z(d);return n},toWireType:function(d,g){g instanceof ArrayBuffer&&(g=new Uint8Array(g));var h="string"===typeof g;h||g instanceof Uint8Array||g instanceof
 Uint8ClampedArray||g instanceof Int8Array||V("Cannot pass non-string to std::string");var m=(c&&h?function(){return ka(g)}:function(){return g.length})(),k=zb(4+m+1);K[k>>2]=m;if(c&&h)ja(g,E,k+4,m+1);else if(h)for(h=0;h<m;++h){var n=g.charCodeAt(h);255<n&&(Z(k),V("String has UTF-16 code units that do not fit in 8 bits"));E[k+4+h]=n}else for(h=0;h<m;++h)E[k+4+h]=g[h];null!==d&&d.push(Z,k);return k},argPackAdvance:8,readValueFromPointer:Ja,T:function(d){Z(d)}})},h:function(a,b,c){c=U(c);if(2===b){var d=
 ma;var g=na;var h=oa;var m=function(){return F};var k=1}else 4===b&&(d=pa,g=qa,h=ra,m=function(){return K},k=2);T(a,{name:c,fromWireType:function(n){for(var p=K[n>>2],q=m(),r,x=n+4,e=0;e<=p;++e){var l=n+4+e*b;if(e==p||0==q[l>>k])x=d(x,l-x),void 0===r?r=x:(r+=String.fromCharCode(0),r+=x),x=l+b}Z(n);return r},toWireType:function(n,p){"string"!==typeof p&&V("Cannot pass non-string to C++ string type "+c);var q=h(p),r=zb(4+q+b);K[r>>2]=q>>k;g(p,r+4,q+b);null!==n&&n.push(Z,r);return r},argPackAdvance:8,
-readValueFromPointer:Ja,T:function(n){Z(n)}})},n:function(a,b,c,d,g,h){Ha[a]={name:U(b),la:Y(c,d),ma:Y(g,h),ba:[]}},e:function(a,b,c,d,g,h,m,k,n,p){Ha[a].ba.push({ea:U(b),ia:c,ga:Y(d,g),ha:h,ta:m,sa:Y(k,n),ua:p})},A:function(a,b){b=U(b);T(a,{za:!0,name:b,argPackAdvance:0,fromWireType:function(){},toWireType:function(){}})},g:Ua,C:function(a){if(0===a)return Va(ib());var b=hb[a];a=void 0===b?U(a):b;return Va(ib()[a])},B:function(a){4<a&&(X[a].aa+=1)},o:function(a,b,c,d){a||V("Cannot use deleted val. handle = "+
+readValueFromPointer:Ja,T:function(n){Z(n)}})},n:function(a,b,c,d,g,h){Ha[a]={name:U(b),la:Y(c,d),ma:Y(g,h),ba:[]}},f:function(a,b,c,d,g,h,m,k,n,p){Ha[a].ba.push({ea:U(b),ia:c,ga:Y(d,g),ha:h,ta:m,sa:Y(k,n),ua:p})},A:function(a,b){b=U(b);T(a,{za:!0,name:b,argPackAdvance:0,fromWireType:function(){},toWireType:function(){}})},g:Ua,C:function(a){if(0===a)return Va(ib());var b=hb[a];a=void 0===b?U(a):b;return Va(ib()[a])},B:function(a){4<a&&(X[a].aa+=1)},o:function(a,b,c,d){a||V("Cannot use deleted val. handle = "+
 a);a=X[a].value;var g=kb[b];if(!g){g="";for(var h=0;h<b;++h)g+=(0!==h?", ":"")+"arg"+h;var m="return function emval_allocator_"+b+"(constructor, argTypes, args) {\n";for(h=0;h<b;++h)m+="var argType"+h+" = requireRegisteredType(Module['HEAP32'][(argTypes >>> 2) + "+h+'], "parameter '+h+'");\nvar arg'+h+" = argType"+h+".readValueFromPointer(args);\nargs += argType"+h+"['argPackAdvance'];\n";g=(new Function("requireRegisteredType","Module","__emval_register",m+("var obj = new constructor("+g+");\nreturn __emval_register(obj);\n}\n")))(jb,
-f,Va);kb[b]=g}return g(a,c,d)},b:function(){C()},t:function(a,b,c){E.copyWithin(a,b,b+c)},f:function(a){a>>>=0;var b=E.length;if(2147483648<a)return!1;for(var c=1;4>=c;c*=2){var d=b*(1+.2/c);d=Math.min(d,a+100663296);d=Math.max(16777216,a,d);0<d%65536&&(d+=65536-d%65536);a:{try{D.grow(Math.min(2147483648,d)-I.byteLength+65535>>>16);ua(D.buffer);var g=1;break a}catch(h){}g=void 0}if(g)return!0}return!1},v:function(a,b){var c=0;mb().forEach(function(d,g){var h=b+c;g=H[a+4*g>>2]=h;for(h=0;h<d.length;++h)J[g++>>
+f,Va);kb[b]=g}return g(a,c,d)},b:function(){C()},t:function(a,b,c){E.copyWithin(a,b,b+c)},e:function(a){a>>>=0;var b=E.length;if(2147483648<a)return!1;for(var c=1;4>=c;c*=2){var d=b*(1+.2/c);d=Math.min(d,a+100663296);d=Math.max(16777216,a,d);0<d%65536&&(d+=65536-d%65536);a:{try{D.grow(Math.min(2147483648,d)-I.byteLength+65535>>>16);ua(D.buffer);var g=1;break a}catch(h){}g=void 0}if(g)return!0}return!1},v:function(a,b){var c=0;mb().forEach(function(d,g){var h=b+c;g=H[a+4*g>>2]=h;for(h=0;h<d.length;++h)J[g++>>
 0]=d.charCodeAt(h);J[g>>0]=0;c+=d.length+1});return 0},w:function(a,b){var c=mb();H[a>>2]=c.length;var d=0;c.forEach(function(g){d+=g.length+1});H[b>>2]=d;return 0},x:function(){return 0},r:function(){},i:function(a,b,c,d){for(var g=0,h=0;h<c;h++){for(var m=H[b+8*h>>2],k=H[b+(8*h+4)>>2],n=0;n<k;n++){var p=E[m+n],q=ob[a];if(0===p||10===p){for(p=0;q[p]&&!(NaN<=p);)++p;p=ha.decode(q.subarray?q.subarray(0,p):new Uint8Array(q.slice(0,p)));(1===a?ea:z)(p);q.length=0}else q.push(p)}g+=k}H[d>>2]=g;return 0},
 a:D,s:function(){},u:function(a,b,c,d){return ub(a,b,c,d)}};
 (function(){function a(g){f.asm=g.exports;L=f.asm.E;M--;f.monitorRunDependencies&&f.monitorRunDependencies(M);0==M&&(null!==Ba&&(clearInterval(Ba),Ba=null),N&&(g=N,N=null,g()))}function b(g){a(g.instance)}function c(g){return Fa().then(function(h){return WebAssembly.instantiate(h,d)}).then(g,function(h){z("failed to asynchronously prepare wasm: "+h);C(h)})}var d={a:Ab};M++;f.monitorRunDependencies&&f.monitorRunDependencies(M);if(f.instantiateWasm)try{return f.instantiateWasm(d,a)}catch(g){return z("Module.instantiateWasm callback failed with error: "+

codecs/jxl/enc/jxl_enc_mt.js

@@ -17,7 +17,7 @@ function Da(a){return 2*a.length}function Ea(a,b){for(var c=0,d="";!(c>=b/4);){v
 function Ga(a){for(var b=0,c=0;c<a.length;++c){var d=a.charCodeAt(c);55296<=d&&57343>=d&&++c;b+=4}return b}function Ha(a,b){e().set(a,b)}var n,aa,ba,ca,fa,ha,ia,ka,ma;function u(a){n=a;D.HEAP8=aa=new Int8Array(a);D.HEAP16=ca=new Int16Array(a);D.HEAP32=ha=new Int32Array(a);D.HEAPU8=ba=new Uint8Array(a);D.HEAPU16=fa=new Uint16Array(a);D.HEAPU32=ia=new Uint32Array(a);D.HEAPF32=ka=new Float32Array(a);D.HEAPF64=ma=new Float64Array(a)}var Ia=D.INITIAL_MEMORY||16777216;
 if(G)m=D.wasmMemory,n=D.buffer;else if(D.wasmMemory)m=D.wasmMemory;else if(m=new WebAssembly.Memory({initial:Ia/65536,maximum:32768,shared:!0}),!(m.buffer instanceof SharedArrayBuffer))throw J("requested a shared WebAssembly.Memory but the returned buffer is not a SharedArrayBuffer, indicating that while the browser has SharedArrayBuffer it does not have WebAssembly threads support - you may need to set a flag"),Error("bad memory");m&&(n=m.buffer);Ia=n.byteLength;u(n);var M,Ja=[],Ka=[],La=[],Ma=[];
 function Na(){var a=D.preRun.shift();Ja.unshift(a)}var N=0,Oa=null,Pa=null;D.preloadedImages={};D.preloadedAudios={};function K(a){if(D.onAbort)D.onAbort(a);G&&console.error("Pthread aborting at "+Error().stack);J(a);va=!0;a=new WebAssembly.RuntimeError("abort("+a+"). Build with -s ASSERTIONS=1 for more info.");oa(a);throw a;}function Qa(){var a=O;return String.prototype.startsWith?a.startsWith("data:application/octet-stream;base64,"):0===a.indexOf("data:application/octet-stream;base64,")}var O="jxl_enc_mt.wasm";
-Qa()||(O=qa(O));function Ra(){try{if(ta)return new Uint8Array(ta);if(ra)return ra(O);throw"both async and sync fetching of the wasm failed";}catch(a){K(a)}}function Sa(){return ta||"function"!==typeof fetch?Promise.resolve().then(Ra):fetch(O,{credentials:"same-origin"}).then(function(a){if(!a.ok)throw"failed to load wasm binary file at '"+O+"'";return a.arrayBuffer()}).catch(function(){return Ra()})}var Ua={60485:function(a,b){setTimeout(function(){Ta(a,b)},0)},60563:function(){throw"Canceled!";}};
+Qa()||(O=qa(O));function Ra(){try{if(ta)return new Uint8Array(ta);if(ra)return ra(O);throw"both async and sync fetching of the wasm failed";}catch(a){K(a)}}function Sa(){return ta||"function"!==typeof fetch?Promise.resolve().then(Ra):fetch(O,{credentials:"same-origin"}).then(function(a){if(!a.ok)throw"failed to load wasm binary file at '"+O+"'";return a.arrayBuffer()}).catch(function(){return Ra()})}var Ua={60805:function(a,b){setTimeout(function(){Ta(a,b)},0)},60883:function(){throw"Canceled!";}};
 function Va(a){for(;0<a.length;){var b=a.shift();if("function"==typeof b)b(D);else{var c=b.Bb;"number"===typeof c?void 0===b.Va?M.get(c)():M.get(c)(b.Va):c(void 0===b.Va?null:b.Va)}}}function Wa(a,b,c){var d;-1!=a.indexOf("j")?d=c&&c.length?D["dynCall_"+a].apply(null,[b].concat(c)):D["dynCall_"+a].call(null,b):d=M.get(b).apply(null,c);return d}D.dynCall=Wa;var P=0,Xa=0,Ya=0;function Za(a,b,c){P=a|0;Ya=b|0;Xa=c|0}D.registerPthreadPtr=Za;
 function $a(a,b){if(0>=a||a>e().length||a&1||0>b)return-28;if(0==b)return 0;2147483647<=b&&(b=Infinity);var c=Atomics.load(A(),Q.rb>>2),d=0;if(c==a&&Atomics.compareExchange(A(),Q.rb>>2,c,0)==c&&(--b,d=1,0>=b))return 1;a=Atomics.notify(A(),a>>2,b);if(0<=a)return a+d;throw"Atomics.notify returned an unexpected value "+a;}D._emscripten_futex_wake=$a;
 function ab(a){if(G)throw"Internal Error! cleanupThread() can only ever be called from main application thread!";if(!a)throw"Internal Error! Null pthread_ptr in cleanupThread!";A()[a+12>>2]=0;(a=Q.Oa[a])&&Q.bb(a.worker)}
@@ -77,10 +77,10 @@ r){if("number"!==typeof r&&"boolean"!==typeof r)throw new TypeError('Cannot conv
 Uint32Array,Float32Array,Float64Array][b];c=W(c);V(a,{name:c,fromWireType:d,argPackAdvance:8,readValueFromPointer:d},{Gb:!0})},u:function(a,b){b=W(b);var c="std::string"===b;V(a,{name:b,fromWireType:function(d){var f=C()[d>>2];if(c)for(var g=d+4,l=0;l<=f;++l){var k=d+4+l;if(l==f||0==v()[k]){g=L(g,k-g);if(void 0===q)var q=g;else q+=String.fromCharCode(0),q+=g;g=k+1}}else{q=Array(f);for(l=0;l<f;++l)q[l]=String.fromCharCode(v()[d+4+l]);q=q.join("")}S(d);return q},toWireType:function(d,f){f instanceof
 ArrayBuffer&&(f=new Uint8Array(f));var g="string"===typeof f;g||f instanceof Uint8Array||f instanceof Uint8ClampedArray||f instanceof Int8Array||X("Cannot pass non-string to std::string");var l=(c&&g?function(){return Aa(f)}:function(){return f.length})(),k=R(4+l+1);C()[k>>2]=l;if(c&&g)za(f,k+4,l+1);else if(g)for(g=0;g<l;++g){var q=f.charCodeAt(g);255<q&&(S(k),X("String has UTF-16 code units that do not fit in 8 bits"));v()[k+4+g]=q}else for(g=0;g<l;++g)v()[k+4+g]=f[g];null!==d&&d.push(S,k);return k},
 argPackAdvance:8,readValueFromPointer:nb,Pa:function(d){S(d)}})},q:function(a,b,c){c=W(c);if(2===b){var d=Ba;var f=Ca;var g=Da;var l=function(){return ea()};var k=1}else 4===b&&(d=Ea,f=Fa,g=Ga,l=function(){return C()},k=2);V(a,{name:c,fromWireType:function(q){for(var t=C()[q>>2],r=l(),w,z=q+4,h=0;h<=t;++h){var p=q+4+h*b;if(h==t||0==r[p>>k])z=d(z,p-z),void 0===w?w=z:(w+=String.fromCharCode(0),w+=z),z=p+b}S(q);return w},toWireType:function(q,t){"string"!==typeof t&&X("Cannot pass non-string to C++ string type "+
-c);var r=g(t),w=R(4+r+b);C()[w>>2]=r>>k;f(t,w+4,r+b);null!==q&&q.push(S,w);return w},argPackAdvance:8,readValueFromPointer:nb,Pa:function(q){S(q)}})},x:function(a,b,c,d,f,g){lb[a]={name:W(b),Ob:Hb(c,d),Pb:Hb(f,g),ob:[]}},k:function(a,b,c,d,f,g,l,k,q,t){lb[a].ob.push({Ab:W(b),Fb:c,Db:Hb(d,f),Eb:g,Yb:l,Xb:Hb(k,q),Zb:t})},T:function(a,b){b=W(b);V(a,{oc:!0,name:b,argPackAdvance:0,fromWireType:function(){},toWireType:function(){}})},H:function(a,b){if(a==b)postMessage({cmd:"processQueuedMainThreadWork"});
+c);var r=g(t),w=R(4+r+b);C()[w>>2]=r>>k;f(t,w+4,r+b);null!==q&&q.push(S,w);return w},argPackAdvance:8,readValueFromPointer:nb,Pa:function(q){S(q)}})},x:function(a,b,c,d,f,g){lb[a]={name:W(b),Ob:Hb(c,d),Pb:Hb(f,g),ob:[]}},l:function(a,b,c,d,f,g,l,k,q,t){lb[a].ob.push({Ab:W(b),Fb:c,Db:Hb(d,f),Eb:g,Yb:l,Xb:Hb(k,q),Zb:t})},T:function(a,b){b=W(b);V(a,{oc:!0,name:b,argPackAdvance:0,fromWireType:function(){},toWireType:function(){}})},H:function(a,b){if(a==b)postMessage({cmd:"processQueuedMainThreadWork"});
 else if(G)postMessage({targetThread:a,cmd:"processThreadQueue"});else{a=(a=Q.Oa[a])&&a.worker;if(!a)return;a.postMessage({cmd:"processThreadQueue"})}return 1},m:yb,W:function(a){if(0===a)return zb(Ob());var b=Nb[a];a=void 0===b?W(a):b;return zb(Ob()[a])},V:function(a){4<a&&(Y[a].jb+=1)},y:function(a,b,c,d){a||X("Cannot use deleted val. handle = "+a);a=Y[a].value;var f=Qb[b];if(!f){f="";for(var g=0;g<b;++g)f+=(0!==g?", ":"")+"arg"+g;var l="return function emval_allocator_"+b+"(constructor, argTypes, args) {\n";
 for(g=0;g<b;++g)l+="var argType"+g+" = requireRegisteredType(Module['HEAP32'][(argTypes >>> 2) + "+g+'], "parameter '+g+'");\nvar arg'+g+" = argType"+g+".readValueFromPointer(args);\nargs += argType"+g+"['argPackAdvance'];\n";f=(new Function("requireRegisteredType","Module","__emval_register",l+("var obj = new constructor("+f+");\nreturn __emval_register(obj);\n}\n")))(Pb,D,zb);Qb[b]=f}return f(a,c,d)},b:function(){K()},n:function(a,b,c){Wb.length=0;var d;for(c>>=2;d=v()[b++];)(d=105>d)&&c&1&&c++,
-Wb.push(d?la()[c++>>1]:A()[c]),++c;return Ua[a].apply(null,Wb)},J:function(){},r:function(){},f:Rb,g:$a,d:hb,p:function(){return Ya|0},o:function(){return Xa|0},C:function(a,b,c){v().copyWithin(a,b,b+c)},E:function(a,b,c){Vb.length=b;c>>=3;for(var d=0;d<b;d++)Vb[d]=la()[c+d];return(0>a?Ua[-a-1]:Cc[a]).apply(null,Vb)},l:function(a){a>>>=0;var b=v().length;if(a<=b||2147483648<a)return!1;for(var c=1;4>=c;c*=2){var d=b*(1+.2/c);d=Math.min(d,a+100663296);d=Math.max(16777216,a,d);0<d%65536&&(d+=65536-d%
+Wb.push(d?la()[c++>>1]:A()[c]),++c;return Ua[a].apply(null,Wb)},J:function(){},r:function(){},f:Rb,g:$a,d:hb,p:function(){return Ya|0},o:function(){return Xa|0},C:function(a,b,c){v().copyWithin(a,b,b+c)},E:function(a,b,c){Vb.length=b;c>>=3;for(var d=0;d<b;d++)Vb[d]=la()[c+d];return(0>a?Ua[-a-1]:Cc[a]).apply(null,Vb)},k:function(a){a>>>=0;var b=v().length;if(a<=b||2147483648<a)return!1;for(var c=1;4>=c;c*=2){var d=b*(1+.2/c);d=Math.min(d,a+100663296);d=Math.max(16777216,a,d);0<d%65536&&(d+=65536-d%
 65536);a:{try{m.grow(Math.min(2147483648,d)-n.byteLength+65535>>>16);u(m.buffer);var f=1;break a}catch(g){}f=void 0}if(f)return!0}return!1},F:function(a,b,c){return Yb(a)?Zb(a,b,c):ac(a,b,c)},e:function(){},G:function(a,b){var c={};b>>=2;c.alpha=!!A()[b];c.depth=!!A()[b+1];c.stencil=!!A()[b+2];c.antialias=!!A()[b+3];c.premultipliedAlpha=!!A()[b+4];c.preserveDrawingBuffer=!!A()[b+5];var d=A()[b+6];c.powerPreference=gc[d];c.failIfMajorPerformanceCaveat=!!A()[b+7];c.Mb=A()[b+8];c.qc=A()[b+9];c.nb=A()[b+
 10];c.zb=A()[b+11];c.tc=A()[b+12];c.uc=A()[b+13];a=Yb(a);!a||c.zb?c=0:(a=a.getContext("webgl",c))?(b=R(8),A()[b+4>>2]=P|0,d={nc:b,attributes:c,version:c.Mb,Za:a},a.canvas&&(a.canvas.$a=d),("undefined"===typeof c.nb||c.nb)&&ec(d),c=b):c=0;return c},O:function(a,b){var c=0;ic().forEach(function(d,f){var g=b+c;f=A()[a+4*f>>2]=g;for(g=0;g<d.length;++g)e()[f++>>0]=d.charCodeAt(g);e()[f>>0]=0;c+=d.length+1});return 0},P:function(a,b){var c=ic();A()[a>>2]=c.length;var d=0;c.forEach(function(f){d+=f.length+
 1});A()[b>>2]=d;return 0},Q:lc,z:mc,s:nc,B:function(){Q.Kb()},a:m||D.wasmMemory,D:ib,U:function(a,b,c,d){if("undefined"===typeof SharedArrayBuffer)return J("Current environment does not support SharedArrayBuffer, pthreads are not available!"),6;if(!a)return J("pthread_create called with a null thread pointer!"),28;var f=[];if(G&&0===f.length)return Ec(687865856,a,b,c,d);var g=0,l=0,k=0,q=0;if(b){var t=A()[b>>2];t+=81920;g=A()[b+8>>2];l=0!==A()[b+12>>2];if(0===A()[b+16>>2]){var r=A()[b+20>>2],w=A()[b+
@@ -89,16 +89,17 @@ t,wa(0<g));r=R(232);for(w=0;58>w;++w)C()[(r>>2)+w]=0;A()[a>>2]=r;A()[r+12>>2]=r;
 (function(){function a(f,g){D.asm=f.exports;M=D.asm.Y;ua=g;if(!G){var l=Q.Ma.length;Q.Ma.forEach(function(k){Q.qb(k,function(){if(!--l&&(N--,D.monitorRunDependencies&&D.monitorRunDependencies(N),0==N&&(null!==Oa&&(clearInterval(Oa),Oa=null),Pa))){var q=Pa;Pa=null;q()}})})}}function b(f){a(f.instance,f.module)}function c(f){return Sa().then(function(g){return WebAssembly.instantiate(g,d)}).then(f,function(g){J("failed to asynchronously prepare wasm: "+g);K(g)})}var d={a:Gc};G||(wa(!G,"addRunDependency cannot be used in a pthread worker"),
 N++,D.monitorRunDependencies&&D.monitorRunDependencies(N));if(D.instantiateWasm)try{return D.instantiateWasm(d,a)}catch(f){return J("Module.instantiateWasm callback failed with error: "+f),!1}(function(){return ta||"function"!==typeof WebAssembly.instantiateStreaming||Qa()||"function"!==typeof fetch?c(b):fetch(O,{credentials:"same-origin"}).then(function(f){return WebAssembly.instantiateStreaming(f,d).then(b,function(g){J("wasm streaming compile failed: "+g);J("falling back to ArrayBuffer instantiation");
 return c(b)})})})().catch(oa);return{}})();var Dc=D.___wasm_call_ctors=function(){return(Dc=D.___wasm_call_ctors=D.asm.Z).apply(null,arguments)},R=D._malloc=function(){return(R=D._malloc=D.asm._).apply(null,arguments)},S=D._free=function(){return(S=D._free=D.asm.$).apply(null,arguments)},zc=D.___errno_location=function(){return(zc=D.___errno_location=D.asm.aa).apply(null,arguments)},Kb=D.___getTypeName=function(){return(Kb=D.___getTypeName=D.asm.ba).apply(null,arguments)};
-D.___embind_register_native_and_builtin_types=function(){return(D.___embind_register_native_and_builtin_types=D.asm.ca).apply(null,arguments)};var oc=D._emscripten_get_global_libc=function(){return(oc=D._emscripten_get_global_libc=D.asm.da).apply(null,arguments)};D.___em_js__initPthreadsJS=function(){return(D.___em_js__initPthreadsJS=D.asm.ea).apply(null,arguments)};
-var Sb=D.stackSave=function(){return(Sb=D.stackSave=D.asm.fa).apply(null,arguments)},gb=D.stackRestore=function(){return(gb=D.stackRestore=D.asm.ga).apply(null,arguments)},Tb=D.stackAlloc=function(){return(Tb=D.stackAlloc=D.asm.ha).apply(null,arguments)},Fc=D._memalign=function(){return(Fc=D._memalign=D.asm.ia).apply(null,arguments)};D._emscripten_main_browser_thread_id=function(){return(D._emscripten_main_browser_thread_id=D.asm.ja).apply(null,arguments)};
-var db=D.___pthread_tsd_run_dtors=function(){return(db=D.___pthread_tsd_run_dtors=D.asm.ka).apply(null,arguments)},eb=D._emscripten_main_thread_process_queued_calls=function(){return(eb=D._emscripten_main_thread_process_queued_calls=D.asm.la).apply(null,arguments)};D._emscripten_current_thread_process_queued_calls=function(){return(D._emscripten_current_thread_process_queued_calls=D.asm.ma).apply(null,arguments)};
-var bb=D._emscripten_register_main_browser_thread_id=function(){return(bb=D._emscripten_register_main_browser_thread_id=D.asm.na).apply(null,arguments)},Ta=D._do_emscripten_dispatch_to_thread=function(){return(Ta=D._do_emscripten_dispatch_to_thread=D.asm.oa).apply(null,arguments)};D._emscripten_async_run_in_main_thread=function(){return(D._emscripten_async_run_in_main_thread=D.asm.pa).apply(null,arguments)};
-D._emscripten_sync_run_in_main_thread=function(){return(D._emscripten_sync_run_in_main_thread=D.asm.qa).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_0=function(){return(D._emscripten_sync_run_in_main_thread_0=D.asm.ra).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_1=function(){return(D._emscripten_sync_run_in_main_thread_1=D.asm.sa).apply(null,arguments)};
-D._emscripten_sync_run_in_main_thread_2=function(){return(D._emscripten_sync_run_in_main_thread_2=D.asm.ta).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_xprintf_varargs=function(){return(D._emscripten_sync_run_in_main_thread_xprintf_varargs=D.asm.ua).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_3=function(){return(D._emscripten_sync_run_in_main_thread_3=D.asm.va).apply(null,arguments)};
-var Ec=D._emscripten_sync_run_in_main_thread_4=function(){return(Ec=D._emscripten_sync_run_in_main_thread_4=D.asm.wa).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_5=function(){return(D._emscripten_sync_run_in_main_thread_5=D.asm.xa).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_6=function(){return(D._emscripten_sync_run_in_main_thread_6=D.asm.ya).apply(null,arguments)};
-D._emscripten_sync_run_in_main_thread_7=function(){return(D._emscripten_sync_run_in_main_thread_7=D.asm.za).apply(null,arguments)};var Ub=D._emscripten_run_in_main_runtime_thread_js=function(){return(Ub=D._emscripten_run_in_main_runtime_thread_js=D.asm.Aa).apply(null,arguments)},$b=D.__emscripten_call_on_thread=function(){return($b=D.__emscripten_call_on_thread=D.asm.Ba).apply(null,arguments)};D._emscripten_tls_init=function(){return(D._emscripten_tls_init=D.asm.Ca).apply(null,arguments)};
-D.dynCall_viijii=function(){return(D.dynCall_viijii=D.asm.Da).apply(null,arguments)};D.dynCall_iiji=function(){return(D.dynCall_iiji=D.asm.Ea).apply(null,arguments)};D.dynCall_jiji=function(){return(D.dynCall_jiji=D.asm.Fa).apply(null,arguments)};D.dynCall_iiiiiijj=function(){return(D.dynCall_iiiiiijj=D.asm.Ga).apply(null,arguments)};D.dynCall_iiiiij=function(){return(D.dynCall_iiiiij=D.asm.Ha).apply(null,arguments)};D.dynCall_iiiiijj=function(){return(D.dynCall_iiiiijj=D.asm.Ia).apply(null,arguments)};
-var cb=D._main_thread_futex=74984;D.PThread=Q;D.PThread=Q;D._pthread_self=pc;D.wasmMemory=m;D.ExitStatus=Hc;var Ic;function Hc(a){this.name="ExitStatus";this.message="Program terminated with exit("+a+")";this.status=a}Pa=function Jc(){Ic||Kc();Ic||(Pa=Jc)};
+D.___embind_register_native_and_builtin_types=function(){return(D.___embind_register_native_and_builtin_types=D.asm.ca).apply(null,arguments)};D.___em_js__initPthreadsJS=function(){return(D.___em_js__initPthreadsJS=D.asm.da).apply(null,arguments)};
+var oc=D._emscripten_get_global_libc=function(){return(oc=D._emscripten_get_global_libc=D.asm.ea).apply(null,arguments)},Sb=D.stackSave=function(){return(Sb=D.stackSave=D.asm.fa).apply(null,arguments)},gb=D.stackRestore=function(){return(gb=D.stackRestore=D.asm.ga).apply(null,arguments)},Tb=D.stackAlloc=function(){return(Tb=D.stackAlloc=D.asm.ha).apply(null,arguments)},Fc=D._memalign=function(){return(Fc=D._memalign=D.asm.ia).apply(null,arguments)};
+D._emscripten_main_browser_thread_id=function(){return(D._emscripten_main_browser_thread_id=D.asm.ja).apply(null,arguments)};var db=D.___pthread_tsd_run_dtors=function(){return(db=D.___pthread_tsd_run_dtors=D.asm.ka).apply(null,arguments)},eb=D._emscripten_main_thread_process_queued_calls=function(){return(eb=D._emscripten_main_thread_process_queued_calls=D.asm.la).apply(null,arguments)};
+D._emscripten_current_thread_process_queued_calls=function(){return(D._emscripten_current_thread_process_queued_calls=D.asm.ma).apply(null,arguments)};var bb=D._emscripten_register_main_browser_thread_id=function(){return(bb=D._emscripten_register_main_browser_thread_id=D.asm.na).apply(null,arguments)},Ta=D._do_emscripten_dispatch_to_thread=function(){return(Ta=D._do_emscripten_dispatch_to_thread=D.asm.oa).apply(null,arguments)};
+D._emscripten_async_run_in_main_thread=function(){return(D._emscripten_async_run_in_main_thread=D.asm.pa).apply(null,arguments)};D._emscripten_sync_run_in_main_thread=function(){return(D._emscripten_sync_run_in_main_thread=D.asm.qa).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_0=function(){return(D._emscripten_sync_run_in_main_thread_0=D.asm.ra).apply(null,arguments)};
+D._emscripten_sync_run_in_main_thread_1=function(){return(D._emscripten_sync_run_in_main_thread_1=D.asm.sa).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_2=function(){return(D._emscripten_sync_run_in_main_thread_2=D.asm.ta).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_xprintf_varargs=function(){return(D._emscripten_sync_run_in_main_thread_xprintf_varargs=D.asm.ua).apply(null,arguments)};
+D._emscripten_sync_run_in_main_thread_3=function(){return(D._emscripten_sync_run_in_main_thread_3=D.asm.va).apply(null,arguments)};var Ec=D._emscripten_sync_run_in_main_thread_4=function(){return(Ec=D._emscripten_sync_run_in_main_thread_4=D.asm.wa).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_5=function(){return(D._emscripten_sync_run_in_main_thread_5=D.asm.xa).apply(null,arguments)};
+D._emscripten_sync_run_in_main_thread_6=function(){return(D._emscripten_sync_run_in_main_thread_6=D.asm.ya).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_7=function(){return(D._emscripten_sync_run_in_main_thread_7=D.asm.za).apply(null,arguments)};
+var Ub=D._emscripten_run_in_main_runtime_thread_js=function(){return(Ub=D._emscripten_run_in_main_runtime_thread_js=D.asm.Aa).apply(null,arguments)},$b=D.__emscripten_call_on_thread=function(){return($b=D.__emscripten_call_on_thread=D.asm.Ba).apply(null,arguments)};D._emscripten_tls_init=function(){return(D._emscripten_tls_init=D.asm.Ca).apply(null,arguments)};D.dynCall_viijii=function(){return(D.dynCall_viijii=D.asm.Da).apply(null,arguments)};
+D.dynCall_iiji=function(){return(D.dynCall_iiji=D.asm.Ea).apply(null,arguments)};D.dynCall_jiji=function(){return(D.dynCall_jiji=D.asm.Fa).apply(null,arguments)};D.dynCall_iiiiiijj=function(){return(D.dynCall_iiiiiijj=D.asm.Ga).apply(null,arguments)};D.dynCall_iiiiij=function(){return(D.dynCall_iiiiij=D.asm.Ha).apply(null,arguments)};D.dynCall_iiiiijj=function(){return(D.dynCall_iiiiijj=D.asm.Ia).apply(null,arguments)};var cb=D._main_thread_futex=4639544;D.PThread=Q;D.PThread=Q;D._pthread_self=pc;
+D.wasmMemory=m;D.ExitStatus=Hc;var Ic;function Hc(a){this.name="ExitStatus";this.message="Program terminated with exit("+a+")";this.status=a}Pa=function Jc(){Ic||Kc();Ic||(Pa=Jc)};
 function Kc(){function a(){if(!Ic&&(Ic=!0,D.calledRun=!0,!va)){Va(Ka);G||Va(La);na(D);if(D.onRuntimeInitialized)D.onRuntimeInitialized();if(!G){if(D.postRun)for("function"==typeof D.postRun&&(D.postRun=[D.postRun]);D.postRun.length;){var b=D.postRun.shift();Ma.unshift(b)}Va(Ma)}}}if(!(0<N)){if(!G){if(D.preRun)for("function"==typeof D.preRun&&(D.preRun=[D.preRun]);D.preRun.length;)Na();Va(Ja)}0<N||(D.setStatus?(D.setStatus("Running..."),setTimeout(function(){setTimeout(function(){D.setStatus("")},
 1);a()},1)):a())}}D.run=Kc;if(D.preInit)for("function"==typeof D.preInit&&(D.preInit=[D.preInit]);0<D.preInit.length;)D.preInit.pop()();G||(noExitRuntime=!0);G?Q.Lb():Kc();
 

codecs/jxl/enc/jxl_enc_mt_simd.js

@@ -17,7 +17,7 @@ function Da(a){return 2*a.length}function Ea(a,b){for(var c=0,d="";!(c>=b/4);){v
 function Ga(a){for(var b=0,c=0;c<a.length;++c){var d=a.charCodeAt(c);55296<=d&&57343>=d&&++c;b+=4}return b}function Ha(a,b){e().set(a,b)}var n,aa,ba,ca,fa,ha,ia,ka,ma;function u(a){n=a;D.HEAP8=aa=new Int8Array(a);D.HEAP16=ca=new Int16Array(a);D.HEAP32=ha=new Int32Array(a);D.HEAPU8=ba=new Uint8Array(a);D.HEAPU16=fa=new Uint16Array(a);D.HEAPU32=ia=new Uint32Array(a);D.HEAPF32=ka=new Float32Array(a);D.HEAPF64=ma=new Float64Array(a)}var Ia=D.INITIAL_MEMORY||16777216;
 if(G)m=D.wasmMemory,n=D.buffer;else if(D.wasmMemory)m=D.wasmMemory;else if(m=new WebAssembly.Memory({initial:Ia/65536,maximum:32768,shared:!0}),!(m.buffer instanceof SharedArrayBuffer))throw J("requested a shared WebAssembly.Memory but the returned buffer is not a SharedArrayBuffer, indicating that while the browser has SharedArrayBuffer it does not have WebAssembly threads support - you may need to set a flag"),Error("bad memory");m&&(n=m.buffer);Ia=n.byteLength;u(n);var M,Ja=[],Ka=[],La=[],Ma=[];
 function Na(){var a=D.preRun.shift();Ja.unshift(a)}var N=0,Oa=null,Pa=null;D.preloadedImages={};D.preloadedAudios={};function K(a){if(D.onAbort)D.onAbort(a);G&&console.error("Pthread aborting at "+Error().stack);J(a);va=!0;a=new WebAssembly.RuntimeError("abort("+a+"). Build with -s ASSERTIONS=1 for more info.");oa(a);throw a;}function Qa(){var a=O;return String.prototype.startsWith?a.startsWith("data:application/octet-stream;base64,"):0===a.indexOf("data:application/octet-stream;base64,")}var O="jxl_enc_mt_simd.wasm";
-Qa()||(O=qa(O));function Ra(){try{if(ta)return new Uint8Array(ta);if(ra)return ra(O);throw"both async and sync fetching of the wasm failed";}catch(a){K(a)}}function Sa(){return ta||"function"!==typeof fetch?Promise.resolve().then(Ra):fetch(O,{credentials:"same-origin"}).then(function(a){if(!a.ok)throw"failed to load wasm binary file at '"+O+"'";return a.arrayBuffer()}).catch(function(){return Ra()})}var Ua={60549:function(a,b){setTimeout(function(){Ta(a,b)},0)},60627:function(){throw"Canceled!";}};
+Qa()||(O=qa(O));function Ra(){try{if(ta)return new Uint8Array(ta);if(ra)return ra(O);throw"both async and sync fetching of the wasm failed";}catch(a){K(a)}}function Sa(){return ta||"function"!==typeof fetch?Promise.resolve().then(Ra):fetch(O,{credentials:"same-origin"}).then(function(a){if(!a.ok)throw"failed to load wasm binary file at '"+O+"'";return a.arrayBuffer()}).catch(function(){return Ra()})}var Ua={60933:function(a,b){setTimeout(function(){Ta(a,b)},0)},61011:function(){throw"Canceled!";}};
 function Va(a){for(;0<a.length;){var b=a.shift();if("function"==typeof b)b(D);else{var c=b.Bb;"number"===typeof c?void 0===b.Va?M.get(c)():M.get(c)(b.Va):c(void 0===b.Va?null:b.Va)}}}function Wa(a,b,c){var d;-1!=a.indexOf("j")?d=c&&c.length?D["dynCall_"+a].apply(null,[b].concat(c)):D["dynCall_"+a].call(null,b):d=M.get(b).apply(null,c);return d}D.dynCall=Wa;var P=0,Xa=0,Ya=0;function Za(a,b,c){P=a|0;Ya=b|0;Xa=c|0}D.registerPthreadPtr=Za;
 function $a(a,b){if(0>=a||a>e().length||a&1||0>b)return-28;if(0==b)return 0;2147483647<=b&&(b=Infinity);var c=Atomics.load(A(),Q.rb>>2),d=0;if(c==a&&Atomics.compareExchange(A(),Q.rb>>2,c,0)==c&&(--b,d=1,0>=b))return 1;a=Atomics.notify(A(),a>>2,b);if(0<=a)return a+d;throw"Atomics.notify returned an unexpected value "+a;}D._emscripten_futex_wake=$a;
 function ab(a){if(G)throw"Internal Error! cleanupThread() can only ever be called from main application thread!";if(!a)throw"Internal Error! Null pthread_ptr in cleanupThread!";A()[a+12>>2]=0;(a=Q.Oa[a])&&Q.bb(a.worker)}
@@ -78,10 +78,10 @@ r){if("number"!==typeof r&&"boolean"!==typeof r)throw new TypeError('Cannot conv
 Uint32Array,Float32Array,Float64Array][b];c=W(c);V(a,{name:c,fromWireType:d,argPackAdvance:8,readValueFromPointer:d},{Gb:!0})},u:function(a,b){b=W(b);var c="std::string"===b;V(a,{name:b,fromWireType:function(d){var f=C()[d>>2];if(c)for(var g=d+4,l=0;l<=f;++l){var k=d+4+l;if(l==f||0==v()[k]){g=L(g,k-g);if(void 0===q)var q=g;else q+=String.fromCharCode(0),q+=g;g=k+1}}else{q=Array(f);for(l=0;l<f;++l)q[l]=String.fromCharCode(v()[d+4+l]);q=q.join("")}S(d);return q},toWireType:function(d,f){f instanceof
 ArrayBuffer&&(f=new Uint8Array(f));var g="string"===typeof f;g||f instanceof Uint8Array||f instanceof Uint8ClampedArray||f instanceof Int8Array||X("Cannot pass non-string to std::string");var l=(c&&g?function(){return Aa(f)}:function(){return f.length})(),k=R(4+l+1);C()[k>>2]=l;if(c&&g)za(f,k+4,l+1);else if(g)for(g=0;g<l;++g){var q=f.charCodeAt(g);255<q&&(S(k),X("String has UTF-16 code units that do not fit in 8 bits"));v()[k+4+g]=q}else for(g=0;g<l;++g)v()[k+4+g]=f[g];null!==d&&d.push(S,k);return k},
 argPackAdvance:8,readValueFromPointer:nb,Pa:function(d){S(d)}})},q:function(a,b,c){c=W(c);if(2===b){var d=Ba;var f=Ca;var g=Da;var l=function(){return ea()};var k=1}else 4===b&&(d=Ea,f=Fa,g=Ga,l=function(){return C()},k=2);V(a,{name:c,fromWireType:function(q){for(var t=C()[q>>2],r=l(),w,z=q+4,h=0;h<=t;++h){var p=q+4+h*b;if(h==t||0==r[p>>k])z=d(z,p-z),void 0===w?w=z:(w+=String.fromCharCode(0),w+=z),z=p+b}S(q);return w},toWireType:function(q,t){"string"!==typeof t&&X("Cannot pass non-string to C++ string type "+
-c);var r=g(t),w=R(4+r+b);C()[w>>2]=r>>k;f(t,w+4,r+b);null!==q&&q.push(S,w);return w},argPackAdvance:8,readValueFromPointer:nb,Pa:function(q){S(q)}})},x:function(a,b,c,d,f,g){lb[a]={name:W(b),Ob:Hb(c,d),Pb:Hb(f,g),ob:[]}},k:function(a,b,c,d,f,g,l,k,q,t){lb[a].ob.push({Ab:W(b),Fb:c,Db:Hb(d,f),Eb:g,Yb:l,Xb:Hb(k,q),Zb:t})},T:function(a,b){b=W(b);V(a,{oc:!0,name:b,argPackAdvance:0,fromWireType:function(){},toWireType:function(){}})},H:function(a,b){if(a==b)postMessage({cmd:"processQueuedMainThreadWork"});
+c);var r=g(t),w=R(4+r+b);C()[w>>2]=r>>k;f(t,w+4,r+b);null!==q&&q.push(S,w);return w},argPackAdvance:8,readValueFromPointer:nb,Pa:function(q){S(q)}})},x:function(a,b,c,d,f,g){lb[a]={name:W(b),Ob:Hb(c,d),Pb:Hb(f,g),ob:[]}},l:function(a,b,c,d,f,g,l,k,q,t){lb[a].ob.push({Ab:W(b),Fb:c,Db:Hb(d,f),Eb:g,Yb:l,Xb:Hb(k,q),Zb:t})},T:function(a,b){b=W(b);V(a,{oc:!0,name:b,argPackAdvance:0,fromWireType:function(){},toWireType:function(){}})},H:function(a,b){if(a==b)postMessage({cmd:"processQueuedMainThreadWork"});
 else if(G)postMessage({targetThread:a,cmd:"processThreadQueue"});else{a=(a=Q.Oa[a])&&a.worker;if(!a)return;a.postMessage({cmd:"processThreadQueue"})}return 1},m:yb,W:function(a){if(0===a)return zb(Ob());var b=Nb[a];a=void 0===b?W(a):b;return zb(Ob()[a])},V:function(a){4<a&&(Y[a].jb+=1)},y:function(a,b,c,d){a||X("Cannot use deleted val. handle = "+a);a=Y[a].value;var f=Qb[b];if(!f){f="";for(var g=0;g<b;++g)f+=(0!==g?", ":"")+"arg"+g;var l="return function emval_allocator_"+b+"(constructor, argTypes, args) {\n";
 for(g=0;g<b;++g)l+="var argType"+g+" = requireRegisteredType(Module['HEAP32'][(argTypes >>> 2) + "+g+'], "parameter '+g+'");\nvar arg'+g+" = argType"+g+".readValueFromPointer(args);\nargs += argType"+g+"['argPackAdvance'];\n";f=(new Function("requireRegisteredType","Module","__emval_register",l+("var obj = new constructor("+f+");\nreturn __emval_register(obj);\n}\n")))(Pb,D,zb);Qb[b]=f}return f(a,c,d)},b:function(){K()},n:function(a,b,c){Wb.length=0;var d;for(c>>=2;d=v()[b++];)(d=105>d)&&c&1&&c++,
-Wb.push(d?la()[c++>>1]:A()[c]),++c;return Ua[a].apply(null,Wb)},J:function(){},r:function(){},f:Rb,g:$a,d:hb,p:function(){return Ya|0},o:function(){return Xa|0},C:function(a,b,c){v().copyWithin(a,b,b+c)},E:function(a,b,c){Vb.length=b;c>>=3;for(var d=0;d<b;d++)Vb[d]=la()[c+d];return(0>a?Ua[-a-1]:Cc[a]).apply(null,Vb)},l:function(a){a>>>=0;var b=v().length;if(a<=b||2147483648<a)return!1;for(var c=1;4>=c;c*=2){var d=b*(1+.2/c);d=Math.min(d,a+100663296);d=Math.max(16777216,a,d);0<d%65536&&(d+=65536-d%
+Wb.push(d?la()[c++>>1]:A()[c]),++c;return Ua[a].apply(null,Wb)},J:function(){},r:function(){},f:Rb,g:$a,d:hb,p:function(){return Ya|0},o:function(){return Xa|0},C:function(a,b,c){v().copyWithin(a,b,b+c)},E:function(a,b,c){Vb.length=b;c>>=3;for(var d=0;d<b;d++)Vb[d]=la()[c+d];return(0>a?Ua[-a-1]:Cc[a]).apply(null,Vb)},k:function(a){a>>>=0;var b=v().length;if(a<=b||2147483648<a)return!1;for(var c=1;4>=c;c*=2){var d=b*(1+.2/c);d=Math.min(d,a+100663296);d=Math.max(16777216,a,d);0<d%65536&&(d+=65536-d%
 65536);a:{try{m.grow(Math.min(2147483648,d)-n.byteLength+65535>>>16);u(m.buffer);var f=1;break a}catch(g){}f=void 0}if(f)return!0}return!1},F:function(a,b,c){return Yb(a)?Zb(a,b,c):ac(a,b,c)},e:function(){},G:function(a,b){var c={};b>>=2;c.alpha=!!A()[b];c.depth=!!A()[b+1];c.stencil=!!A()[b+2];c.antialias=!!A()[b+3];c.premultipliedAlpha=!!A()[b+4];c.preserveDrawingBuffer=!!A()[b+5];var d=A()[b+6];c.powerPreference=gc[d];c.failIfMajorPerformanceCaveat=!!A()[b+7];c.Mb=A()[b+8];c.qc=A()[b+9];c.nb=A()[b+
 10];c.zb=A()[b+11];c.tc=A()[b+12];c.uc=A()[b+13];a=Yb(a);!a||c.zb?c=0:(a=a.getContext("webgl",c))?(b=R(8),A()[b+4>>2]=P|0,d={nc:b,attributes:c,version:c.Mb,Za:a},a.canvas&&(a.canvas.$a=d),("undefined"===typeof c.nb||c.nb)&&ec(d),c=b):c=0;return c},O:function(a,b){var c=0;ic().forEach(function(d,f){var g=b+c;f=A()[a+4*f>>2]=g;for(g=0;g<d.length;++g)e()[f++>>0]=d.charCodeAt(g);e()[f>>0]=0;c+=d.length+1});return 0},P:function(a,b){var c=ic();A()[a>>2]=c.length;var d=0;c.forEach(function(f){d+=f.length+
 1});A()[b>>2]=d;return 0},Q:lc,z:mc,s:nc,B:function(){Q.Kb()},a:m||D.wasmMemory,D:ib,U:function(a,b,c,d){if("undefined"===typeof SharedArrayBuffer)return J("Current environment does not support SharedArrayBuffer, pthreads are not available!"),6;if(!a)return J("pthread_create called with a null thread pointer!"),28;var f=[];if(G&&0===f.length)return Ec(687865856,a,b,c,d);var g=0,l=0,k=0,q=0;if(b){var t=A()[b>>2];t+=81920;g=A()[b+8>>2];l=0!==A()[b+12>>2];if(0===A()[b+16>>2]){var r=A()[b+20>>2],w=A()[b+
@@ -90,16 +90,17 @@ t,wa(0<g));r=R(232);for(w=0;58>w;++w)C()[(r>>2)+w]=0;A()[a>>2]=r;A()[r+12>>2]=r;
 (function(){function a(f,g){D.asm=f.exports;M=D.asm.Y;ua=g;if(!G){var l=Q.Ma.length;Q.Ma.forEach(function(k){Q.qb(k,function(){if(!--l&&(N--,D.monitorRunDependencies&&D.monitorRunDependencies(N),0==N&&(null!==Oa&&(clearInterval(Oa),Oa=null),Pa))){var q=Pa;Pa=null;q()}})})}}function b(f){a(f.instance,f.module)}function c(f){return Sa().then(function(g){return WebAssembly.instantiate(g,d)}).then(f,function(g){J("failed to asynchronously prepare wasm: "+g);K(g)})}var d={a:Gc};G||(wa(!G,"addRunDependency cannot be used in a pthread worker"),
 N++,D.monitorRunDependencies&&D.monitorRunDependencies(N));if(D.instantiateWasm)try{return D.instantiateWasm(d,a)}catch(f){return J("Module.instantiateWasm callback failed with error: "+f),!1}(function(){return ta||"function"!==typeof WebAssembly.instantiateStreaming||Qa()||"function"!==typeof fetch?c(b):fetch(O,{credentials:"same-origin"}).then(function(f){return WebAssembly.instantiateStreaming(f,d).then(b,function(g){J("wasm streaming compile failed: "+g);J("falling back to ArrayBuffer instantiation");
 return c(b)})})})().catch(oa);return{}})();var Dc=D.___wasm_call_ctors=function(){return(Dc=D.___wasm_call_ctors=D.asm.Z).apply(null,arguments)},R=D._malloc=function(){return(R=D._malloc=D.asm._).apply(null,arguments)},S=D._free=function(){return(S=D._free=D.asm.$).apply(null,arguments)},zc=D.___errno_location=function(){return(zc=D.___errno_location=D.asm.aa).apply(null,arguments)},Kb=D.___getTypeName=function(){return(Kb=D.___getTypeName=D.asm.ba).apply(null,arguments)};
-D.___embind_register_native_and_builtin_types=function(){return(D.___embind_register_native_and_builtin_types=D.asm.ca).apply(null,arguments)};var oc=D._emscripten_get_global_libc=function(){return(oc=D._emscripten_get_global_libc=D.asm.da).apply(null,arguments)};D.___em_js__initPthreadsJS=function(){return(D.___em_js__initPthreadsJS=D.asm.ea).apply(null,arguments)};
-var Sb=D.stackSave=function(){return(Sb=D.stackSave=D.asm.fa).apply(null,arguments)},gb=D.stackRestore=function(){return(gb=D.stackRestore=D.asm.ga).apply(null,arguments)},Tb=D.stackAlloc=function(){return(Tb=D.stackAlloc=D.asm.ha).apply(null,arguments)},Fc=D._memalign=function(){return(Fc=D._memalign=D.asm.ia).apply(null,arguments)};D._emscripten_main_browser_thread_id=function(){return(D._emscripten_main_browser_thread_id=D.asm.ja).apply(null,arguments)};
-var db=D.___pthread_tsd_run_dtors=function(){return(db=D.___pthread_tsd_run_dtors=D.asm.ka).apply(null,arguments)},eb=D._emscripten_main_thread_process_queued_calls=function(){return(eb=D._emscripten_main_thread_process_queued_calls=D.asm.la).apply(null,arguments)};D._emscripten_current_thread_process_queued_calls=function(){return(D._emscripten_current_thread_process_queued_calls=D.asm.ma).apply(null,arguments)};
-var bb=D._emscripten_register_main_browser_thread_id=function(){return(bb=D._emscripten_register_main_browser_thread_id=D.asm.na).apply(null,arguments)},Ta=D._do_emscripten_dispatch_to_thread=function(){return(Ta=D._do_emscripten_dispatch_to_thread=D.asm.oa).apply(null,arguments)};D._emscripten_async_run_in_main_thread=function(){return(D._emscripten_async_run_in_main_thread=D.asm.pa).apply(null,arguments)};
-D._emscripten_sync_run_in_main_thread=function(){return(D._emscripten_sync_run_in_main_thread=D.asm.qa).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_0=function(){return(D._emscripten_sync_run_in_main_thread_0=D.asm.ra).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_1=function(){return(D._emscripten_sync_run_in_main_thread_1=D.asm.sa).apply(null,arguments)};
-D._emscripten_sync_run_in_main_thread_2=function(){return(D._emscripten_sync_run_in_main_thread_2=D.asm.ta).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_xprintf_varargs=function(){return(D._emscripten_sync_run_in_main_thread_xprintf_varargs=D.asm.ua).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_3=function(){return(D._emscripten_sync_run_in_main_thread_3=D.asm.va).apply(null,arguments)};
-var Ec=D._emscripten_sync_run_in_main_thread_4=function(){return(Ec=D._emscripten_sync_run_in_main_thread_4=D.asm.wa).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_5=function(){return(D._emscripten_sync_run_in_main_thread_5=D.asm.xa).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_6=function(){return(D._emscripten_sync_run_in_main_thread_6=D.asm.ya).apply(null,arguments)};
-D._emscripten_sync_run_in_main_thread_7=function(){return(D._emscripten_sync_run_in_main_thread_7=D.asm.za).apply(null,arguments)};var Ub=D._emscripten_run_in_main_runtime_thread_js=function(){return(Ub=D._emscripten_run_in_main_runtime_thread_js=D.asm.Aa).apply(null,arguments)},$b=D.__emscripten_call_on_thread=function(){return($b=D.__emscripten_call_on_thread=D.asm.Ba).apply(null,arguments)};D._emscripten_tls_init=function(){return(D._emscripten_tls_init=D.asm.Ca).apply(null,arguments)};
-D.dynCall_viijii=function(){return(D.dynCall_viijii=D.asm.Da).apply(null,arguments)};D.dynCall_iiji=function(){return(D.dynCall_iiji=D.asm.Ea).apply(null,arguments)};D.dynCall_jiji=function(){return(D.dynCall_jiji=D.asm.Fa).apply(null,arguments)};D.dynCall_iiiiiijj=function(){return(D.dynCall_iiiiiijj=D.asm.Ga).apply(null,arguments)};D.dynCall_iiiiij=function(){return(D.dynCall_iiiiij=D.asm.Ha).apply(null,arguments)};D.dynCall_iiiiijj=function(){return(D.dynCall_iiiiijj=D.asm.Ia).apply(null,arguments)};
-var cb=D._main_thread_futex=75048;D.PThread=Q;D.PThread=Q;D._pthread_self=pc;D.wasmMemory=m;D.ExitStatus=Hc;var Ic;function Hc(a){this.name="ExitStatus";this.message="Program terminated with exit("+a+")";this.status=a}Pa=function Jc(){Ic||Kc();Ic||(Pa=Jc)};
+D.___embind_register_native_and_builtin_types=function(){return(D.___embind_register_native_and_builtin_types=D.asm.ca).apply(null,arguments)};D.___em_js__initPthreadsJS=function(){return(D.___em_js__initPthreadsJS=D.asm.da).apply(null,arguments)};
+var oc=D._emscripten_get_global_libc=function(){return(oc=D._emscripten_get_global_libc=D.asm.ea).apply(null,arguments)},Sb=D.stackSave=function(){return(Sb=D.stackSave=D.asm.fa).apply(null,arguments)},gb=D.stackRestore=function(){return(gb=D.stackRestore=D.asm.ga).apply(null,arguments)},Tb=D.stackAlloc=function(){return(Tb=D.stackAlloc=D.asm.ha).apply(null,arguments)},Fc=D._memalign=function(){return(Fc=D._memalign=D.asm.ia).apply(null,arguments)};
+D._emscripten_main_browser_thread_id=function(){return(D._emscripten_main_browser_thread_id=D.asm.ja).apply(null,arguments)};var db=D.___pthread_tsd_run_dtors=function(){return(db=D.___pthread_tsd_run_dtors=D.asm.ka).apply(null,arguments)},eb=D._emscripten_main_thread_process_queued_calls=function(){return(eb=D._emscripten_main_thread_process_queued_calls=D.asm.la).apply(null,arguments)};
+D._emscripten_current_thread_process_queued_calls=function(){return(D._emscripten_current_thread_process_queued_calls=D.asm.ma).apply(null,arguments)};var bb=D._emscripten_register_main_browser_thread_id=function(){return(bb=D._emscripten_register_main_browser_thread_id=D.asm.na).apply(null,arguments)},Ta=D._do_emscripten_dispatch_to_thread=function(){return(Ta=D._do_emscripten_dispatch_to_thread=D.asm.oa).apply(null,arguments)};
+D._emscripten_async_run_in_main_thread=function(){return(D._emscripten_async_run_in_main_thread=D.asm.pa).apply(null,arguments)};D._emscripten_sync_run_in_main_thread=function(){return(D._emscripten_sync_run_in_main_thread=D.asm.qa).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_0=function(){return(D._emscripten_sync_run_in_main_thread_0=D.asm.ra).apply(null,arguments)};
+D._emscripten_sync_run_in_main_thread_1=function(){return(D._emscripten_sync_run_in_main_thread_1=D.asm.sa).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_2=function(){return(D._emscripten_sync_run_in_main_thread_2=D.asm.ta).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_xprintf_varargs=function(){return(D._emscripten_sync_run_in_main_thread_xprintf_varargs=D.asm.ua).apply(null,arguments)};
+D._emscripten_sync_run_in_main_thread_3=function(){return(D._emscripten_sync_run_in_main_thread_3=D.asm.va).apply(null,arguments)};var Ec=D._emscripten_sync_run_in_main_thread_4=function(){return(Ec=D._emscripten_sync_run_in_main_thread_4=D.asm.wa).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_5=function(){return(D._emscripten_sync_run_in_main_thread_5=D.asm.xa).apply(null,arguments)};
+D._emscripten_sync_run_in_main_thread_6=function(){return(D._emscripten_sync_run_in_main_thread_6=D.asm.ya).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_7=function(){return(D._emscripten_sync_run_in_main_thread_7=D.asm.za).apply(null,arguments)};
+var Ub=D._emscripten_run_in_main_runtime_thread_js=function(){return(Ub=D._emscripten_run_in_main_runtime_thread_js=D.asm.Aa).apply(null,arguments)},$b=D.__emscripten_call_on_thread=function(){return($b=D.__emscripten_call_on_thread=D.asm.Ba).apply(null,arguments)};D._emscripten_tls_init=function(){return(D._emscripten_tls_init=D.asm.Ca).apply(null,arguments)};D.dynCall_viijii=function(){return(D.dynCall_viijii=D.asm.Da).apply(null,arguments)};
+D.dynCall_iiji=function(){return(D.dynCall_iiji=D.asm.Ea).apply(null,arguments)};D.dynCall_jiji=function(){return(D.dynCall_jiji=D.asm.Fa).apply(null,arguments)};D.dynCall_iiiiiijj=function(){return(D.dynCall_iiiiiijj=D.asm.Ga).apply(null,arguments)};D.dynCall_iiiiij=function(){return(D.dynCall_iiiiij=D.asm.Ha).apply(null,arguments)};D.dynCall_iiiiijj=function(){return(D.dynCall_iiiiijj=D.asm.Ia).apply(null,arguments)};var cb=D._main_thread_futex=4639672;D.PThread=Q;D.PThread=Q;D._pthread_self=pc;
+D.wasmMemory=m;D.ExitStatus=Hc;var Ic;function Hc(a){this.name="ExitStatus";this.message="Program terminated with exit("+a+")";this.status=a}Pa=function Jc(){Ic||Kc();Ic||(Pa=Jc)};
 function Kc(){function a(){if(!Ic&&(Ic=!0,D.calledRun=!0,!va)){Va(Ka);G||Va(La);na(D);if(D.onRuntimeInitialized)D.onRuntimeInitialized();if(!G){if(D.postRun)for("function"==typeof D.postRun&&(D.postRun=[D.postRun]);D.postRun.length;){var b=D.postRun.shift();Ma.unshift(b)}Va(Ma)}}}if(!(0<N)){if(!G){if(D.preRun)for("function"==typeof D.preRun&&(D.preRun=[D.preRun]);D.preRun.length;)Na();Va(Ja)}0<N||(D.setStatus?(D.setStatus("Running..."),setTimeout(function(){setTimeout(function(){D.setStatus("")},
 1);a()},1)):a())}}D.run=Kc;if(D.preInit)for("function"==typeof D.preInit&&(D.preInit=[D.preInit]);0<D.preInit.length;)D.preInit.pop()();G||(noExitRuntime=!0);G?Q.Lb():Kc();
 

codecs/jxl/enc/jxl_node_enc.js

@@ -50,9 +50,9 @@ v.push(q+"}\n");k=$a(v).apply(null,p);l=b-1;if(!f.hasOwnProperty(m))throw new Qa
 readValueFromPointer:d},{ka:!0})},k:function(a,b){b=V(b);var c="std::string"===b;T(a,{name:b,fromWireType:function(d){var g=J[d>>2];if(c)for(var h=d+4,n=0;n<=g;++n){var m=d+4+n;if(n==g||0==D[m]){h=ma(h,m-h);if(void 0===k)var k=h;else k+=String.fromCharCode(0),k+=h;h=m+1}}else{k=Array(g);for(n=0;n<g;++n)k[n]=String.fromCharCode(D[d+4+n]);k=k.join("")}Z(d);return k},toWireType:function(d,g){g instanceof ArrayBuffer&&(g=new Uint8Array(g));var h="string"===typeof g;h||g instanceof Uint8Array||g instanceof
 Uint8ClampedArray||g instanceof Int8Array||W("Cannot pass non-string to std::string");var n=(c&&h?function(){return oa(g)}:function(){return g.length})(),m=Bb(4+n+1);J[m>>2]=n;if(c&&h)na(g,D,m+4,n+1);else if(h)for(h=0;h<n;++h){var k=g.charCodeAt(h);255<k&&(Z(m),W("String has UTF-16 code units that do not fit in 8 bits"));D[m+4+h]=k}else for(h=0;h<n;++h)D[m+4+h]=g[h];null!==d&&d.push(Z,m);return m},argPackAdvance:8,readValueFromPointer:La,T:function(d){Z(d)}})},h:function(a,b,c){c=V(c);if(2===b){var d=
 qa;var g=ra;var h=sa;var n=function(){return E};var m=1}else 4===b&&(d=ta,g=ua,h=va,n=function(){return J},m=2);T(a,{name:c,fromWireType:function(k){for(var q=J[k>>2],p=n(),r,x=k+4,e=0;e<=q;++e){var l=k+4+e*b;if(e==q||0==p[l>>m])x=d(x,l-x),void 0===r?r=x:(r+=String.fromCharCode(0),r+=x),x=l+b}Z(k);return r},toWireType:function(k,q){"string"!==typeof q&&W("Cannot pass non-string to C++ string type "+c);var p=h(q),r=Bb(4+p+b);J[r>>2]=p>>m;g(q,r+4,p+b);null!==k&&k.push(Z,r);return r},argPackAdvance:8,
-readValueFromPointer:La,T:function(k){Z(k)}})},n:function(a,b,c,d,g,h){Q[a]={name:V(b),ma:Y(c,d),na:Y(g,h),ba:[]}},e:function(a,b,c,d,g,h,n,m,k,q){Q[a].ba.push({fa:V(b),ja:c,ha:Y(d,g),ia:h,ua:n,ta:Y(m,k),va:q})},A:function(a,b){b=V(b);T(a,{Aa:!0,name:b,argPackAdvance:0,fromWireType:function(){},toWireType:function(){}})},g:Wa,C:function(a){if(0===a)return Xa(kb());var b=jb[a];a=void 0===b?V(a):b;return Xa(kb()[a])},B:function(a){4<a&&(X[a].aa+=1)},o:function(a,b,c,d){a||W("Cannot use deleted val. handle = "+
+readValueFromPointer:La,T:function(k){Z(k)}})},n:function(a,b,c,d,g,h){Q[a]={name:V(b),ma:Y(c,d),na:Y(g,h),ba:[]}},f:function(a,b,c,d,g,h,n,m,k,q){Q[a].ba.push({fa:V(b),ja:c,ha:Y(d,g),ia:h,ua:n,ta:Y(m,k),va:q})},A:function(a,b){b=V(b);T(a,{Aa:!0,name:b,argPackAdvance:0,fromWireType:function(){},toWireType:function(){}})},g:Wa,C:function(a){if(0===a)return Xa(kb());var b=jb[a];a=void 0===b?V(a):b;return Xa(kb()[a])},B:function(a){4<a&&(X[a].aa+=1)},o:function(a,b,c,d){a||W("Cannot use deleted val. handle = "+
 a);a=X[a].value;var g=mb[b];if(!g){g="";for(var h=0;h<b;++h)g+=(0!==h?", ":"")+"arg"+h;var n="return function emval_allocator_"+b+"(constructor, argTypes, args) {\n";for(h=0;h<b;++h)n+="var argType"+h+" = requireRegisteredType(Module['HEAP32'][(argTypes >>> 2) + "+h+'], "parameter '+h+'");\nvar arg'+h+" = argType"+h+".readValueFromPointer(args);\nargs += argType"+h+"['argPackAdvance'];\n";g=(new Function("requireRegisteredType","Module","__emval_register",n+("var obj = new constructor("+g+");\nreturn __emval_register(obj);\n}\n")))(lb,
-f,Xa);mb[b]=g}return g(a,c,d)},b:function(){y()},t:function(a,b,c){D.copyWithin(a,b,b+c)},f:function(a){a>>>=0;var b=D.length;if(2147483648<a)return!1;for(var c=1;4>=c;c*=2){var d=b*(1+.2/c);d=Math.min(d,a+100663296);d=Math.max(16777216,a,d);0<d%65536&&(d+=65536-d%65536);a:{try{C.grow(Math.min(2147483648,d)-H.byteLength+65535>>>16);ya(C.buffer);var g=1;break a}catch(h){}g=void 0}if(g)return!0}return!1},v:function(a,b){var c=0;ob().forEach(function(d,g){var h=b+c;g=G[a+4*g>>2]=h;for(h=0;h<d.length;++h)I[g++>>
+f,Xa);mb[b]=g}return g(a,c,d)},b:function(){y()},t:function(a,b,c){D.copyWithin(a,b,b+c)},e:function(a){a>>>=0;var b=D.length;if(2147483648<a)return!1;for(var c=1;4>=c;c*=2){var d=b*(1+.2/c);d=Math.min(d,a+100663296);d=Math.max(16777216,a,d);0<d%65536&&(d+=65536-d%65536);a:{try{C.grow(Math.min(2147483648,d)-H.byteLength+65535>>>16);ya(C.buffer);var g=1;break a}catch(h){}g=void 0}if(g)return!0}return!1},v:function(a,b){var c=0;ob().forEach(function(d,g){var h=b+c;g=G[a+4*g>>2]=h;for(h=0;h<d.length;++h)I[g++>>
 0]=d.charCodeAt(h);I[g>>0]=0;c+=d.length+1});return 0},w:function(a,b){var c=ob();G[a>>2]=c.length;var d=0;c.forEach(function(g){d+=g.length+1});G[b>>2]=d;return 0},x:function(){return 0},r:function(){},i:function(a,b,c,d){for(var g=0,h=0;h<c;h++){for(var n=G[b+8*h>>2],m=G[b+(8*h+4)>>2],k=0;k<m;k++){var q=D[n+k],p=qb[a];if(0===q||10===q){q=1===a?ja:z;var r;for(r=0;p[r]&&!(NaN<=r);)++r;r=la.decode(p.subarray?p.subarray(0,r):new Uint8Array(p.slice(0,r)));q(r);p.length=0}else p.push(q)}g+=m}G[d>>2]=
 g;return 0},a:C,s:function(){},u:function(a,b,c,d){return wb(a,b,c,d)}};
 (function(){function a(g){f.asm=g.exports;K=f.asm.E;L--;f.monitorRunDependencies&&f.monitorRunDependencies(L);0==L&&(null!==Fa&&(clearInterval(Fa),Fa=null),M&&(g=M,M=null,g()))}function b(g){a(g.instance)}function c(g){return Promise.resolve().then(Ia).then(function(h){return WebAssembly.instantiate(h,d)}).then(g,function(h){z("failed to asynchronously prepare wasm: "+h);y(h)})}var d={a:Cb};L++;f.monitorRunDependencies&&f.monitorRunDependencies(L);if(f.instantiateWasm)try{return f.instantiateWasm(d,

codecs/mozjpeg/enc/mozjpeg_enc.cpp

@@ -141,7 +141,6 @@ val encode(std::string image_in, int image_width, int image_height, MozJpegOptio
   jpeg_c_set_bool_param(&cinfo, JBOOLEAN_TRELLIS_EOB_OPT, opts.trellis_opt_zero);
   jpeg_c_set_bool_param(&cinfo, JBOOLEAN_TRELLIS_Q_OPT, opts.trellis_opt_table);
   jpeg_c_set_int_param(&cinfo, JINT_TRELLIS_NUM_LOOPS, opts.trellis_loops);
-  jpeg_c_set_int_param(&cinfo, JINT_DC_SCAN_OPT_MODE, 0);
 
   // A little hacky to build a string for this, but it means we can use
   // set_quality_ratings which does some useful heuristic stuff.

codecs/oxipng/Cargo.lock

@@ -1,7 +1,5 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
-
 [[package]]
 name = "adler"
 version = "0.2.3"
@@ -234,15 +232,6 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "js-sys"
-version = "0.3.48"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc9f84f9b115ce7843d60706df1422a916680bfdfcbdb0447c5614ff9d7e4d78"
-dependencies = [
- "wasm-bindgen",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -361,6 +350,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "once_cell"
+version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
+
 [[package]]
 name = "oxipng"
 version = "4.0.3"
@@ -406,9 +401,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.26"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
 dependencies = [
  "unicode-xid",
 ]
@@ -489,28 +484,24 @@ dependencies = [
  "pest",
 ]
 
-[[package]]
-name = "spmc"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02a8428da277a8e3a15271d79943e80ccc2ef254e78813a166a08d65e4c3ece5"
-
 [[package]]
 name = "squoosh-oxipng"
 version = "0.1.0"
 dependencies = [
+ "crossbeam-channel",
  "libdeflater",
  "log",
+ "once_cell",
  "oxipng",
+ "rayon",
  "wasm-bindgen",
- "wasm-bindgen-rayon",
 ]
 
 [[package]]
 name = "syn"
-version = "1.0.72"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82"
+checksum = "cc60a3d73ea6594cd712d830cc1f0390fd71542d8c8cd24e70cc54cdfd5e05d5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -531,9 +522,9 @@ checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.73"
+version = "0.2.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9"
+checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e"
 dependencies = [
  "cfg-if 1.0.0",
  "wasm-bindgen-macro",
@@ -541,9 +532,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.73"
+version = "0.2.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae"
+checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -556,9 +547,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.73"
+version = "0.2.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f"
+checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -566,9 +557,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.73"
+version = "0.2.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c"
+checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -577,20 +568,8 @@ dependencies = [
  "wasm-bindgen-shared",
 ]
 
-[[package]]
-name = "wasm-bindgen-rayon"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3069d2a42e7a7e3bfde668f84adb5fbc35701ca2b39b27a064cbd5ede4e78194"
-dependencies = [
- "js-sys",
- "rayon",
- "spmc",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.73"
+version = "0.2.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489"
+checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158"

codecs/oxipng/Cargo.toml

@@ -12,15 +12,17 @@ wasm-opt = ["-O", "--no-validation"]
 crate-type = ["cdylib"]
 
 [dependencies]
-oxipng = { version = "4.0.3", default-features = false, features = ["libdeflater"] }
+oxipng = { version = "4.0.1", default-features = false, features = ["libdeflater"] }
 libdeflater = { version = "0.7.1", features = ["freestanding"] }
-wasm-bindgen = "0.2.73"
+wasm-bindgen = "0.2.68"
 log = { version = "0.4.11", features = ["release_max_level_off"] }
-wasm-bindgen-rayon = { version = "1.0", optional = true }
+rayon = { version = "1.5.0", optional = true }
+once_cell = { version = "1.5.2", optional = true }
+crossbeam-channel = { version = "0.5.0", optional = true }
 
 [profile.release]
 lto = true
 opt-level = "s"
 
 [features]
-parallel = ["oxipng/parallel", "wasm-bindgen-rayon"]
+parallel = ["oxipng/parallel", "rayon", "crossbeam-channel", "once_cell"]

codecs/oxipng/build.sh

@@ -6,4 +6,6 @@ rm -rf pkg,{-parallel}
 export CFLAGS="${CFLAGS} -DUNALIGNED_ACCESS_IS_FAST=1"
 wasm-pack build -t web
 RUSTFLAGS='-C target-feature=+atomics,+bulk-memory' wasm-pack build -t web -d pkg-parallel -- -Z build-std=panic_abort,std --features=parallel
+# Workaround https://github.com/rustwasm/wasm-bindgen/issues/2133:
+sed -i "s|maybe_memory:|maybe_memory?:|" pkg-parallel/squoosh_oxipng.d.ts
 rm pkg{,-parallel}/.gitignore

codecs/oxipng/pkg-parallel/snippets/wasm-bindgen-rayon-3d2df09ebec17a22/src/workerHelpers.js

@@ -1,98 +0,0 @@
-/**
- * Copyright 2021 Google Inc. All Rights Reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *     http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Note: we use `wasm_bindgen_worker_`-prefixed message types to make sure
-// we can handle bundling into other files, which might happen to have their
-// own `postMessage`/`onmessage` communication channels.
-//
-// If we didn't take that into the account, we could send much simpler signals
-// like just `0` or whatever, but the code would be less resilient.
-
-function waitForMsgType(target, type) {
-  return new Promise(resolve => {
-    target.addEventListener('message', function onMsg({ data }) {
-      if (data == null || data.type !== type) return;
-      target.removeEventListener('message', onMsg);
-      resolve(data);
-    });
-  });
-}
-
-waitForMsgType(self, 'wasm_bindgen_worker_init').then(async data => {
-  // # Note 1
-  // Our JS should have been generated in
-  // `[out-dir]/snippets/wasm-bindgen-rayon-[hash]/workerHelpers.js`,
-  // resolve the main module via `../../..`.
-  //
-  // This might need updating if the generated structure changes on wasm-bindgen
-  // side ever in the future, but works well with bundlers today. The whole
-  // point of this crate, after all, is to abstract away unstable features
-  // and temporary bugs so that you don't need to deal with them in your code.
-  //
-  // # Note 2
-  // This could be a regular import, but then some bundlers complain about
-  // circular deps.
-  //
-  // Dynamic import could be cheap if this file was inlined into the parent,
-  // which would require us just using `../../..` in `new Worker` below,
-  // but that doesn't work because wasm-pack unconditionally adds
-  // "sideEffects":false (see below).
-  //
-  // OTOH, even though it can't be inlined, it should be still reasonably
-  // cheap since the requested file is already in cache (it was loaded by
-  // the main thread).
-  const pkg = await import('../../..');
-  await pkg.default(data.module, data.memory);
-  postMessage({ type: 'wasm_bindgen_worker_ready' });
-  pkg.wbg_rayon_start_worker(data.receiver);
-});
-
-export async function startWorkers(module, memory, builder) {
-  const workerInit = {
-    type: 'wasm_bindgen_worker_init',
-    module,
-    memory,
-    receiver: builder.receiver()
-  };
-
-  try {
-    await Promise.all(
-      Array.from({ length: builder.numThreads() }, () => {
-        // Self-spawn into a new Worker.
-        //
-        // TODO: while `new URL('...', import.meta.url) becomes a semi-standard
-        // way to get asset URLs relative to the module across various bundlers
-        // and browser, ideally we should switch to `import.meta.resolve`
-        // once it becomes a standard.
-        //
-        // Note: we could use `../../..` as the URL here to inline workerHelpers.js
-        // into the parent entry instead of creating another split point -
-        // this would be preferable from optimization perspective -
-        // however, Webpack then eliminates all message handler code
-        // because wasm-pack produces "sideEffects":false in package.json
-        // unconditionally.
-        //
-        // The only way to work around that is to have side effect code
-        // in an entry point such as Worker file itself.
-        const worker = new Worker(new URL('./workerHelpers.js', import.meta.url), {
-          type: 'module'
-        });
-        worker.postMessage(workerInit);
-        return waitForMsgType(worker, 'wasm_bindgen_worker_ready');
-      })
-    );
-    builder.build();
-  } finally {
-    builder.free();
-  }
-}

codecs/oxipng/pkg-parallel/squoosh_oxipng.d.ts

@@ -3,48 +3,29 @@
 /**
 * @param {Uint8Array} data
 * @param {number} level
-* @param {boolean} interlace
 * @returns {Uint8Array}
 */
-export function optimise(data: Uint8Array, level: number, interlace: boolean): Uint8Array;
+export function optimise(data: Uint8Array, level: number): Uint8Array;
 /**
-* @param {number} num_threads
-* @returns {Promise<any>}
+* @param {number} num
+* @returns {any}
 */
-export function initThreadPool(num_threads: number): Promise<any>;
-/**
-* @param {number} receiver
-*/
-export function wbg_rayon_start_worker(receiver: number): void;
+export function worker_initializer(num: number): any;
 /**
 */
-export class wbg_rayon_PoolBuilder {
-  free(): void;
-/**
-* @returns {number}
-*/
-  numThreads(): number;
-/**
-* @returns {number}
-*/
-  receiver(): number;
+export function start_main_thread(): void;
 /**
 */
-  build(): void;
-}
+export function start_worker_thread(): void;
 
 export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
 
 export interface InitOutput {
-  readonly optimise: (a: number, b: number, c: number, d: number, e: number) => void;
-  readonly __wbg_wbg_rayon_poolbuilder_free: (a: number) => void;
-  readonly wbg_rayon_poolbuilder_numThreads: (a: number) => number;
-  readonly wbg_rayon_poolbuilder_receiver: (a: number) => number;
-  readonly wbg_rayon_poolbuilder_build: (a: number) => void;
-  readonly initThreadPool: (a: number) => number;
-  readonly wbg_rayon_start_worker: (a: number) => void;
+  readonly optimise: (a: number, b: number, c: number, d: number) => void;
+  readonly worker_initializer: (a: number) => number;
+  readonly start_main_thread: () => void;
+  readonly start_worker_thread: () => void;
   readonly __wbindgen_export_0: WebAssembly.Memory;
-  readonly __wbindgen_add_to_stack_pointer: (a: number) => number;
   readonly __wbindgen_malloc: (a: number) => number;
   readonly __wbindgen_free: (a: number, b: number) => void;
   readonly __wbindgen_start: () => void;
@@ -60,3 +41,4 @@ export interface InitOutput {
 * @returns {Promise<InitOutput>}
 */
 export default function init (module_or_path?: InitInput | Promise<InitInput>, maybe_memory?: WebAssembly.Memory): Promise<InitOutput>;
+        

codecs/oxipng/pkg-parallel/squoosh_oxipng.js

@@ -1,6 +1,21 @@
-import { startWorkers } from './snippets/wasm-bindgen-rayon-3d2df09ebec17a22/src/workerHelpers.js';
 
 let wasm;
+let memory;
+
+const heap = new Array(32).fill(undefined);
+
+heap.push(undefined, null, true, false);
+
+let heap_next = heap.length;
+
+function addHeapObject(obj) {
+    if (heap_next === heap.length) heap.push(heap.length + 1);
+    const idx = heap_next;
+    heap_next = heap[idx];
+
+    heap[idx] = obj;
+    return idx;
+}
 
 let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
 
@@ -18,21 +33,6 @@ function getStringFromWasm0(ptr, len) {
     return cachedTextDecoder.decode(getUint8Memory0().slice(ptr, ptr + len));
 }
 
-const heap = new Array(32).fill(undefined);
-
-heap.push(undefined, null, true, false);
-
-let heap_next = heap.length;
-
-function addHeapObject(obj) {
-    if (heap_next === heap.length) heap.push(heap.length + 1);
-    const idx = heap_next;
-    heap_next = heap[idx];
-
-    heap[idx] = obj;
-    return idx;
-}
-
 let WASM_VECTOR_LEN = 0;
 
 function passArray8ToWasm0(arg, malloc) {
@@ -56,22 +56,22 @@ function getArrayU8FromWasm0(ptr, len) {
 /**
 * @param {Uint8Array} data
 * @param {number} level
-* @param {boolean} interlace
 * @returns {Uint8Array}
 */
-export function optimise(data, level, interlace) {
+export function optimise(data, level) {
     try {
-        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+        const retptr = wasm.__wbindgen_export_1.value - 16;
+        wasm.__wbindgen_export_1.value = retptr;
         var ptr0 = passArray8ToWasm0(data, wasm.__wbindgen_malloc);
         var len0 = WASM_VECTOR_LEN;
-        wasm.optimise(retptr, ptr0, len0, level, interlace);
+        wasm.optimise(retptr, ptr0, len0, level);
         var r0 = getInt32Memory0()[retptr / 4 + 0];
         var r1 = getInt32Memory0()[retptr / 4 + 1];
         var v1 = getArrayU8FromWasm0(r0, r1).slice();
         wasm.__wbindgen_free(r0, r1 * 1);
         return v1;
     } finally {
-        wasm.__wbindgen_add_to_stack_pointer(16);
+        wasm.__wbindgen_export_1.value += 16;
     }
 }
 
@@ -89,66 +89,29 @@ function takeObject(idx) {
     return ret;
 }
 /**
-* @param {number} num_threads
-* @returns {Promise<any>}
+* @param {number} num
+* @returns {any}
 */
-export function initThreadPool(num_threads) {
-    var ret = wasm.initThreadPool(num_threads);
+export function worker_initializer(num) {
+    var ret = wasm.worker_initializer(num);
     return takeObject(ret);
 }
 
 /**
-* @param {number} receiver
 */
-export function wbg_rayon_start_worker(receiver) {
-    wasm.wbg_rayon_start_worker(receiver);
+export function start_main_thread() {
+    wasm.start_main_thread();
 }
 
 /**
 */
-export class wbg_rayon_PoolBuilder {
-
-    static __wrap(ptr) {
-        const obj = Object.create(wbg_rayon_PoolBuilder.prototype);
-        obj.ptr = ptr;
-
-        return obj;
-    }
-
-    __destroy_into_raw() {
-        const ptr = this.ptr;
-        this.ptr = 0;
-
-        return ptr;
-    }
-
-    free() {
-        const ptr = this.__destroy_into_raw();
-        wasm.__wbg_wbg_rayon_poolbuilder_free(ptr);
-    }
-    /**
-    * @returns {number}
-    */
-    numThreads() {
-        var ret = wasm.wbg_rayon_poolbuilder_numThreads(this.ptr);
-        return ret >>> 0;
-    }
-    /**
-    * @returns {number}
-    */
-    receiver() {
-        var ret = wasm.wbg_rayon_poolbuilder_receiver(this.ptr);
-        return ret;
-    }
-    /**
-    */
-    build() {
-        wasm.wbg_rayon_poolbuilder_build(this.ptr);
-    }
+export function start_worker_thread() {
+    wasm.start_worker_thread();
 }
 
-async function load(module, imports) {
+async function load(module, imports, maybe_memory) {
     if (typeof Response === 'function' && module instanceof Response) {
+        memory = imports.wbg.memory = new WebAssembly.Memory({initial:17,maximum:16384,shared:true});
         if (typeof WebAssembly.instantiateStreaming === 'function') {
             try {
                 return await WebAssembly.instantiateStreaming(module, imports);
@@ -167,6 +130,7 @@ async function load(module, imports) {
         return await WebAssembly.instantiate(bytes, imports);
 
     } else {
+        memory = imports.wbg.memory = maybe_memory;
         const instance = await WebAssembly.instantiate(module, imports);
 
         if (instance instanceof WebAssembly.Instance) {
@@ -180,13 +144,10 @@ async function load(module, imports) {
 
 async function init(input, maybe_memory) {
     if (typeof input === 'undefined') {
-        input = new URL('squoosh_oxipng_bg.wasm', import.meta.url);
+        input = import.meta.url.replace(/\.js$/, '_bg.wasm');
     }
     const imports = {};
     imports.wbg = {};
-    imports.wbg.__wbindgen_throw = function(arg0, arg1) {
-        throw new Error(getStringFromWasm0(arg0, arg1));
-    };
     imports.wbg.__wbindgen_module = function() {
         var ret = init.__wbindgen_wasm_module;
         return addHeapObject(ret);
@@ -195,18 +156,19 @@ async function init(input, maybe_memory) {
         var ret = wasm.__wbindgen_export_0;
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_startWorkers_914655bb4d5bb5e1 = function(arg0, arg1, arg2) {
-        var ret = startWorkers(takeObject(arg0), takeObject(arg1), wbg_rayon_PoolBuilder.__wrap(arg2));
+    imports.wbg.__wbg_of_6510501edc06d65e = function(arg0, arg1) {
+        var ret = Array.of(takeObject(arg0), takeObject(arg1));
         return addHeapObject(ret);
     };
+    imports.wbg.__wbindgen_throw = function(arg0, arg1) {
+        throw new Error(getStringFromWasm0(arg0, arg1));
+    };
 
     if (typeof input === 'string' || (typeof Request === 'function' && input instanceof Request) || (typeof URL === 'function' && input instanceof URL)) {
         input = fetch(input);
     }
 
-    imports.wbg.memory = maybe_memory || new WebAssembly.Memory({initial:17,maximum:16384,shared:true});
-
-    const { instance, module } = await load(await input, imports);
+    const { instance, module } = await load(await input, imports, maybe_memory);
 
     wasm = instance.exports;
     init.__wbindgen_wasm_module = module;

codecs/oxipng/pkg-parallel/squoosh_oxipng_bg.wasm.d.ts

@@ -1,14 +1,10 @@
 /* tslint:disable */
 /* eslint-disable */
-export function optimise(a: number, b: number, c: number, d: number, e: number): void;
-export function __wbg_wbg_rayon_poolbuilder_free(a: number): void;
-export function wbg_rayon_poolbuilder_numThreads(a: number): number;
-export function wbg_rayon_poolbuilder_receiver(a: number): number;
-export function wbg_rayon_poolbuilder_build(a: number): void;
-export function initThreadPool(a: number): number;
-export function wbg_rayon_start_worker(a: number): void;
+export function optimise(a: number, b: number, c: number, d: number): void;
+export function worker_initializer(a: number): number;
+export function start_main_thread(): void;
+export function start_worker_thread(): void;
 export const __wbindgen_export_0: WebAssembly.Memory;
-export function __wbindgen_add_to_stack_pointer(a: number): number;
 export function __wbindgen_malloc(a: number): number;
 export function __wbindgen_free(a: number, b: number): void;
 export function __wbindgen_start(): void;

codecs/oxipng/pkg/squoosh_oxipng.d.ts

@@ -3,17 +3,15 @@
 /**
 * @param {Uint8Array} data
 * @param {number} level
-* @param {boolean} interlace
 * @returns {Uint8Array}
 */
-export function optimise(data: Uint8Array, level: number, interlace: boolean): Uint8Array;
+export function optimise(data: Uint8Array, level: number): Uint8Array;
 
 export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
 
 export interface InitOutput {
   readonly memory: WebAssembly.Memory;
-  readonly optimise: (a: number, b: number, c: number, d: number, e: number) => void;
-  readonly __wbindgen_add_to_stack_pointer: (a: number) => number;
+  readonly optimise: (a: number, b: number, c: number, d: number) => void;
   readonly __wbindgen_malloc: (a: number) => number;
   readonly __wbindgen_free: (a: number, b: number) => void;
 }
@@ -27,3 +25,4 @@ export interface InitOutput {
 * @returns {Promise<InitOutput>}
 */
 export default function init (module_or_path?: InitInput | Promise<InitInput>): Promise<InitOutput>;
+        

codecs/oxipng/pkg/squoosh_oxipng.js

@@ -40,27 +40,28 @@ function getArrayU8FromWasm0(ptr, len) {
 /**
 * @param {Uint8Array} data
 * @param {number} level
-* @param {boolean} interlace
 * @returns {Uint8Array}
 */
-export function optimise(data, level, interlace) {
+export function optimise(data, level) {
     try {
-        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+        const retptr = wasm.__wbindgen_export_0.value - 16;
+        wasm.__wbindgen_export_0.value = retptr;
         var ptr0 = passArray8ToWasm0(data, wasm.__wbindgen_malloc);
         var len0 = WASM_VECTOR_LEN;
-        wasm.optimise(retptr, ptr0, len0, level, interlace);
+        wasm.optimise(retptr, ptr0, len0, level);
         var r0 = getInt32Memory0()[retptr / 4 + 0];
         var r1 = getInt32Memory0()[retptr / 4 + 1];
         var v1 = getArrayU8FromWasm0(r0, r1).slice();
         wasm.__wbindgen_free(r0, r1 * 1);
         return v1;
     } finally {
-        wasm.__wbindgen_add_to_stack_pointer(16);
+        wasm.__wbindgen_export_0.value += 16;
     }
 }
 
 async function load(module, imports) {
     if (typeof Response === 'function' && module instanceof Response) {
+
         if (typeof WebAssembly.instantiateStreaming === 'function') {
             try {
                 return await WebAssembly.instantiateStreaming(module, imports);
@@ -79,6 +80,7 @@ async function load(module, imports) {
         return await WebAssembly.instantiate(bytes, imports);
 
     } else {
+
         const instance = await WebAssembly.instantiate(module, imports);
 
         if (instance instanceof WebAssembly.Instance) {
@@ -92,7 +94,7 @@ async function load(module, imports) {
 
 async function init(input) {
     if (typeof input === 'undefined') {
-        input = new URL('squoosh_oxipng_bg.wasm', import.meta.url);
+        input = import.meta.url.replace(/\.js$/, '_bg.wasm');
     }
     const imports = {};
     imports.wbg = {};
@@ -104,8 +106,6 @@ async function init(input) {
         input = fetch(input);
     }
 
-
-
     const { instance, module } = await load(await input, imports);
 
     wasm = instance.exports;

codecs/oxipng/pkg/squoosh_oxipng_bg.wasm.d.ts

@@ -1,7 +1,6 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
-export function optimise(a: number, b: number, c: number, d: number, e: number): void;
-export function __wbindgen_add_to_stack_pointer(a: number): number;
+export function optimise(a: number, b: number, c: number, d: number): void;
 export function __wbindgen_malloc(a: number): number;
 export function __wbindgen_free(a: number, b: number): void;

codecs/oxipng/src/lib.rs

@@ -1,11 +1,11 @@
-#[cfg(feature = "parallel")]
-pub use wasm_bindgen_rayon::init_thread_pool;
-
 use oxipng::AlphaOptim;
 use wasm_bindgen::prelude::*;
 
+#[cfg(feature = "parallel")]
+pub mod parallel;
+
 #[wasm_bindgen]
-pub fn optimise(data: &[u8], level: u8, interlace: bool) -> Vec<u8> {
+pub fn optimise(data: &[u8], level: u8) -> Vec<u8> {
     let mut options = oxipng::Options::from_preset(level);
     options.alphas.insert(AlphaOptim::Black);
     options.alphas.insert(AlphaOptim::White);
@@ -13,7 +13,6 @@ pub fn optimise(data: &[u8], level: u8, interlace: bool) -> Vec<u8> {
     options.alphas.insert(AlphaOptim::Down);
     options.alphas.insert(AlphaOptim::Left);
     options.alphas.insert(AlphaOptim::Right);
-    options.interlace = Some(if interlace { 1 } else { 0 });
 
     options.deflate = oxipng::Deflaters::Libdeflater;
     oxipng::optimize_from_memory(data, &options).unwrap_throw()

codecs/oxipng/src/parallel.rs

@@ -0,0 +1,62 @@
+use crossbeam_channel::{bounded, Receiver, Sender};
+use once_cell::sync::OnceCell;
+use wasm_bindgen::prelude::*;
+use wasm_bindgen::JsValue;
+
+#[wasm_bindgen]
+extern "C" {
+    #[wasm_bindgen(js_namespace = Array, js_name = of)]
+    fn array_of_2(a: JsValue, b: JsValue) -> JsValue;
+}
+
+// This is one of the parts that work around Chromium incorrectly implementing postMessage:
+// https://bugs.chromium.org/p/chromium/issues/detail?id=1075645
+//
+// rayon::ThreadPoolBuilder (used below) executes spawn handler to populate the worker pool,
+// and then blocks the current thread until each worker unblocks its (opaque) lock.
+//
+// Normally, we could use postMessage directly inside the spawn handler to
+// post module + memory + threadPtr to each worker, and the block the current thread.
+//
+// However, that bug means that postMessage is currently delayed until the next event loop,
+// which will never spin since we block the current thread, and so the other workers will
+// never be able to unblock us.
+//
+// To work around this problem, we:
+// 1) Expose `worker_initializer` that returns module + memory pair (without threadPtr)
+//    that workers can be initialised with to become native threads.
+//    JavaScript can postMessage this pair in advance, and asynchronously wait for workers
+//    to acknowledge the receipt.
+// 2) Create a global communication channel on the Rust side using crossbeam.
+//    It will be used to send threadPtr to the pre-initialised workers
+//    instead of postMessage.
+// 3) Provide a separate `start_main_thread` that expects all workers to be ready,
+//    and just uses the provided channel to send `threadPtr`s using the
+//    shared memory and blocks the current thread until they're all grabbed.
+// 4) Provide a `worker_initializer` that is expected to be invoked from various workers,
+//    reads one `threadPtr` from the shared channel and starts running it.
+static CHANNEL: OnceCell<(Sender<rayon::ThreadBuilder>, Receiver<rayon::ThreadBuilder>)> =
+    OnceCell::new();
+
+#[wasm_bindgen]
+pub fn worker_initializer(num: usize) -> JsValue {
+    CHANNEL.get_or_init(|| bounded(num));
+    array_of_2(wasm_bindgen::module(), wasm_bindgen::memory())
+}
+
+#[wasm_bindgen]
+pub fn start_main_thread() {
+    let (sender, _) = CHANNEL.get().unwrap();
+
+    rayon::ThreadPoolBuilder::new()
+        .num_threads(sender.capacity().unwrap())
+        .spawn_handler(|thread| Ok(sender.send(thread).unwrap_throw()))
+        .build_global()
+        .unwrap_throw()
+}
+
+#[wasm_bindgen]
+pub fn start_worker_thread() {
+    let (_, receiver) = CHANNEL.get().unwrap();
+    receiver.recv().unwrap_throw().run()
+}

codecs/png/Cargo.lock

@@ -18,12 +18,6 @@ version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
 
-[[package]]
-name = "bytemuck"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bed57e2090563b83ba8f83366628ce535a7584c9afa4c9fc0612a03925c6df58"
-
 [[package]]
 name = "byteorder"
 version = "1.3.4"
@@ -118,21 +112,11 @@ dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "rgb"
-version = "0.8.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "287f3c3f8236abb92d8b7e36797f19159df4b58f0a658cc3fb6dd3004b1f3bd3"
-dependencies = [
- "bytemuck",
-]
-
 [[package]]
 name = "squoosh-png"
 version = "0.1.0"
 dependencies = [
  "png",
- "rgb",
  "wasm-bindgen",
  "web-sys",
 ]

codecs/png/Cargo.toml

@@ -15,7 +15,6 @@ crate-type = ["cdylib"]
 png = "0.16.7"
 wasm-bindgen = "0.2.68"
 web-sys = { version = "0.3.45", features = ["ImageData"] }
-rgb = "0.8.25"
 
 [profile.release]
 lto = true

codecs/png/pkg/squoosh_png.d.ts

@@ -20,6 +20,7 @@ export interface InitOutput {
   readonly encode: (a: number, b: number, c: number, d: number, e: number) => void;
   readonly decode: (a: number, b: number) => number;
   readonly __wbindgen_free: (a: number, b: number) => void;
+  readonly __wbindgen_add_to_stack_pointer: (a: number) => number;
   readonly __wbindgen_malloc: (a: number) => number;
 }
 
@@ -32,4 +33,3 @@ export interface InitOutput {
 * @returns {Promise<InitOutput>}
 */
 export default function init (module_or_path?: InitInput | Promise<InitInput>): Promise<InitOutput>;
-        

codecs/png/pkg/squoosh_png.js

@@ -1,22 +1,6 @@
 
 let wasm;
 
-let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
-
-cachedTextDecoder.decode();
-
-let cachegetUint8Memory0 = null;
-function getUint8Memory0() {
-    if (cachegetUint8Memory0 === null || cachegetUint8Memory0.buffer !== wasm.memory.buffer) {
-        cachegetUint8Memory0 = new Uint8Array(wasm.memory.buffer);
-    }
-    return cachegetUint8Memory0;
-}
-
-function getStringFromWasm0(ptr, len) {
-    return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
-}
-
 let cachegetUint8ClampedMemory0 = null;
 function getUint8ClampedMemory0() {
     if (cachegetUint8ClampedMemory0 === null || cachegetUint8ClampedMemory0.buffer !== wasm.memory.buffer) {
@@ -44,6 +28,14 @@ function addHeapObject(obj) {
     return idx;
 }
 
+let cachegetUint8Memory0 = null;
+function getUint8Memory0() {
+    if (cachegetUint8Memory0 === null || cachegetUint8Memory0.buffer !== wasm.memory.buffer) {
+        cachegetUint8Memory0 = new Uint8Array(wasm.memory.buffer);
+    }
+    return cachegetUint8Memory0;
+}
+
 let WASM_VECTOR_LEN = 0;
 
 function passArray8ToWasm0(arg, malloc) {
@@ -72,8 +64,7 @@ function getArrayU8FromWasm0(ptr, len) {
 */
 export function encode(data, width, height) {
     try {
-        const retptr = wasm.__wbindgen_export_1.value - 16;
-        wasm.__wbindgen_export_1.value = retptr;
+        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
         var ptr0 = passArray8ToWasm0(data, wasm.__wbindgen_malloc);
         var len0 = WASM_VECTOR_LEN;
         wasm.encode(retptr, ptr0, len0, width, height);
@@ -83,7 +74,7 @@ export function encode(data, width, height) {
         wasm.__wbindgen_free(r0, r1 * 1);
         return v1;
     } finally {
-        wasm.__wbindgen_export_1.value += 16;
+        wasm.__wbindgen_add_to_stack_pointer(16);
     }
 }
 
@@ -146,7 +137,7 @@ async function load(module, imports) {
 
 async function init(input) {
     if (typeof input === 'undefined') {
-        input = import.meta.url.replace(/\.js$/, '_bg.wasm');
+        input = new URL('squoosh_png_bg.wasm', import.meta.url);
     }
     const imports = {};
     imports.wbg = {};
@@ -156,9 +147,6 @@ async function init(input) {
         var ret = new ImageData(v0, arg2 >>> 0, arg3 >>> 0);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_throw = function(arg0, arg1) {
-        throw new Error(getStringFromWasm0(arg0, arg1));
-    };
 
     if (typeof input === 'string' || (typeof Request === 'function' && input instanceof Request) || (typeof URL === 'function' && input instanceof URL)) {
         input = fetch(input);

codecs/png/pkg/squoosh_png_bg.wasm.d.ts

@@ -4,4 +4,5 @@ export const memory: WebAssembly.Memory;
 export function encode(a: number, b: number, c: number, d: number, e: number): void;
 export function decode(a: number, b: number): number;
 export function __wbindgen_free(a: number, b: number): void;
+export function __wbindgen_add_to_stack_pointer(a: number): number;
 export function __wbindgen_malloc(a: number): number;

codecs/png/src/lib.rs

@@ -1,7 +1,5 @@
-use rgb::{
-    alt::{GRAY8, GRAYA8},
-    AsPixels, FromSlice, RGB8, RGBA8,
-};
+use std::io::Cursor;
+
 use wasm_bindgen::prelude::*;
 use wasm_bindgen::Clamped;
 
@@ -20,57 +18,38 @@ extern "C" {
     ) -> ImageData;
 }
 
-#[wasm_bindgen]
+#[wasm_bindgen(catch)]
 pub fn encode(data: &[u8], width: u32, height: u32) -> Vec<u8> {
-    let mut buffer = Vec::new();
+    let mut buffer = Cursor::new(Vec::<u8>::new());
 
     {
         let mut encoder = png::Encoder::new(&mut buffer, width, height);
         encoder.set_color(png::ColorType::RGBA);
         encoder.set_depth(png::BitDepth::Eight);
-        let mut writer = encoder.write_header().unwrap_throw();
-        writer.write_image_data(data).unwrap_throw();
+        let mut writer = encoder.write_header().unwrap();
+        writer.write_image_data(data).unwrap();
     }
 
-    buffer
+    buffer.into_inner()
 }
 
-// Convert pixels in-place within buffer containing source data but preallocated
-// for entire [num_pixels * sizeof(RGBA)].
-// This works because all the color types are <= RGBA by size.
-fn expand_pixels<Src: Copy>(buf: &mut [u8], to_rgba: impl Fn(Src) -> RGBA8)
-where
-    [u8]: AsPixels<Src> + FromSlice<u8>,
-{
-    assert!(std::mem::size_of::<Src>() <= std::mem::size_of::<RGBA8>());
-    let num_pixels = buf.len() / 4;
-    for i in (0..num_pixels).rev() {
-        let src_pixel = buf.as_pixels()[i];
-        buf.as_rgba_mut()[i] = to_rgba(src_pixel);
-    }
-}
-
-#[wasm_bindgen]
-pub fn decode(mut data: &[u8]) -> ImageData {
-    let mut decoder = png::Decoder::new(&mut data);
+#[wasm_bindgen(catch)]
+pub fn decode(data: &[u8]) -> ImageData {
+    let mut decoder = png::Decoder::new(Cursor::new(data));
     decoder.set_transformations(png::Transformations::EXPAND);
-    let (info, mut reader) = decoder.read_info().unwrap_throw();
+    let (info, mut reader) = decoder.read_info().unwrap();
     let num_pixels = (info.width * info.height) as usize;
     let mut buf = vec![0; num_pixels * 4];
-    reader.next_frame(&mut buf).unwrap_throw();
+    reader.next_frame(&mut buf).unwrap();
 
-    // Transformations::EXPAND will expand indexed palettes and lower-bit
-    // grayscales to higher color types, but we still need to transform
-    // the rest to RGBA.
-    match info.color_type {
-        png::ColorType::RGBA => {}
-        png::ColorType::RGB => expand_pixels(&mut buf, RGB8::into),
-        png::ColorType::GrayscaleAlpha => expand_pixels(&mut buf, GRAYA8::into),
-        png::ColorType::Grayscale => {
-            expand_pixels(&mut buf, |gray: GRAY8| GRAYA8::from(gray).into())
-        }
-        png::ColorType::Indexed => {
-            unreachable!("Found indexed color type, but expected it to be already expanded")
+    // Transformations::EXPAND will make sure color_type is either
+    // RGBA or RGB. If it’s RGB, we need inject an alpha channel.
+    if info.color_type == png::ColorType::RGB {
+        for i in (0..num_pixels).rev() {
+            buf[i * 4 + 0] = buf[i * 3 + 0];
+            buf[i * 4 + 1] = buf[i * 3 + 1];
+            buf[i * 4 + 2] = buf[i * 3 + 2];
+            buf[i * 4 + 3] = 255;
         }
     }
 

codecs/resize/pkg/squoosh_resize.d.ts

@@ -18,6 +18,7 @@ export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembl
 export interface InitOutput {
   readonly memory: WebAssembly.Memory;
   readonly resize: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number) => void;
+  readonly __wbindgen_add_to_stack_pointer: (a: number) => number;
   readonly __wbindgen_malloc: (a: number) => number;
   readonly __wbindgen_free: (a: number, b: number) => void;
 }
@@ -31,4 +32,3 @@ export interface InitOutput {
 * @returns {Promise<InitOutput>}
 */
 export default function init (module_or_path?: InitInput | Promise<InitInput>): Promise<InitOutput>;
-        

codecs/resize/pkg/squoosh_resize.js

@@ -41,14 +41,19 @@ function getArrayU8FromWasm0(ptr, len) {
 * @returns {Uint8Array}
 */
 export function resize(input_image, input_width, input_height, output_width, output_height, typ_idx, premultiply, color_space_conversion) {
+    try {
+        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
         var ptr0 = passArray8ToWasm0(input_image, wasm.__wbindgen_malloc);
         var len0 = WASM_VECTOR_LEN;
-    wasm.resize(8, ptr0, len0, input_width, input_height, output_width, output_height, typ_idx, premultiply, color_space_conversion);
-    var r0 = getInt32Memory0()[8 / 4 + 0];
-    var r1 = getInt32Memory0()[8 / 4 + 1];
+        wasm.resize(retptr, ptr0, len0, input_width, input_height, output_width, output_height, typ_idx, premultiply, color_space_conversion);
+        var r0 = getInt32Memory0()[retptr / 4 + 0];
+        var r1 = getInt32Memory0()[retptr / 4 + 1];
         var v1 = getArrayU8FromWasm0(r0, r1).slice();
         wasm.__wbindgen_free(r0, r1 * 1);
         return v1;
+    } finally {
+        wasm.__wbindgen_add_to_stack_pointer(16);
+    }
 }
 
 async function load(module, imports) {
@@ -86,7 +91,7 @@ async function load(module, imports) {
 
 async function init(input) {
     if (typeof input === 'undefined') {
-        input = import.meta.url.replace(/\.js$/, '_bg.wasm');
+        input = new URL('squoosh_resize_bg.wasm', import.meta.url);
     }
     const imports = {};
 

codecs/resize/pkg/squoosh_resize_bg.d.ts

@@ -1,6 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-export const memory: WebAssembly.Memory;
-export function resize(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number): void;
-export function __wbindgen_malloc(a: number): number;
-export function __wbindgen_free(a: number, b: number): void;

codecs/resize/src/lib.rs

@@ -133,9 +133,8 @@ pub fn resize(
                 unprocessed_output_image[4 * i + 3],
             ));
         }
-        output_image[4 * i + 3] = (unprocessed_output_image[4 * i + 3] * 255.0)
-            .round()
-            .clamp(0.0, 255.0) as u8;
+        output_image[4 * i + 3] =
+            (unprocessed_output_image[4 * i + 3] * 255.0).clamp(0.0, 255.0) as u8;
     }
 
     return output_image;

lib/client-bundle-plugin.js

@@ -137,24 +137,10 @@ export default function (inputOptions, outputOptions, resolveFileUrl) {
       const dependencies = getDependencies(clientOutput, clientEntry);
 
       if (property.startsWith(allSrcPlaceholder)) {
-        const allModules = [
-          clientEntry,
-          ...dependencies.map((name) =>
-            clientOutput.find((item) => item.fileName === name),
-          ),
-        ];
-
-        const inlineDefines = [
-          ...allModules.map(
-            (item) =>
-              `self.nextDefineUri=location.origin+${resolveFileUrl(item)};${
-                item.code
-              }`,
-          ),
-          'self.nextDefineUri=""',
-        ];
-
-        return JSON.stringify(inlineDefines.join(''));
+        const depCodes = dependencies.map(
+          (name) => clientOutput.find((item) => item.fileName === name).code,
+        );
+        return JSON.stringify([clientEntry.code, ...depCodes].join(';'));
       }
 
       return (

lib/css-plugin.js

@@ -48,7 +48,7 @@ const appendCssSource = `
   }
 `;
 
-export default function () {
+export default function (resolveFileUrl) {
   /** @type {string[]} */
   let emittedCSSIds;
   /** @type {Map<string, string>} */

lib/omt.ejs

@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google Inc. All Rights Reserved.
+ * Copyright 2020 Google Inc. All Rights Reserved.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -13,63 +13,80 @@
 
 // If the loader is already loaded, just stop.
 if (!self.<%- amdFunctionName %>) {
-  let registry = {};
-
-  const singleRequire = (uri, parentUri) => {
-    uri = uri.startsWith(location.origin) ? uri : new URL(uri + ".js", parentUri).href;
-    return registry[uri] || (
-      <% if (useEval) { %>
-        fetch(uri)
-          .then(resp => resp.text())
-          .then(code => {
-            self.nextDefineUri = uri;
-            eval(code);
-          })
-      <% } else { %>
-        new Promise(resolve => {
-          if ("document" in self) {
-            const script = document.createElement("script");
-            script.src = uri;
-            script.onload = resolve;
-            document.head.appendChild(script);
+  const singleRequire = async name => {
+    if (name === 'require') return require;
+    let url;
+    if (name.startsWith(location.origin)) {
+      url = name.slice(location.origin.length);
     } else {
-            self.nextDefineUri = uri;
-            importScripts(uri);
-            resolve();
+      url = name.slice(1) + '.js';
+    }
+    if (!url.startsWith('/c/')) {
+      url = '/c' + url;
+    }
+    name = './static' + url;
+    if (registry[name]) return registry[name];
+
+    if (!registry[name]) {
+      <% if (useEval) { %>
+        const text = await fetch(url).then(resp => resp.text());
+        eval(text);
+      <% } else { %>
+        if ("document" in self) {
+          await new Promise(resolve => {
+            const script = document.createElement("script");
+            script.src = url;
+            document.head.appendChild(script);
+            script.onload = resolve;
+          });
+        } else {
+          importScripts(url);
         }
-        })
       <% } %>
-      .then(() => {
-        let promise = registry[uri];
-        if (!promise) {
-          throw new Error(`Module ${uri} didn’t register its module`);
     }
-        return promise;
-      })
-    );
+    if (!registry[name]) {
+      throw new Error(`Module ${name} didn’t register its module`);
+    }
+    return registry[name];
   };
 
-  self.<%- amdFunctionName %> = (depsNames, factory) => {
-    const uri = self.nextDefineUri || ("document" in self ? document.currentScript.src : "") || location.href;
-    if (registry[uri]) {
+  const require = (names, resolve) => {
+    Promise.all(names.map(singleRequire))
+      .then(modules => resolve(modules.length === 1 ? modules[0] : modules));
+  };
+
+  const registry = {
+    require: Promise.resolve(require)
+  };
+
+  self.<%- amdFunctionName %> = (moduleName, depsNames, factory) => {
+    if (registry[moduleName]) {
       // Module is already loading or loaded.
       return;
     }
+    registry[moduleName] = Promise.resolve().then(() => {
       let exports = {};
-    const require = depUri => singleRequire(depUri, uri);
-    const specialDeps = {
-      module: { uri },
-      exports,
-      require
+      const module = {
+        uri: location.origin + moduleName.slice(1)
       };
-    // Note: Promise.resolve() is necessary to delay loading until all the
-    // `define`s on the current page had a chance to execute first.
-    // This allows to inline some deps on the main page.
-    registry[uri] = Promise.resolve().then(() => Promise.all(depsNames.map(
-      depName => specialDeps[depName] || require(depName)
-    ))).then(deps => {
-      factory(...deps);
+      return Promise.all(
+        depsNames.map(depName => {
+          switch(depName) {
+            case "exports":
               return exports;
+            case "module":
+              return module;
+            default:
+              return singleRequire(depName);
+          }
+        })
+      ).then(deps => {
+        const facValue = factory(...deps);
+        if (!exports.default) {
+          exports.default = facValue;
+        }
+        return exports;
+      });
     });
   };
 }

libsquoosh/.gitignore

@@ -1,3 +0,0 @@
-node_modules
-build
-.DS_Store

libsquoosh/.npmignore

@@ -1 +0,0 @@
-node_modules

libsquoosh/README.md

@@ -1,163 +0,0 @@
-# libSquoosh
-
-libSquoosh is an _experimental_ way to run all the codecs you know from the [Squoosh] web app directly inside your own JavaScript program. libSquoosh uses a worker pool to parallelize processing images. This way you can apply the same codec to many images at once.
-
-libSquoosh is currently not the fastest image compression tool in town and doesn’t aim to be. It is, however, fast enough to compress many images sufficiently quick at once.
-
-## Installation
-
-libSquoosh can be installed to your local project with the following command:
-
-```
-$ npm install @squoosh/lib
-```
-
-You can start using the libSquoosh by adding these lines to the top of your JS program:
-
-```js
-import { ImagePool } from '@squoosh/lib';
-const imagePool = new ImagePool();
-```
-
-This will create an image pool with an underlying processing pipeline that you can use to ingest and encode images. The ImagePool constructor takes one argument that defines how many parallel operations it is allowed to run at any given time. By default, this number is set to the amount of CPU cores available in the system it is running on.
-
-## Ingesting images
-
-You can ingest a new image like so:
-
-```js
-const imagePath = 'path/to/image.png';
-const image = imagePool.ingestImage(imagePath);
-```
-
-The `ingestImage` function can take anything the node [`readFile`][readfile] function can take, uncluding a buffer and `FileHandle`.
-
-The returned `image` object is a representation of the original image, that you can now preprocess, encode, and extract information about.
-
-## Preprocessing and encoding images
-
-When an image has been ingested, you can start preprocessing it and encoding it to other formats. This example will resize the image and then encode it to a `.jpg` and `.jxl` image:
-
-```js
-await image.decoded; //Wait until the image is decoded before running preprocessors
-
-const preprocessOptions: {
-  resize: {
-    enabled: true,
-    width: 100,
-    height: 50,
-  }
-}
-await image.preprocess(preprocessOptions);
-
-const encodeOptions: {
-  mozjpeg: {}, //an empty object means 'use default settings'
-  jxl: {
-    quality: 90,
-  },
-}
-await image.encode(encodeOptions);
-
-```
-
-The default values for each option can be found in the [`codecs.js`][codecs.js] file under `defaultEncoderOptions`. Every unspecified value will use the default value specified there. _Better documentation is needed here._
-
-You can run your own code inbetween the different steps, if, for example, you want to change how much the image should be resized based on its original height. (See [Extracting image information](#extracting-image-information) to learn how to get the image dimensions).
-
-## Closing the ImagePool
-
-When you have encoded everything you need, it is recommended to close the processing pipeline in the ImagePool. This will not delete the images you have already encoded, but it will prevent you from ingesting and encoding new images.
-
-Close the ImagePool pipeline with this line:
-
-```js
-await imagePool.close();
-```
-
-## Writing encoded images to the file system
-
-When you have encoded an image, you normally want to write it to a file.
-
-This example takes an image that has been encoded as a `jpg` and writes it to a file:
-
-```js
-const rawEncodedImage = (await image.encodedWidth.mozjpeg).binary;
-
-fs.writeFile('/path/to/new/image.jpg', rawEncodedImage);
-```
-
-This example iterates through all encoded versions of the image and writes them to a specific path:
-
-```js
-const newImagePath = '/path/to/image.'; //extension is added automatically
-
-for (const encodedImage of Object.values(image.encodedWith)) {
-  fs.writeFile(
-    newImagePath + (await encodedImage).extension,
-    (await encodedImage).binary,
-  );
-}
-```
-
-## Extracting image information
-
-Information about a decoded image is available at `Image.decoded`. It looks something like this:
-
-```js
-console.log(await image.decoded);
-// Returns:
-{
- bitmap: {
-    data: Uint8ClampedArray(47736584) [
-      225, 228, 237, 255, 225, 228, 237, 255, 225, 228, 237, 255,
-      225, 228, 237, 255, 225, 228, 237, 255, 225, 228, 237, 255,
-      225, 228, 237, 255,
-      ... //the entire raw image
-    ],
-    width: 4606,  //pixels
-    height: 2591  //pixels
-  },
-  size: 2467795  //bytes
-}
-```
-
-Information about an encoded image can be found at `Image.encodedWith[encoderName]`. It looks something like this:
-
-```js
-console.log(await image.encodedWith.jxl);
-// Returns:
-{
-  optionsUsed: {
-    quality: 75,
-    baseline: false,
-    arithmetic: false,
-    progressive: true,
-    ... //all the possible options for this encoder
-  },
-  binary: Uint8Array(1266975) [
-      1,   0,   0,   1,   0,  1,  0,  0, 255, 219,  0, 132,
-    113, 119, 156, 156, 209,  1,  8,  8,   8,   8,  9,   8,
-      9,  10,  10,   9,
-    ... //the entire raw encoded image
-  ],
-  extension: 'jxl',
-  size: 1266975  //bytes
-}
-```
-
-## Auto optimizer
-
-libSquoosh has an _experimental_ auto optimizer that compresses an image as much as possible, trying to hit a specific [Butteraugli] target value. The higher the Butteraugli target value, the more artifacts can be introduced.
-
-You can make use of the auto optimizer by using “auto” as the config object.
-
-```js
-const encodeOptions: {
-  mozjpeg: 'auto',
-}
-```
-
-[squoosh]: https://squoosh.app
-[codecs.js]: https://github.com/GoogleChromeLabs/squoosh/blob/dev/libsquoosh/src/codecs.js
-[butteraugli]: https://github.com/google/butteraugli
-[readfile]: https://nodejs.org/api/fs.html#fs_fspromises_readfile_path_options

libsquoosh/package.json

@@ -1,28 +0,0 @@
-{
-  "name": "@squoosh/lib",
-  "version": "0.2.1",
-  "description": "A Node library for Squoosh",
-  "public": true,
-  "main": "/build/index.js",
-  "files": [
-    "/build/*"
-  ],
-  "scripts": {
-    "build": "rollup -c"
-  },
-  "keywords": [],
-  "author": "Google Chrome Developers <chromium-dev@google.com>",
-  "license": "Apache-2.0",
-  "dependencies": {
-    "web-streams-polyfill": "^3.0.3"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.14.0",
-    "@babel/preset-env": "^7.14.0",
-    "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-commonjs": "^18.0.0",
-    "@rollup/plugin-node-resolve": "^11.2.1",
-    "rollup": "^2.46.0",
-    "rollup-plugin-terser": "^7.0.2"
-  }
-}

libsquoosh/src/index.js

@@ -1,209 +0,0 @@
-import { isMainThread } from 'worker_threads';
-import { cpus } from 'os';
-import { promises as fsp } from 'fs';
-
-import { codecs as encoders, preprocessors } from './codecs.js';
-import WorkerPool from './worker_pool.js';
-import { autoOptimize } from './auto-optimizer.js';
-
-export { ImagePool, encoders, preprocessors };
-
-async function decodeFile({ file }) {
-  const buffer = await fsp.readFile(file);
-  const firstChunk = buffer.slice(0, 16);
-  const firstChunkString = Array.from(firstChunk)
-    .map((v) => String.fromCodePoint(v))
-    .join('');
-  const key = Object.entries(encoders).find(([name, { detectors }]) =>
-    detectors.some((detector) => detector.exec(firstChunkString)),
-  )?.[0];
-  if (!key) {
-    throw Error(`${file} has an unsupported format`);
-  }
-  const rgba = (await encoders[key].dec()).decode(new Uint8Array(buffer));
-  return {
-    bitmap: rgba,
-    size: buffer.length,
-  };
-}
-
-async function preprocessImage({ preprocessorName, options, image }) {
-  const preprocessor = await preprocessors[preprocessorName].instantiate();
-  image.bitmap = await preprocessor(
-    image.bitmap.data,
-    image.bitmap.width,
-    image.bitmap.height,
-    options,
-  );
-  return image;
-}
-
-async function encodeImage({
-  bitmap: bitmapIn,
-  encName,
-  encConfig,
-  optimizerButteraugliTarget,
-  maxOptimizerRounds,
-}) {
-  let binary;
-  let optionsUsed = encConfig;
-  const encoder = await encoders[encName].enc();
-  if (encConfig === 'auto') {
-    const optionToOptimize = encoders[encName].autoOptimize.option;
-    const decoder = await encoders[encName].dec();
-    const encode = (bitmapIn, quality) =>
-      encoder.encode(
-        bitmapIn.data,
-        bitmapIn.width,
-        bitmapIn.height,
-        Object.assign({}, encoders[encName].defaultEncoderOptions, {
-          [optionToOptimize]: quality,
-        }),
-      );
-    const decode = (binary) => decoder.decode(binary);
-    const { binary: optimizedBinary, quality } = await autoOptimize(
-      bitmapIn,
-      encode,
-      decode,
-      {
-        min: encoders[encName].autoOptimize.min,
-        max: encoders[encName].autoOptimize.max,
-        butteraugliDistanceGoal: optimizerButteraugliTarget,
-        maxRounds: maxOptimizerRounds,
-      },
-    );
-    binary = optimizedBinary;
-    optionsUsed = {
-      // 5 significant digits is enough
-      [optionToOptimize]: Math.round(quality * 10000) / 10000,
-    };
-  } else {
-    binary = encoder.encode(
-      bitmapIn.data.buffer,
-      bitmapIn.width,
-      bitmapIn.height,
-      encConfig,
-    );
-  }
-  return {
-    optionsUsed,
-    binary,
-    extension: encoders[encName].extension,
-    size: binary.length,
-  };
-}
-
-// both decoding and encoding go through the worker pool
-function handleJob(params) {
-  const { operation } = params;
-  switch (operation) {
-    case 'encode':
-      return encodeImage(params);
-    case 'decode':
-      return decodeFile(params);
-    case 'preprocess':
-      return preprocessImage(params);
-    default:
-      throw Error(`Invalid job "${operation}"`);
-  }
-}
-
-/**
- * Represents an ingested image.
- */
-class Image {
-  constructor(workerPool, file) {
-    this.workerPool = workerPool;
-    this.decoded = workerPool.dispatchJob({ operation: 'decode', file });
-    this.encodedWith = {};
-  }
-
-  /**
-   * Define one or several preprocessors to use on the image.
-   * @param {object} preprocessOptions - An object with preprocessors to use, and their settings.
-   * @returns {Promise<undefined>} - A promise that resolves when all preprocessors have completed their work.
-   */
-  async preprocess(preprocessOptions = {}) {
-    for (const [name, options] of Object.entries(preprocessOptions)) {
-      if (!Object.keys(preprocessors).includes(name)) {
-        throw Error(`Invalid preprocessor "${name}"`);
-      }
-      const preprocessorOptions = Object.assign(
-        {},
-        preprocessors[name].defaultOptions,
-        options,
-      );
-      this.decoded = this.workerPool.dispatchJob({
-        operation: 'preprocess',
-        preprocessorName: name,
-        image: await this.decoded,
-        options: preprocessorOptions,
-      });
-      await this.decoded;
-    }
-  }
-
-  /**
-   * Define one or several encoders to use on the image.
-   * @param {object} encodeOptions - An object with encoders to use, and their settings.
-   * @returns {Promise<undefined>} - A promise that resolves when the image has been encoded with all the specified encoders.
-   */
-  async encode(encodeOptions = {}) {
-    const { bitmap } = await this.decoded;
-    for (const [encName, options] of Object.entries(encodeOptions)) {
-      if (!Object.keys(encoders).includes(encName)) {
-        continue;
-      }
-      const encRef = encoders[encName];
-      const encConfig =
-        typeof options === 'string'
-          ? options
-          : Object.assign({}, encRef.defaultEncoderOptions, options);
-      this.encodedWith[encName] = this.workerPool.dispatchJob({
-        operation: 'encode',
-        bitmap,
-        encName,
-        encConfig,
-        optimizerButteraugliTarget: Number(
-          encodeOptions.optimizerButteraugliTarget,
-        ),
-        maxOptimizerRounds: Number(encodeOptions.maxOptimizerRounds),
-      });
-    }
-    await Promise.all(Object.values(this.encodedWith));
-  }
-}
-
-/**
- * A pool where images can be ingested and squooshed.
- */
-class ImagePool {
-  /**
-   * Create a new pool.
-   * @param {number} [threads] - Number of concurrent image processes to run in the pool. Defaults to the number of CPU cores in the system.
-   */
-  constructor(threads) {
-    this.workerPool = new WorkerPool(threads || cpus().length, __filename);
-  }
-
-  /**
-   * Ingest an image into the image pool.
-   * @param {string | Buffer | URL | object} image - The image or path to the image that should be ingested and decoded.
-   * @returns {Image} - A custom class reference to the decoded image.
-   */
-  ingestImage(image) {
-    return new Image(this.workerPool, image);
-  }
-
-  /**
-   * Closes the underlying image processing pipeline. The already processed images will still be there, but no new processing can start.
-   * @returns {Promise<undefined>} - A promise that resolves when the underlying pipeline has closed.
-   */
-  async close() {
-    await this.workerPool.join();
-  }
-}
-
-if (!isMainThread) {
-  WorkerPool.useThisThreadAsWorker(handleJob);
-}

package-lock.json

@@ -179,25 +179,13 @@
       }
     },
     "@surma/rollup-plugin-off-main-thread": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.1.tgz",
-      "integrity": "sha512-7OU8wfyv18YPWVmecg2/0Jh+pm3lQbvPhIWHd1YQpoxPKPW/vsDNGBaCnMKsZbz29RjgCoXKugAjyagPncgdEw==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-1.4.2.tgz",
+      "integrity": "sha512-yBMPqmd1yEJo/280PAMkychuaALyQ9Lkb5q1ck3mjJrFuEobIfhnQ4J3mbvBoISmR3SWMWV+cGB/I0lCQee79A==",
       "dev": true,
       "requires": {
-        "ejs": "^3.1.6",
-        "json5": "^2.2.0",
+        "ejs": "^2.6.1",
         "magic-string": "^0.25.0"
-      },
-      "dependencies": {
-        "json5": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-          "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        }
       }
     },
     "@types/color-name": {
@@ -417,12 +405,6 @@
       "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
       "dev": true
     },
-    "async": {
-      "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-      "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
-      "dev": true
-    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -1615,13 +1597,10 @@
       }
     },
     "ejs": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz",
-      "integrity": "sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==",
-      "dev": true,
-      "requires": {
-        "jake": "^10.6.1"
-      }
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz",
+      "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==",
+      "dev": true
     },
     "electron-to-chromium": {
       "version": "1.3.538",
@@ -1818,15 +1797,6 @@
       "integrity": "sha512-na2cwntTVgMsR+BZ2YBr/XQk941DKDw2LJKbV7g6TRdGBQ3rx8V53oEviG8zPWoBOySwK9w/SlZ/gb/F/48I8A==",
       "dev": true
     },
-    "filelist": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz",
-      "integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==",
-      "dev": true,
-      "requires": {
-        "minimatch": "^3.0.4"
-      }
-    },
     "fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -2336,70 +2306,6 @@
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
       "dev": true
     },
-    "jake": {
-      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz",
-      "integrity": "sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==",
-      "dev": true,
-      "requires": {
-        "async": "0.9.x",
-        "chalk": "^2.4.2",
-        "filelist": "^1.0.1",
-        "minimatch": "^3.0.4"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
     "jest-worker": {
       "version": "26.3.0",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.3.0.tgz",

package.json

@@ -14,7 +14,7 @@
     "@rollup/plugin-commonjs": "^17.0.0",
     "@rollup/plugin-node-resolve": "^11.1.0",
     "@rollup/plugin-replace": "^2.3.4",
-    "@surma/rollup-plugin-off-main-thread": "^2.2.1",
+    "@surma/rollup-plugin-off-main-thread": "^1.4.2",
     "@types/dedent": "^0.7.0",
     "@types/mime-types": "^2.1.0",
     "@types/node": "^14.14.7",

rollup.config.js

@@ -37,6 +37,13 @@ function resolveFileUrl({ fileName }) {
   return JSON.stringify(fileName.replace(/^static\//, '/'));
 }
 
+// With AMD output, Rollup always uses document.baseURI, which breaks in workers.
+// This fixes it:
+function resolveImportMeta(property, { chunkId }) {
+  if (property !== 'url') return;
+  return `new URL(${resolveFileUrl({ fileName: chunkId })}, location).href`;
+}
+
 const dir = '.tmp/build';
 const staticPath = 'static/c/[name]-[hash][extname]';
 const jsPath = staticPath.replace('[extname]', '.js');
@@ -55,7 +62,6 @@ export default async function ({ watch }) {
     path.join(__dirname, 'lib', 'omt.ejs'),
     'utf-8',
   );
-
   await del('.tmp/build');
 
   const isProduction = !watch;
@@ -77,7 +83,7 @@ export default async function ({ watch }) {
     ]),
     urlPlugin(),
     dataURLPlugin(),
-    cssPlugin(),
+    cssPlugin(resolveFileUrl),
   ];
 
   return {
@@ -99,12 +105,12 @@ export default async function ({ watch }) {
     },
     preserveModules: true,
     plugins: [
-      { resolveFileUrl },
+      { resolveFileUrl, resolveImportMeta },
       clientBundlePlugin(
         {
           external: ['worker_threads'],
           plugins: [
-            { resolveFileUrl },
+            { resolveFileUrl, resolveImportMeta },
             OMT({ loader: await omtLoaderPromise }),
             serviceWorkerPlugin({
               output: 'static/serviceworker.js',

serve.json

@@ -6,14 +6,6 @@
         {
           "key": "Cache-Control",
           "value": "no-cache"
-        },
-        {
-          "key": "Cross-Origin-Embedder-Policy",
-          "value": "require-corp"
-        },
-        {
-          "key": "Cross-Origin-Opener-Policy",
-          "value": "same-origin"
         }
       ]
     }

src/client/lazy-app/Compress/Output/custom-els/TwoUp/index.ts

@@ -69,7 +69,7 @@ export default class TwoUp extends HTMLElement {
       },
     });
 
-    window.addEventListener('keydown', (event) => this._onKeyDown(event));
+    window.addEventListener('keydown', event => this._onKeyDown(event));
   }
 
   connectedCallback() {
@@ -98,24 +98,19 @@ export default class TwoUp extends HTMLElement {
 
   // KeyDown event handler
   private _onKeyDown(event: KeyboardEvent) {
-    const target = event.target;
-    if (target instanceof HTMLElement && target.closest('input')) return;
-
     if (event.code === 'Digit1' || event.code === 'Numpad1') {
       this._position = 0;
       this._relativePosition = 0;
       this._setPosition();
     } else if (event.code === 'Digit2' || event.code === 'Numpad2') {
-      const dimensionAxis =
-        this.orientation === 'vertical' ? 'height' : 'width';
+      const dimensionAxis = this.orientation === 'vertical' ? 'height' : 'width';
       const bounds = this.getBoundingClientRect();
 
       this._position = bounds[dimensionAxis] / 2;
-      this._relativePosition = this._position / bounds[dimensionAxis] / 2;
+      this._relativePosition = (this._position / bounds[dimensionAxis]) / 2;
       this._setPosition();
     } else if (event.code === 'Digit3' || event.code === 'Numpad3') {
-      const dimensionAxis =
-        this.orientation === 'vertical' ? 'height' : 'width';
+      const dimensionAxis = this.orientation === 'vertical' ? 'height' : 'width';
       const bounds = this.getBoundingClientRect();
 
       this._position = bounds[dimensionAxis];

src/client/lazy-app/Compress/index.tsx

@@ -11,7 +11,6 @@ import {
   canDecodeImageType,
   abortable,
   assertSignal,
-  ImageMimeTypes,
 } from '../util';
 import {
   PreprocessorState,
@@ -32,6 +31,7 @@ import Results from './Results';
 import WorkerBridge from '../worker-bridge';
 import { resize } from 'features/processors/resize/client';
 import type SnackBarElement from 'shared/custom-els/snack-bar';
+import { Arrow, ExpandIcon } from '../icons';
 import { generateCliInvocation } from '../util/cli';
 
 export type OutputType = EncoderType | 'identity';
@@ -69,6 +69,7 @@ interface State {
   sides: [Side, Side];
   /** Source image load */
   loading: boolean;
+  error?: string;
   mobileView: boolean;
   preprocessorState: PreprocessorState;
   encodedPreprocessorState?: PreprocessorState;
@@ -101,15 +102,15 @@ async function decodeImage(
       if (mimeType === 'image/webp') {
         return await workerBridge.webpDecode(signal, blob);
       }
-      if (mimeType === 'image/jxl') {
+      if (mimeType === 'image/jpegxl') {
         return await workerBridge.jxlDecode(signal, blob);
       }
       if (mimeType === 'image/webp2') {
         return await workerBridge.wp2Decode(signal, blob);
       }
+      // If it's not one of those types, fall through and try built-in decoding for a laugh.
     }
-    // Otherwise fall through and try built-in decoding for a laugh.
-    return await builtinDecode(signal, blob, mimeType);
+    return await abortable(signal, builtinDecode(blob));
   } catch (err) {
     if (err.name === 'AbortError') throw err;
     console.log(err);
@@ -177,13 +178,10 @@ async function compressImage(
     encodeData.options as any,
   );
 
-  // This type ensures the image mimetype is consistent with our mimetype sniffer
-  const type: ImageMimeTypes = encoder.meta.mimeType;
-
   return new File(
     [compressedData],
     sourceFilename.replace(/.[^.]*$/, `.${encoder.meta.extension}`),
-    { type },
+    { type: encoder.meta.mimeType },
   );
 }
 
@@ -257,6 +255,11 @@ function processorStateEquivalent(a: ProcessorState, b: ProcessorState) {
   return true;
 }
 
+// These are only used in the mobile view
+const resultTitles = ['Top', 'Bottom'] as const;
+// These are only used in the desktop view
+const buttonPositions = ['download-left', 'download-right'] as const;
+
 const originalDocumentTitle = document.title;
 
 function updateDocumentTitle(filename: string = ''): void {

src/client/lazy-app/util/index.ts

@@ -10,9 +10,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-import * as WebCodecs from '../util/web-codecs';
-
 /**
  * Compare two objects, returning a boolean indicating if
  * they have the same properties and strictly equal values.
@@ -140,7 +137,7 @@ export function blobToText(blob: Blob): Promise<string> {
   return new Response(blob).text();
 }
 
-const magicNumberMapInput = [
+const magicNumberToMimeType = new Map<RegExp, string>([
   [/^%PDF-/, 'application/pdf'],
   [/^GIF87a/, 'image/gif'],
   [/^GIF89a/, 'image/gif'],
@@ -153,17 +150,10 @@ const magicNumberMapInput = [
   [/^RIFF....WEBPVP8[LX ]/, 'image/webp'],
   [/^\xF4\xFF\x6F/, 'image/webp2'],
   [/^\x00\x00\x00 ftypavif\x00\x00\x00\x00/, 'image/avif'],
-  [/^\xff\x0a/, 'image/jxl'],
-  [/^\x00\x00\x00\x0cJXL \x0d\x0a\x87\x0a/, 'image/jxl'],
-] as const;
+  [/^\xff\x0a/, 'image/jpegxl'],
+]);
 
-export type ImageMimeTypes = typeof magicNumberMapInput[number][1];
-
-const magicNumberToMimeType = new Map<RegExp, ImageMimeTypes>(
-  magicNumberMapInput,
-);
-
-export async function sniffMimeType(blob: Blob): Promise<ImageMimeTypes | ''> {
+export async function sniffMimeType(blob: Blob): Promise<string> {
   const firstChunk = await blobToArrayBuffer(blob.slice(0, 16));
   const firstChunkString = Array.from(new Uint8Array(firstChunk))
     .map((v) => String.fromCodePoint(v))
@@ -195,35 +185,17 @@ interface DrawableToImageDataOptions {
   sh?: number;
 }
 
-function getWidth(
-  drawable: ImageBitmap | HTMLImageElement | VideoFrame,
-): number {
-  if ('displayWidth' in drawable) {
-    return drawable.displayWidth;
-  }
-  return drawable.width;
-}
-
-function getHeight(
-  drawable: ImageBitmap | HTMLImageElement | VideoFrame,
-): number {
-  if ('displayHeight' in drawable) {
-    return drawable.displayHeight;
-  }
-  return drawable.height;
-}
-
 export function drawableToImageData(
-  drawable: ImageBitmap | HTMLImageElement | VideoFrame,
+  drawable: ImageBitmap | HTMLImageElement,
   opts: DrawableToImageDataOptions = {},
 ): ImageData {
   const {
-    width = getWidth(drawable),
-    height = getHeight(drawable),
+    width = drawable.width,
+    height = drawable.height,
     sx = 0,
     sy = 0,
-    sw = getWidth(drawable),
-    sh = getHeight(drawable),
+    sw = drawable.width,
+    sh = drawable.height,
   } = opts;
 
   // Make canvas same size as image
@@ -237,25 +209,13 @@ export function drawableToImageData(
   return ctx.getImageData(0, 0, width, height);
 }
 
-export async function builtinDecode(
-  signal: AbortSignal,
-  blob: Blob,
-  mimeType: string,
-): Promise<ImageData> {
-  // If WebCodecs are supported, use that.
-  if (await WebCodecs.isTypeSupported(mimeType)) {
-    assertSignal(signal);
-    try {
-      return await abortable(signal, WebCodecs.decode(blob, mimeType));
-    } catch (e) {}
-  }
-  assertSignal(signal);
-
+export async function builtinDecode(blob: Blob): Promise<ImageData> {
   // Prefer createImageBitmap as it's the off-thread option for Firefox.
-  const drawable = await abortable<HTMLImageElement | ImageBitmap>(
-    signal,
-    'createImageBitmap' in self ? createImageBitmap(blob) : blobToImg(blob),
-  );
+  const drawable =
+    'createImageBitmap' in self
+      ? await createImageBitmap(blob)
+      : await blobToImg(blob);
+
   return drawableToImageData(drawable);
 }
 

src/client/lazy-app/util/web-codecs/index.ts

@@ -1,26 +0,0 @@
-import { drawableToImageData } from 'client/lazy-app/util';
-
-const hasImageDecoder = typeof ImageDecoder !== 'undefined';
-export async function isTypeSupported(mimeType: string): Promise<boolean> {
-  if (!hasImageDecoder) {
-    return false;
-  }
-  return ImageDecoder.isTypeSupported(mimeType);
-}
-export async function decode(
-  blob: Blob | File,
-  mimeType: string,
-): Promise<ImageData> {
-  if (!hasImageDecoder) {
-    throw Error(
-      `This browser does not support ImageDecoder. This function should not have been called.`,
-    );
-  }
-  const decoder = new ImageDecoder({
-    type: mimeType,
-    // Non-obvious way to turn an Blob into a ReadableStream
-    data: new Response(blob).body!,
-  });
-  const { image } = await decoder.decode();
-  return drawableToImageData(image);
-}

src/client/lazy-app/util/web-codecs/missing-types.d.ts

@@ -1,60 +0,0 @@
-interface ImageDecoderInit {
-  type: string;
-  data: BufferSource | ReadableStream;
-  premultiplyAlpha?: PremultiplyAlpha;
-  colorSpaceConversion?: ColorSpaceConversion;
-  desiredWidth?: number;
-  desiredHeight?: number;
-  preferAnimation?: boolean;
-}
-
-interface ImageDecodeOptions {
-  frameIndex: number;
-  completeFramesOnly: boolean;
-}
-
-interface ImageDecodeResult {
-  image: VideoFrame;
-  complete: boolean;
-}
-
-// I didn’t do all the types because the class is kinda complex.
-// I focused on what we need.
-// See https://w3c.github.io/webcodecs/#videoframe
-declare class VideoFrame {
-  displayWidth: number;
-  displayHeight: number;
-}
-
-// Add VideoFrame to canvas’ drawImage()
-interface CanvasDrawImage {
-  drawImage(
-    image: CanvasImageSource | VideoFrame,
-    dx: number,
-    dy: number,
-  ): void;
-  drawImage(
-    image: CanvasImageSource | VideoFrame,
-    dx: number,
-    dy: number,
-    dw: number,
-    dh: number,
-  ): void;
-  drawImage(
-    image: CanvasImageSource | VideoFrame,
-    sx: number,
-    sy: number,
-    sw: number,
-    sh: number,
-    dx: number,
-    dy: number,
-    dw: number,
-    dh: number,
-  ): void;
-}
-
-declare class ImageDecoder {
-  static isTypeSupported(type: string): Promise<boolean>;
-  constructor(desc: ImageDecoderInit);
-  decode(opts?: Partial<ImageDecodeOptions>): Promise<ImageDecodeResult>;
-}

src/features/encoders/avif/client/index.tsx

@@ -1,4 +1,4 @@
-import { EncodeOptions, defaultOptions, AVIFTune } from '../shared/meta';
+import { EncodeOptions, defaultOptions } from '../shared/meta';
 import type WorkerBridge from 'client/lazy-app/worker-bridge';
 import { h, Component } from 'preact';
 import { preventDefault, shallowEqual } from 'client/lazy-app/util';
@@ -25,19 +25,18 @@ interface Props {
 interface State {
   options: EncodeOptions;
   lossless: boolean;
-  quality: number;
-  showAdvanced: boolean;
+  maxQuality: number;
+  minQuality: number;
   separateAlpha: boolean;
-  alphaQuality: number;
-  chromaDeltaQ: boolean;
+  losslessAlpha: boolean;
+  maxAlphaQuality: number;
+  minAlphaQuality: number;
+  showAdvanced: boolean;
+  grayscale: boolean;
   subsample: number;
   tileRows: number;
   tileCols: number;
   effort: number;
-  sharpness: number;
-  denoiseLevel: number;
-  aqMode: number;
-  tune: AVIFTune;
 }
 
 const maxQuant = 63;
@@ -54,24 +53,35 @@ export class Options extends Component<Props, State> {
 
     const { options } = props;
 
-    const lossless =
-      options.cqLevel === 0 &&
-      options.cqAlphaLevel <= 0 &&
-      options.subsample == 3;
-
-    const separateAlpha = options.cqAlphaLevel !== -1;
-
-    const cqLevel = lossless ? defaultOptions.cqLevel : options.cqLevel;
+    const lossless = options.maxQuantizer === 0 && options.minQuantizer === 0;
+    const minQuantizerValue = lossless
+      ? defaultOptions.minQuantizer
+      : options.minQuantizer;
+    const maxQuantizerValue = lossless
+      ? defaultOptions.maxQuantizer
+      : options.maxQuantizer;
+    const losslessAlpha =
+      options.maxQuantizerAlpha === 0 && options.minQuantizerAlpha === 0;
+    const minQuantizerAlphaValue = losslessAlpha
+      ? defaultOptions.minQuantizerAlpha
+      : options.minQuantizerAlpha;
+    const maxQuantizerAlphaValue = losslessAlpha
+      ? defaultOptions.maxQuantizerAlpha
+      : options.maxQuantizerAlpha;
 
     // Create default form state from options
     return {
       options,
       lossless,
-      quality: maxQuant - cqLevel,
-      separateAlpha,
-      alphaQuality:
-        maxQuant -
-        (separateAlpha ? options.cqAlphaLevel : defaultOptions.cqLevel),
+      losslessAlpha,
+      maxQuality: maxQuant - minQuantizerValue,
+      minQuality: maxQuant - maxQuantizerValue,
+      separateAlpha:
+        options.maxQuantizer !== options.maxQuantizerAlpha ||
+        options.minQuantizer !== options.minQuantizerAlpha,
+      maxAlphaQuality: maxQuant - minQuantizerAlphaValue,
+      minAlphaQuality: maxQuant - maxQuantizerAlphaValue,
+      grayscale: options.subsample === 0,
       subsample:
         options.subsample === 0 || lossless
           ? defaultOptions.subsample
@@ -79,10 +89,6 @@ export class Options extends Component<Props, State> {
       tileRows: options.tileRowsLog2,
       tileCols: options.tileColsLog2,
       effort: maxSpeed - options.speed,
-      chromaDeltaQ: options.chromaDeltaQ,
-      sharpness: options.sharpness,
-      denoiseLevel: options.denoiseLevel,
-      tune: options.tune,
     };
   }
 
@@ -93,10 +99,7 @@ export class Options extends Component<Props, State> {
 
   private _inputChangeCallbacks = new Map<string, (event: Event) => void>();
 
-  private _inputChange = (
-    prop: keyof State,
-    type: 'number' | 'boolean' | 'string',
-  ) => {
+  private _inputChange = (prop: keyof State, type: 'number' | 'boolean') => {
     // Cache the callback for performance
     if (!this._inputChangeCallbacks.has(prop)) {
       this._inputChangeCallbacks.set(prop, (event: Event) => {
@@ -106,34 +109,70 @@ export class Options extends Component<Props, State> {
             ? 'checked' in formEl
               ? formEl.checked
               : !!formEl.value
-            : type === 'number'
-            ? Number(formEl.value)
-            : formEl.value;
+            : Number(formEl.value);
 
         const newState: Partial<State> = {
           [prop]: newVal,
         };
 
+        // Ensure that min cannot be greater than max
+        switch (prop) {
+          case 'maxQuality':
+            if (newVal < this.state.minQuality) {
+              newState.minQuality = newVal as number;
+            }
+            break;
+          case 'minQuality':
+            if (newVal > this.state.maxQuality) {
+              newState.maxQuality = newVal as number;
+            }
+            break;
+          case 'maxAlphaQuality':
+            if (newVal < this.state.minAlphaQuality) {
+              newState.minAlphaQuality = newVal as number;
+            }
+            break;
+          case 'minAlphaQuality':
+            if (newVal > this.state.maxAlphaQuality) {
+              newState.maxAlphaQuality = newVal as number;
+            }
+            break;
+        }
+
         const optionState = {
           ...this.state,
           ...newState,
         };
 
+        const maxQuantizer = optionState.lossless
+          ? 0
+          : maxQuant - optionState.minQuality;
+        const minQuantizer = optionState.lossless
+          ? 0
+          : maxQuant - optionState.maxQuality;
+
         const newOptions: EncodeOptions = {
-          cqLevel: optionState.lossless ? 0 : maxQuant - optionState.quality,
-          cqAlphaLevel:
-            optionState.lossless || !optionState.separateAlpha
-              ? -1
-              : maxQuant - optionState.alphaQuality,
+          maxQuantizer,
+          minQuantizer,
+          maxQuantizerAlpha: optionState.separateAlpha
+            ? optionState.losslessAlpha
+              ? 0
+              : maxQuant - optionState.minAlphaQuality
+            : maxQuantizer,
+          minQuantizerAlpha: optionState.separateAlpha
+            ? optionState.losslessAlpha
+              ? 0
+              : maxQuant - optionState.maxAlphaQuality
+            : minQuantizer,
           // Always set to 4:4:4 if lossless
-          subsample: optionState.lossless ? 3 : optionState.subsample,
+          subsample: optionState.grayscale
+            ? 0
+            : optionState.lossless
+            ? 3
+            : optionState.subsample,
           tileColsLog2: optionState.tileCols,
           tileRowsLog2: optionState.tileRows,
           speed: maxSpeed - optionState.effort,
-          chromaDeltaQ: optionState.chromaDeltaQ,
-          sharpness: optionState.sharpness,
-          denoiseLevel: optionState.denoiseLevel,
-          tune: optionState.tune,
         };
 
         // Updating options, so we don't recalculate in getDerivedStateFromProps.
@@ -155,18 +194,18 @@ export class Options extends Component<Props, State> {
     _: Props,
     {
       effort,
+      grayscale,
       lossless,
-      alphaQuality,
+      losslessAlpha,
+      maxAlphaQuality,
+      maxQuality,
+      minAlphaQuality,
+      minQuality,
       separateAlpha,
-      quality,
       showAdvanced,
       subsample,
       tileCols,
       tileRows,
-      chromaDeltaQ,
-      sharpness,
-      denoiseLevel,
-      tune,
     }: State,
   ) {
     return (
@@ -180,16 +219,74 @@ export class Options extends Component<Props, State> {
         </label>
         <Expander>
           {!lossless && (
+            <div>
               <div class={style.optionOneCell}>
                 <Range
                   min="0"
-                max="63"
-                value={quality}
-                onInput={this._inputChange('quality', 'number')}
+                  max="62"
+                  value={maxQuality}
+                  onInput={this._inputChange('maxQuality', 'number')}
                 >
-                Quality:
+                  Max quality:
                 </Range>
               </div>
+              <div class={style.optionOneCell}>
+                <Range
+                  min="0"
+                  max="62"
+                  value={minQuality}
+                  onInput={this._inputChange('minQuality', 'number')}
+                >
+                  Min quality:
+                </Range>
+              </div>
+            </div>
+          )}
+        </Expander>
+        <label class={style.optionToggle}>
+          Separate alpha quality
+          <Checkbox
+            checked={separateAlpha}
+            onChange={this._inputChange('separateAlpha', 'boolean')}
+          />
+        </label>
+        <Expander>
+          {separateAlpha && (
+            <div>
+              <label class={style.optionToggle}>
+                Lossless alpha
+                <Checkbox
+                  checked={losslessAlpha}
+                  onChange={this._inputChange('losslessAlpha', 'boolean')}
+                />
+              </label>
+              <Expander>
+                {!losslessAlpha && (
+                  <div>
+                    <div class={style.optionOneCell}>
+                      <Range
+                        min="0"
+                        max="62"
+                        value={maxAlphaQuality}
+                        onInput={this._inputChange('maxAlphaQuality', 'number')}
+                      >
+                        Max alpha quality:
+                      </Range>
+                    </div>
+                    <div class={style.optionOneCell}>
+                      <Range
+                        min="0"
+                        max="62"
+                        value={minAlphaQuality}
+                        onInput={this._inputChange('minAlphaQuality', 'number')}
+                      >
+                        Min alpha quality:
+                      </Range>
+                    </div>
+                  </div>
+                )}
+              </Expander>
+            </div>
           )}
         </Expander>
         <label class={style.optionReveal}>
@@ -202,12 +299,20 @@ export class Options extends Component<Props, State> {
         <Expander>
           {showAdvanced && (
             <div>
+              {/*<label class={style.optionToggle}>
+                Grayscale
+                <Checkbox
+                  data-set-state="grayscale"
+                  checked={grayscale}
+                  onChange={this._inputChange('grayscale', 'boolean')}
+                />
+              </label>*/}
               <Expander>
-                {!lossless && (
-                  <div>
+                {!grayscale && !lossless && (
                   <label class={style.optionTextFirst}>
                     Subsample chroma:
                     <Select
+                      data-set-state="subsample"
                       value={subsample}
                       onChange={this._inputChange('subsample', 'number')}
                     >
@@ -216,69 +321,6 @@ export class Options extends Component<Props, State> {
                       <option value="3">Off</option>
                     </Select>
                   </label>
-                    <label class={style.optionToggle}>
-                      Separate alpha quality
-                      <Checkbox
-                        checked={separateAlpha}
-                        onChange={this._inputChange('separateAlpha', 'boolean')}
-                      />
-                    </label>
-                    <Expander>
-                      {separateAlpha && (
-                        <div class={style.optionOneCell}>
-                          <Range
-                            min="0"
-                            max="63"
-                            value={alphaQuality}
-                            onInput={this._inputChange(
-                              'alphaQuality',
-                              'number',
-                            )}
-                          >
-                            Alpha quality:
-                          </Range>
-                        </div>
-                      )}
-                    </Expander>
-                    <label class={style.optionToggle}>
-                      Extra chroma compression
-                      <Checkbox
-                        checked={chromaDeltaQ}
-                        onChange={this._inputChange('chromaDeltaQ', 'boolean')}
-                      />
-                    </label>
-                    <div class={style.optionOneCell}>
-                      <Range
-                        min="0"
-                        max="7"
-                        value={sharpness}
-                        onInput={this._inputChange('sharpness', 'number')}
-                      >
-                        Sharpness:
-                      </Range>
-                    </div>
-                    <div class={style.optionOneCell}>
-                      <Range
-                        min="0"
-                        max="50"
-                        value={denoiseLevel}
-                        onInput={this._inputChange('denoiseLevel', 'number')}
-                      >
-                        Noise synthesis:
-                      </Range>
-                    </div>
-                    <label class={style.optionTextFirst}>
-                      Tuning:
-                      <Select
-                        value={tune}
-                        onChange={this._inputChange('tune', 'number')}
-                      >
-                        <option value={AVIFTune.auto}>Auto</option>
-                        <option value={AVIFTune.psnr}>PSNR</option>
-                        <option value={AVIFTune.ssim}>SSIM</option>
-                      </Select>
-                    </label>
-                  </div>
                 )}
               </Expander>
               <div class={style.optionOneCell}>

src/features/encoders/avif/shared/meta.ts

@@ -10,22 +10,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { EncodeOptions, AVIFTune } from 'codecs/avif/enc/avif_enc';
+import type { EncodeOptions } from 'codecs/avif/enc/avif_enc';
 
-export { EncodeOptions, AVIFTune };
+export { EncodeOptions };
 
 export const label = 'AVIF';
 export const mimeType = 'image/avif';
 export const extension = 'avif';
 export const defaultOptions: EncodeOptions = {
-  cqLevel: 33,
-  cqAlphaLevel: -1,
-  denoiseLevel: 0,
+  minQuantizer: 33,
+  maxQuantizer: 63,
+  minQuantizerAlpha: 33,
+  maxQuantizerAlpha: 63,
   tileColsLog2: 0,
   tileRowsLog2: 0,
-  speed: 6,
+  speed: 8,
   subsample: 1,
-  chromaDeltaQ: false,
-  sharpness: 0,
-  tune: AVIFTune.auto,
 };

src/features/encoders/jxl/client/index.tsx

@@ -28,7 +28,6 @@ interface State {
   lossless: boolean;
   slightLoss: boolean;
   autoEdgePreservingFilter: boolean;
-  decodingSpeedTier: number;
 }
 
 const maxSpeed = 7;
@@ -54,7 +53,6 @@ export class Options extends Component<Props, State> {
       lossless: options.quality === 100,
       slightLoss: options.lossyPalette,
       autoEdgePreservingFilter: options.epf === -1,
-      decodingSpeedTier: options.decodingSpeedTier,
     };
   }
 
@@ -95,7 +93,6 @@ export class Options extends Component<Props, State> {
             : optionState.edgePreservingFilter,
           nearLossless: 0,
           lossyPalette: optionState.lossless ? optionState.slightLoss : false,
-          decodingSpeedTier: optionState.decodingSpeedTier,
         };
 
         // Updating options, so we don't recalculate in getDerivedStateFromProps.
@@ -120,7 +117,6 @@ export class Options extends Component<Props, State> {
       lossless,
       slightLoss,
       autoEdgePreservingFilter,
-      decodingSpeedTier,
     }: State,
   ) {
     // I'm rendering both lossy and lossless forms, as it becomes much easier when
@@ -189,16 +185,6 @@ export class Options extends Component<Props, State> {
                   </div>
                 )}
               </Expander>
-              <div class={style.optionOneCell}>
-                <Range
-                  min="0"
-                  max="4"
-                  value={decodingSpeedTier}
-                  onInput={this._inputChange('decodingSpeedTier', 'number')}
-                >
-                  Optimise for decoding speed (worse compression):
-                </Range>
-              </div>
             </div>
           )}
         </Expander>

src/features/encoders/jxl/shared/meta.ts

@@ -15,7 +15,7 @@ import type { EncodeOptions } from 'codecs/jxl/enc/jxl_enc';
 export { EncodeOptions };
 
 export const label = 'JPEG XL (beta)';
-export const mimeType = 'image/jxl';
+export const mimeType = 'image/jpegxl';
 export const extension = 'jxl';
 export const defaultOptions: EncodeOptions = {
   speed: 4,
@@ -24,5 +24,4 @@ export const defaultOptions: EncodeOptions = {
   epf: -1,
   nearLossless: 0,
   lossyPalette: false,
-  decodingSpeedTier: 0,
 };

src/features/encoders/jxl/worker/jxlEncode.ts

@@ -14,17 +14,28 @@ import type { JXLModule } from 'codecs/jxl/enc/jxl_enc';
 import type { EncodeOptions } from '../shared/meta';
 
 import { initEmscriptenModule } from 'features/worker-utils';
-import { threads } from 'wasm-feature-detect';
+import { threads, simd } from 'wasm-feature-detect';
 
 import wasmUrl from 'url:codecs/jxl/enc/jxl_enc.wasm';
 
 import wasmUrlWithMT from 'url:codecs/jxl/enc/jxl_enc_mt.wasm';
 import workerUrl from 'omt:codecs/jxl/enc/jxl_enc_mt.worker.js';
 
+import wasmUrlWithMTAndSIMD from 'url:codecs/jxl/enc/jxl_enc_mt_simd.wasm';
+import workerUrlWithSIMD from 'omt:codecs/jxl/enc/jxl_enc_mt_simd.worker.js';
+
 let emscriptenModule: Promise<JXLModule>;
 
 async function init() {
   if (await threads()) {
+    if (await simd()) {
+      const jxlEncoder = await import('codecs/jxl/enc/jxl_enc_mt_simd');
+      return initEmscriptenModule(
+        jxlEncoder.default,
+        wasmUrlWithMTAndSIMD,
+        workerUrlWithSIMD,
+      );
+    }
     const jxlEncoder = await import('codecs/jxl/enc/jxl_enc_mt');
     return initEmscriptenModule(jxlEncoder.default, wasmUrlWithMT, workerUrl);
   }

src/features/encoders/oxiPNG/client/index.tsx

@@ -2,7 +2,6 @@ import {
   canvasEncode,
   abortable,
   blobToArrayBuffer,
-  inputFieldChecked,
 } from 'client/lazy-app/util';
 import { EncodeOptions } from '../shared/meta';
 import type WorkerBridge from 'client/lazy-app/worker-bridge';
@@ -10,7 +9,6 @@ import { h, Component } from 'preact';
 import { inputFieldValueAsNumber, preventDefault } from 'client/lazy-app/util';
 import * as style from 'client/lazy-app/Compress/Options/style.css';
 import Range from 'client/lazy-app/Compress/Options/Range';
-import Checkbox from 'client/lazy-app/Compress/Options/Checkbox';
 
 export async function encode(
   signal: AbortSignal,
@@ -36,7 +34,6 @@ export class Options extends Component<Props, {}> {
 
     const options: EncodeOptions = {
       level: inputFieldValueAsNumber(form.level),
-      interlace: inputFieldChecked(form.interlace),
     };
     this.props.onChange(options);
   };
@@ -44,14 +41,6 @@ export class Options extends Component<Props, {}> {
   render({ options }: Props) {
     return (
       <form class={style.optionsSection} onSubmit={preventDefault}>
-        <label class={style.optionToggle}>
-          Interlace
-          <Checkbox
-            name="interlace"
-            checked={options.interlace}
-            onChange={this.onChange}
-          />
-        </label>
         <div class={style.optionOneCell}>
           <Range
             name="level"