Adding the Quite OK Image (QOI) Codec (#1384)

added snack bar inside noscript element

.gitattributes

@@ -1,2 +1,2 @@
-/codecs/**/*.js linguist-generated=true
-/codecs/*/pkg*/*.d.ts linguist-generated=true
+/codecs/**/*.js linguist-generated -diff
+/codecs/*/pkg*/*.d.ts linguist-generated

.husky/pre-commit

@@ -0,0 +1 @@
+npx lint-staged

README.md

@@ -1,36 +1,38 @@
 # [Squoosh]!
 
-[Squoosh] is an image compression web app that allows you to dive into the advanced options provided
-by various image compressors.
-
-# CLI
-
-[Squoosh now has a CLI](https://github.com/GoogleChromeLabs/squoosh/tree/dev/cli) that allows you to compress many images at once.
+[Squoosh] is an image compression web app that reduces image sizes through numerous formats.
 
 # Privacy
 
-Google Analytics is used to record the following:
+Squoosh does not send your image to a server. All image compression processes locally.
 
-- [Basic visit data](https://support.google.com/analytics/answer/6004245?ref_topic=2919631).
-- Before and after image size once an image is downloaded. These values are rounded to the nearest
-  kilobyte.
-- If install is available, when Squoosh is installed, and what method was used to install Squoosh.
+However, Squoosh utilizes Google Analytics to collect the following:
 
-Image compression is handled locally; no additional data is sent to the server.
+- [Basic visitor data](https://support.google.com/analytics/answer/6004245?ref_topic=2919631).
+- The before and after image size value.
+- If Squoosh PWA, the type of Squoosh installation.
+- If Squoosh PWA, the installation time and date.
 
-# Building locally
+# Developing
 
-Clone the repo, and:
+To develop for Squoosh:
 
-```sh
-npm install
-npm run build
-```
+1. Clone the repository
+1. To install node packages, run:
+   ```sh
+   npm install
+   ```
+1. Then build the app by running:
+   ```sh
+   npm run build
+   ```
+1. After building, start the development server by running:
+   ```sh
+   npm run dev
+   ```
 
-You can run the development server with:
+# Contributing
 
-```sh
-npm run dev
-```
+Squoosh is an open-source project that appreciates all community involvement. To contribute to the project, follow the [contribute guide](/CONTRIBUTING.md).
 
 [squoosh]: https://squoosh.app

cli/.gitignore

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

cli/.npmignore

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

cli/README.md

@@ -1,59 +0,0 @@
-# Squoosh CLI
-
-Squoosh CLI is an _experimental_ way to run all the codecs you know from the [Squoosh] web app on your command line using WebAssembly. The Squoosh CLI uses a worker pool to parallelize processing images. This way you can apply the same codec to many images at once.
-
-Squoosh CLI 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
-
-The Squoosh CLI can be used straight from the command line without installing using `npx`:
-
-```
-$ npx @squoosh/cli <options...>
-```
-
-Of course, you can also install the Squoosh CLI:
-
-```
-$ npm i -g @squoosh/cli
-$ squoosh-cli <options...>
-```
-
-## Usage
-
-```
-Usage: squoosh-cli [options] <files...>
-
-Options:
-  -V, --version                                          output the version number
-  -d, --output-dir <dir>                                 Output directory (default: ".")
-  -s, --suffix <suffix>                                  Append suffix to output files (default: "")
-  --max-optimizer-rounds <rounds>                        Maximum number of compressions to use for auto optimizations (default: "6")
-  --optimizer-butteraugli-target <butteraugli distance>  Target Butteraugli distance for auto optimizer (default: "1.4")
-  --resize [config]                                      Resize the image before compressing
-  --quant [config]                                       Reduce the number of colors used (aka. paletting)
-  --rotate [config]                                      Rotate image
-  --mozjpeg [config]                                     Use MozJPEG to generate a .jpg file with the given configuration
-  --webp [config]                                        Use WebP to generate a .webp file with the given configuration
-  --avif [config]                                        Use AVIF to generate a .avif file with the given configuration
-  --jxl [config]                                         Use JPEG-XL to generate a .jxl file with the given configuration
-  --wp2 [config]                                         Use WebP2 to generate a .wp2 file with the given configuration
-  --oxipng [config]                                      Use OxiPNG to generate a .png file with the given configuration
-  -h, --help                                             display help for command
-```
-
-The default values for each `config` option can be found in the [`codecs.js`][codecs.js] file under `defaultEncoderOptions`. Every unspecified value will use the default value specified here. _Better documentation is needed here._
-
-## Auto optimizer
-
-Squoosh CLI 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.
-
-```
-$ npx @squoosh/cli --wp2 auto test.png
-```
-
-[squoosh]: https://squoosh.app
-[codecs.js]: https://github.com/GoogleChromeLabs/squoosh/blob/dev/cli/src/codecs.js
-[butteraugli]: https://github.com/google/butteraugli

cli/lib/asset-plugin.js

@@ -1,75 +0,0 @@
-/**
- * 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
- *     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.
- */
-import { promises as fs } from "fs";
-import { basename } from "path";
-
-const defaultOpts = {
-  prefix: "asset-url"
-};
-
-export default function assetPlugin(opts) {
-  opts = { ...defaultOpts, ...opts };
-
-  /** @type {Map<string, Buffer>} */
-  let assetIdToSourceBuffer;
-
-  const prefix = opts.prefix + ":";
-  return {
-    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))
-        .filter(Boolean);
-
-      if (buffers.length === 0) return;
-
-      for (const moduleId of Object.keys(info.modules)) {
-        const buffer = assetIdToSourceBuffer.get(moduleId);
-        if (buffer) buffers.push(buffer);
-      }
-
-      const combinedBuffer =
-        buffers.length === 1 ? buffers[0] : Buffer.concat(buffers);
-
-      return combinedBuffer;
-    },
-    async resolveId(id, importer) {
-      if (!id.startsWith(prefix)) return;
-      const realId = id.slice(prefix.length);
-      const resolveResult = await this.resolve(realId, importer);
-
-      if (!resolveResult) {
-        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";
-    },
-    async load(id) {
-      if (!id.startsWith(prefix)) return;
-      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",
-        source,
-        name: basename(realId)
-      })}`;
-    }
-  };
-}

cli/lib/autojson-plugin.js

@@ -1,12 +0,0 @@
-import { promises as fsp } from 'fs';
-
-export default function autojsonPlugin() {
-  return {
-    name: 'autojson-plugin',
-    async load(id) {
-      if (id.endsWith('.json') && !id.startsWith('json:')) {
-        return 'export default ' + await fsp.readFile(id, 'utf8');
-      }
-    }
-  };
-};

cli/lib/json-plugin.js

@@ -1,38 +0,0 @@
-import { promises as fsp } from 'fs';
-
-const prefix = 'json:';
-
-const reservedKeys = ['public'];
-
-export default function jsonPlugin() {
-  return {
-    name: 'json-plugin',
-    async resolveId(id, importer) {
-      if (!id.startsWith(prefix)) return;
-      const realId = id.slice(prefix.length);
-      const resolveResult = await this.resolve(realId, importer);
-
-      if (!resolveResult) {
-        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;
-    },
-    async load(id) {
-      if (!id.startsWith(prefix)) return;
-      const realId = id.slice(prefix.length);
-      const source = await fsp.readFile(realId, 'utf8');
-
-      let code = '';
-      for (const [key, value] of Object.entries(JSON.parse(source))) {
-        if (reservedKeys.includes(key)) {
-          continue;
-        }
-        code += `
-        export const ${key} = ${JSON.stringify(value)};
-      `;
-      }
-      return code;
-    },
-  };
-}

cli/package.json

@@ -1,32 +0,0 @@
-{
-  "name": "@squoosh/cli",
-  "version": "0.6.0",
-  "description": "A CLI for Squoosh",
-  "public": true,
-  "bin": {
-    "squoosh-cli": "build/index.js",
-    "@squoosh/cli": "build/index.js"
-  },
-  "scripts": {
-    "build": "rollup -c"
-  },
-  "keywords": [],
-  "author": "Google Chrome Developers <chromium-dev@google.com>",
-  "license": "Apache-2.0",
-  "dependencies": {
-    "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

@@ -1,45 +0,0 @@
-import resolve from '@rollup/plugin-node-resolve';
-import cjs from '@rollup/plugin-commonjs';
-import asset from './lib/asset-plugin.js';
-import json from './lib/json-plugin.js';
-import autojson from './lib/autojson-plugin.js';
-import { getBabelOutputPlugin } from '@rollup/plugin-babel';
-import { builtinModules } from 'module';
-
-/** @type {import('rollup').RollupOptions} */
-export default {
-  input: 'src/index.js',
-  output: {
-    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(),
-    cjs(),
-    asset(),
-    autojson(),
-    json(),
-    getBabelOutputPlugin({
-      babelrc: false,
-      configFile: false,
-      minified: process.env.DEBUG != '',
-      comments: false,
-      presets: [
-        [
-          '@babel/preset-env',
-          {
-            targets: {
-              node: 12,
-            },
-            loose: true,
-          },
-        ],
-      ],
-    }),
-  ],
-  external: builtinModules,
-};

cli/src/auto-optimizer.js

@@ -1,70 +0,0 @@
-import { instantiateEmscriptenWasm } from "./emscripten-utils.js";
-
-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`
-// will result in an increase in the return value. The function uses binary search
-// to find `parameter` such that `measure` returns `measureGoal`, within an error
-// of `epsilon`. It will use at most `maxRounds` attempts.
-export async function binarySearch(
-  measureGoal,
-  measure,
-  { min = 0, max = 100, epsilon = 0.1, maxRounds = 8 } = {}
-) {
-  let parameter = (max - min) / 2 + min;
-  let delta = (max - min) / 4;
-  let value;
-  let round = 1;
-  while (true) {
-    value = await measure(parameter);
-    if (Math.abs(value - measureGoal) < epsilon || round >= maxRounds) {
-      return { parameter, round, value };
-    }
-    if (value > measureGoal) {
-      parameter -= delta;
-    } else if (value < measureGoal) {
-      parameter += delta;
-    }
-    delta /= 2;
-    round++;
-  }
-}
-
-export async function autoOptimize(
-  bitmapIn,
-  encode,
-  decode,
-  { butteraugliDistanceGoal = 1.4, ...otherOpts } = {}
-) {
-  const { VisDiff } = await instantiateEmscriptenWasm(visdif, visdifWasm);
-
-  const comparator = new VisDiff(
-    bitmapIn.data,
-    bitmapIn.width,
-    bitmapIn.height
-  );
-
-  let bitmapOut;
-  let binaryOut;
-  // Increasing quality means _decrease_ in Butteraugli distance.
-  // `binarySearch` assumes that increasing `parameter` will
-  // increase the metric value. So multipliy Butteraugli values by -1.
-  const { parameter } = await binarySearch(
-    -1 * butteraugliDistanceGoal,
-    async quality => {
-      binaryOut = await encode(bitmapIn, quality);
-      bitmapOut = await decode(binaryOut);
-      return -1 * comparator.distance(bitmapOut.data);
-    },
-    otherOpts
-  );
-  comparator.delete();
-
-  return {
-    bitmap: bitmapOut,
-    binary: binaryOut,
-    quality: parameter
-  };
-}

cli/src/codecs.js

@@ -1,361 +0,0 @@
-import { promises as fsp } from 'fs';
-import { instantiateEmscriptenWasm, pathify } from './emscripten-utils.js';
-
-// MozJPEG
-import mozEnc from '../../codecs/mozjpeg/enc/mozjpeg_node_enc.js';
-import mozEncWasm from 'asset-url:../../codecs/mozjpeg/enc/mozjpeg_node_enc.wasm';
-import mozDec from '../../codecs/mozjpeg/dec/mozjpeg_node_dec.js';
-import mozDecWasm from 'asset-url:../../codecs/mozjpeg/dec/mozjpeg_node_dec.wasm';
-
-// WebP
-import webpEnc from '../../codecs/webp/enc/webp_node_enc.js';
-import webpEncWasm from 'asset-url:../../codecs/webp/enc/webp_node_enc.wasm';
-import webpDec from '../../codecs/webp/dec/webp_node_dec.js';
-import webpDecWasm from 'asset-url:../../codecs/webp/dec/webp_node_dec.wasm';
-
-// AVIF
-import avifEnc from '../../codecs/avif/enc/avif_node_enc.js';
-import avifEncWasm from 'asset-url:../../codecs/avif/enc/avif_node_enc.wasm';
-import avifDec from '../../codecs/avif/dec/avif_node_dec.js';
-import avifDecWasm from 'asset-url:../../codecs/avif/dec/avif_node_dec.wasm';
-
-// JXL
-import jxlEnc from '../../codecs/jxl/enc/jxl_node_enc.js';
-import jxlEncWasm from 'asset-url:../../codecs/jxl/enc/jxl_node_enc.wasm';
-import jxlDec from '../../codecs/jxl/dec/jxl_node_dec.js';
-import jxlDecWasm from 'asset-url:../../codecs/jxl/dec/jxl_node_dec.wasm';
-
-// WP2
-import wp2Enc from '../../codecs/wp2/enc/wp2_node_enc.js';
-import wp2EncWasm from 'asset-url:../../codecs/wp2/enc/wp2_node_enc.wasm';
-import wp2Dec from '../../codecs/wp2/dec/wp2_node_dec.js';
-import wp2DecWasm from 'asset-url:../../codecs/wp2/dec/wp2_node_dec.wasm';
-
-// PNG
-import * as pngEncDec from '../../codecs/png/pkg/squoosh_png.js';
-import pngEncDecWasm from 'asset-url:../../codecs/png/pkg/squoosh_png_bg.wasm';
-const pngEncDecPromise = pngEncDec.default(
-  fsp.readFile(pathify(pngEncDecWasm)),
-);
-
-// OxiPNG
-import * as oxipng from '../../codecs/oxipng/pkg/squoosh_oxipng.js';
-import oxipngWasm from 'asset-url:../../codecs/oxipng/pkg/squoosh_oxipng_bg.wasm';
-const oxipngPromise = oxipng.default(fsp.readFile(pathify(oxipngWasm)));
-
-// Resize
-import * as resize from '../../codecs/resize/pkg/squoosh_resize.js';
-import resizeWasm from 'asset-url:../../codecs/resize/pkg/squoosh_resize_bg.wasm';
-const resizePromise = resize.default(fsp.readFile(pathify(resizeWasm)));
-
-// rotate
-import rotateWasm from 'asset-url:../../codecs/rotate/rotate.wasm';
-
-// ImageQuant
-import imageQuant from '../../codecs/imagequant/imagequant_node.js';
-import imageQuantWasm from 'asset-url:../../codecs/imagequant/imagequant_node.wasm';
-const imageQuantPromise = instantiateEmscriptenWasm(imageQuant, imageQuantWasm);
-
-// Our decoders currently rely on a `ImageData` global.
-import ImageData from './image_data.js';
-globalThis.ImageData = ImageData;
-
-function resizeNameToIndex(name) {
-  switch (name) {
-    case 'triangle':
-      return 0;
-    case 'catrom':
-      return 1;
-    case 'mitchell':
-      return 2;
-    case 'lanczos3':
-      return 3;
-    default:
-      throw Error(`Unknown resize algorithm "${name}"`);
-  }
-}
-
-function resizeWithAspect({
-  input_width,
-  input_height,
-  target_width,
-  target_height,
-}) {
-  if (!target_width && !target_height) {
-    throw Error('Need to specify at least width or height when resizing');
-  }
-  if (target_width && target_height) {
-    return { width: target_width, height: target_height };
-  }
-  if (!target_width) {
-    return {
-      width: Math.round((input_width / input_height) * target_height),
-      height: target_height,
-    };
-  }
-  if (!target_height) {
-    return {
-      width: target_width,
-      height: Math.round((input_height / input_width) * target_width),
-    };
-  }
-}
-
-export const preprocessors = {
-  resize: {
-    name: 'Resize',
-    description: 'Resize the image before compressing',
-    instantiate: async () => {
-      await resizePromise;
-      return (
-        buffer,
-        input_width,
-        input_height,
-        { width, height, method, premultiply, linearRGB },
-      ) => {
-        ({ width, height } = resizeWithAspect({
-          input_width,
-          input_height,
-          target_width: width,
-          target_height: height,
-        }));
-        return new ImageData(
-          resize.resize(
-            buffer,
-            input_width,
-            input_height,
-            width,
-            height,
-            resizeNameToIndex(method),
-            premultiply,
-            linearRGB,
-          ),
-          width,
-          height,
-        );
-      };
-    },
-    defaultOptions: {
-      method: 'lanczos3',
-      fitMethod: 'stretch',
-      premultiply: true,
-      linearRGB: true,
-    },
-  },
-  // // TODO: Need to handle SVGs and HQX
-  quant: {
-    name: 'ImageQuant',
-    description: 'Reduce the number of colors used (aka. paletting)',
-    instantiate: async () => {
-      const imageQuant = await imageQuantPromise;
-      return (buffer, width, height, { numColors, dither }) =>
-        new ImageData(
-          imageQuant.quantize(buffer, width, height, numColors, dither),
-          width,
-          height,
-        );
-    },
-    defaultOptions: {
-      numColors: 255,
-      dither: 1.0,
-    },
-  },
-  rotate: {
-    name: 'Rotate',
-    description: 'Rotate image',
-    instantiate: async () => {
-      return async (buffer, width, height, { numRotations }) => {
-        const degrees = (numRotations * 90) % 360;
-        const sameDimensions = degrees == 0 || degrees == 180;
-        const size = width * height * 4;
-        const { instance } = await WebAssembly.instantiate(
-          await fsp.readFile(pathify(rotateWasm)),
-        );
-        const { memory } = instance.exports;
-        const additionalPagesNeeded = Math.ceil(
-          (size * 2 - memory.buffer.byteLength + 8) / (64 * 1024),
-        );
-        if (additionalPagesNeeded > 0) {
-          memory.grow(additionalPagesNeeded);
-        }
-        const view = new Uint8ClampedArray(memory.buffer);
-        view.set(buffer, 8);
-        instance.exports.rotate(width, height, degrees);
-        return new ImageData(
-          view.slice(size + 8, size * 2 + 8),
-          sameDimensions ? width : height,
-          sameDimensions ? height : width,
-        );
-      };
-    },
-    defaultOptions: {
-      numRotations: 0,
-    },
-  },
-};
-
-export const codecs = {
-  mozjpeg: {
-    name: 'MozJPEG',
-    extension: 'jpg',
-    detectors: [/^\xFF\xD8\xFF/],
-    dec: () => instantiateEmscriptenWasm(mozDec, mozDecWasm),
-    enc: () => instantiateEmscriptenWasm(mozEnc, mozEncWasm),
-    defaultEncoderOptions: {
-      quality: 75,
-      baseline: false,
-      arithmetic: false,
-      progressive: true,
-      optimize_coding: true,
-      smoothing: 0,
-      color_space: 3 /*YCbCr*/,
-      quant_table: 3,
-      trellis_multipass: false,
-      trellis_opt_zero: false,
-      trellis_opt_table: false,
-      trellis_loops: 1,
-      auto_subsample: true,
-      chroma_subsample: 2,
-      separate_chroma_quality: false,
-      chroma_quality: 75,
-    },
-    autoOptimize: {
-      option: 'quality',
-      min: 0,
-      max: 100,
-    },
-  },
-  webp: {
-    name: 'WebP',
-    extension: 'webp',
-    detectors: [/^RIFF....WEBPVP8[LX ]/],
-    dec: () => instantiateEmscriptenWasm(webpDec, webpDecWasm),
-    enc: () => instantiateEmscriptenWasm(webpEnc, webpEncWasm),
-    defaultEncoderOptions: {
-      quality: 75,
-      target_size: 0,
-      target_PSNR: 0,
-      method: 4,
-      sns_strength: 50,
-      filter_strength: 60,
-      filter_sharpness: 0,
-      filter_type: 1,
-      partitions: 0,
-      segments: 4,
-      pass: 1,
-      show_compressed: 0,
-      preprocessing: 0,
-      autofilter: 0,
-      partition_limit: 0,
-      alpha_compression: 1,
-      alpha_filtering: 1,
-      alpha_quality: 100,
-      lossless: 0,
-      exact: 0,
-      image_hint: 0,
-      emulate_jpeg_size: 0,
-      thread_level: 0,
-      low_memory: 0,
-      near_lossless: 100,
-      use_delta_palette: 0,
-      use_sharp_yuv: 0,
-    },
-    autoOptimize: {
-      option: 'quality',
-      min: 0,
-      max: 100,
-    },
-  },
-  avif: {
-    name: 'AVIF',
-    extension: 'avif',
-    detectors: [/^\x00\x00\x00 ftypavif\x00\x00\x00\x00/],
-    dec: () => instantiateEmscriptenWasm(avifDec, avifDecWasm),
-    enc: () => instantiateEmscriptenWasm(avifEnc, avifEncWasm),
-    defaultEncoderOptions: {
-      minQuantizer: 33,
-      maxQuantizer: 63,
-      minQuantizerAlpha: 33,
-      maxQuantizerAlpha: 63,
-      tileColsLog2: 0,
-      tileRowsLog2: 0,
-      speed: 8,
-      subsample: 1,
-    },
-    autoOptimize: {
-      option: 'maxQuantizer',
-      min: 0,
-      max: 62,
-    },
-  },
-  jxl: {
-    name: 'JPEG-XL',
-    extension: 'jxl',
-    detectors: [/^\xff\x0a/],
-    dec: () => instantiateEmscriptenWasm(jxlDec, jxlDecWasm),
-    enc: () => instantiateEmscriptenWasm(jxlEnc, jxlEncWasm),
-    defaultEncoderOptions: {
-      speed: 4,
-      quality: 75,
-      progressive: false,
-      epf: -1,
-      nearLossless: 0,
-      lossyPalette: false,
-    },
-    autoOptimize: {
-      option: 'quality',
-      min: 0,
-      max: 100,
-    },
-  },
-  wp2: {
-    name: 'WebP2',
-    extension: 'wp2',
-    detectors: [/^\xF4\xFF\x6F/],
-    dec: () => instantiateEmscriptenWasm(wp2Dec, wp2DecWasm),
-    enc: () => instantiateEmscriptenWasm(wp2Enc, wp2EncWasm),
-    defaultEncoderOptions: {
-      quality: 75,
-      alpha_quality: 75,
-      effort: 5,
-      pass: 1,
-      sns: 50,
-      uv_mode: 0 /*UVMode.UVModeAuto*/,
-      csp_type: 0 /*Csp.kYCoCg*/,
-      error_diffusion: 0,
-      use_random_matrix: false,
-    },
-    autoOptimize: {
-      option: 'quality',
-      min: 0,
-      max: 100,
-    },
-  },
-  oxipng: {
-    name: 'OxiPNG',
-    extension: 'png',
-    detectors: [/^\x89PNG\x0D\x0A\x1A\x0A/],
-    dec: async () => {
-      await pngEncDecPromise;
-      return { decode: pngEncDec.decode };
-    },
-    enc: async () => {
-      await pngEncDecPromise;
-      await oxipngPromise;
-      return {
-        encode: (buffer, width, height, opts) => {
-          const simplePng = pngEncDec.encode(new Uint8Array(buffer), width, height);
-          return oxipng.optimise(simplePng, opts.level);
-        },
-      };
-    },
-    defaultEncoderOptions: {
-      level: 2,
-    },
-    autoOptimize: {
-      option: 'level',
-      min: 6,
-      max: 1,
-    },
-  },
-};

cli/src/emscripten-utils.js

@@ -1,16 +0,0 @@
-import { fileURLToPath } from 'url';
-
-export function pathify(path) {
-  if (path.startsWith('file://')) {
-    path = fileURLToPath(path);
-  }
-  return path;
-}
-
-export function instantiateEmscriptenWasm(factory, path) {
-  return factory({
-    locateFile() {
-      return pathify(path);
-    },
-  });
-}

cli/src/image_data.js

@@ -1,7 +0,0 @@
-export default class ImageData {
-  constructor(data, width, height) {
-    this.data = data;
-    this.width = width;
-    this.height = height;
-  }
-}

cli/src/index.js

@@ -1,362 +0,0 @@
-import { program } from 'commander';
-import JSON5 from 'json5';
-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 { 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;
-  if (v > max) return max;
-  return v;
-}
-
-const suffix = ['B', 'KB', 'MB'];
-function prettyPrintSize(size) {
-  const base = Math.floor(Math.log2(size) / 10);
-  const index = clamp(base, 0, 2);
-  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 = {};
-  tracker.spinner = spinner;
-  tracker.progressOffset = 0;
-  tracker.totalOffset = 0;
-  let status = '';
-  tracker.setStatus = (text) => {
-    status = text || '';
-    update();
-  };
-  let progress = '';
-  tracker.setProgress = (done, total) => {
-    spinner.prefixText = kleur.dim(`${done}/${total}`);
-    const completeness =
-      (tracker.progressOffset + done) / (tracker.totalOffset + total);
-    progress = kleur.cyan(
-      `▐${'▨'.repeat((completeness * 10) | 0).padEnd(10, '╌')}▌ `,
-    );
-    update();
-  };
-  function update() {
-    spinner.text = progress + kleur.bold(status) + getResultsText();
-  }
-  tracker.finish = (text) => {
-    spinner.succeed(kleur.bold(text) + getResultsText());
-  };
-  function getResultsText() {
-    let out = '';
-    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 + '%',
-        )})`;
-        if (infoText) out += kleur.yellow(infoText);
-      }
-    }
-    return out || '\n';
-  }
-  spinner.start();
-  return tracker;
-}
-
-async function getInputFiles(paths) {
-  const validFiles = [];
-
-  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: ${resolvePath(file)}`,
-          );
-          continue;
-        } else {
-          throw err;
-        }
-      }
-
-      validFiles.push(file);
-    }
-  }
-
-  return validFiles;
-}
-
-async function processFiles(files) {
-  files = await getInputFiles(files);
-
-  const parallelism = cpus().length;
-
-  const results = new Map();
-  const progress = progressTracker(results);
-
-  progress.setStatus('Decoding...');
-  progress.totalOffset = files.length;
-  progress.setProgress(0, files.length);
-
-  const workerPool = new WorkerPool(parallelism, __filename);
-  // Create output directory
-  await fsp.mkdir(program.outputDir, { recursive: true });
-
-  let decoded = 0;
-  let decodedFiles = await Promise.all(
-    files.map(async (file) => {
-      const result = await workerPool.dispatchJob({
-        operation: 'decode',
-        file,
-      });
-      results.set(file, {
-        file: result.file,
-        size: result.size,
-        outputs: [],
-      });
-      progress.setProgress(++decoded, files.length);
-      return result;
-    }),
-  );
-
-  for (const [preprocessorName, value] of Object.entries(preprocessors)) {
-    if (!program[preprocessorName]) {
-      continue;
-    }
-    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,
-        });
-      }),
-    );
-  }
-
-  progress.progressOffset = decoded;
-  progress.setStatus('Encoding ' + kleur.dim(`(${parallelism} threads)`));
-  progress.setProgress(0, files.length);
-
-  const jobs = [];
-  let jobsStarted = 0;
-  let jobsFinished = 0;
-  for (const { file, bitmap, size } of decodedFiles) {
-    const ext = extname(file);
-    const base = basename(file, ext) + program.suffix;
-
-    for (const [encName, value] of Object.entries(supportedFormats)) {
-      if (!program[encName]) {
-        continue;
-      }
-      const encParam =
-        typeof program[encName] === 'string' ? program[encName] : '{}';
-      const encConfig =
-        encParam.toLowerCase() === 'auto'
-          ? 'auto'
-          : Object.assign(
-              {},
-              value.defaultEncoderOptions,
-              JSON5.parse(encParam),
-            );
-      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(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);
-  progress.finish('Squoosh results:');
-}
-
-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', '')
-    .option(
-      '--max-optimizer-rounds <rounds>',
-      'Maximum number of compressions to use for auto optimizations',
-      '6',
-    )
-    .option(
-      '--optimizer-butteraugli-target <butteraugli distance>',
-      'Target Butteraugli distance for auto optimizer',
-      '1.4',
-    )
-    .action(processFiles);
-
-  // 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(supportedFormats)) {
-    program.option(
-      `--${key} [config]`,
-      `Use ${value.name} to generate a .${value.extension} file with the given configuration`,
-    );
-  }
-
-  program.parse(process.argv);
-} else {
-  WorkerPool.useThisThreadAsWorker(handleJob);
-}

cli/src/worker_pool.js

@@ -1,94 +0,0 @@
-import { Worker, parentPort } from 'worker_threads';
-import { TransformStream } from 'web-streams-polyfill';
-
-function uuid() {
-  return Array.from({ length: 16 }, () =>
-    Math.floor(Math.random() * 256).toString(16),
-  ).join('');
-}
-
-function jobPromise(worker, msg) {
-  return new Promise((resolve) => {
-    const id = uuid();
-    worker.postMessage({ msg, id });
-    worker.on('message', function f({ result, id: rid }) {
-      if (rid !== id) {
-        return;
-      }
-      worker.off('message', f);
-      resolve(result);
-    });
-    worker.on('error', (error) => console.error('Worker error: ', error));
-  });
-}
-
-export default class WorkerPool {
-  constructor(numWorkers, workerFile) {
-    this.numWorkers = numWorkers;
-    this.jobQueue = new TransformStream();
-    this.workerQueue = new TransformStream();
-
-    const writer = this.workerQueue.writable.getWriter();
-    for (let i = 0; i < numWorkers; i++) {
-      writer.write(new Worker(workerFile));
-    }
-    writer.releaseLock();
-
-    this.done = this._readLoop();
-  }
-
-  async _readLoop() {
-    const reader = this.jobQueue.readable.getReader();
-    while (true) {
-      const { value, done } = await reader.read();
-      if (done) {
-        await this._terminateAll();
-        return;
-      }
-      const { msg, resolve } = value;
-      const worker = await this._nextWorker();
-      jobPromise(worker, msg).then((result) => {
-        resolve(result);
-        const writer = this.workerQueue.writable.getWriter();
-        writer.write(worker);
-        writer.releaseLock();
-      });
-    }
-  }
-
-  async _nextWorker() {
-    const reader = this.workerQueue.readable.getReader();
-    const { value, done } = await reader.read();
-    reader.releaseLock();
-    return value;
-  }
-
-  async _terminateAll() {
-    for (let n = 0; n < this.numWorkers; n++) {
-      const worker = await this._nextWorker();
-      worker.terminate();
-    }
-    this.workerQueue.writable.close();
-  }
-
-  async join() {
-    this.jobQueue.writable.getWriter().close();
-    await this.done;
-  }
-
-  dispatchJob(msg) {
-    return new Promise((resolve) => {
-      const writer = this.jobQueue.writable.getWriter();
-      writer.write({ msg, resolve });
-      writer.releaseLock();
-    });
-  }
-
-  static useThisThreadAsWorker(cb) {
-    parentPort.on('message', async (data) => {
-      const { msg, id } = data;
-      const result = await cb(msg);
-      parentPort.postMessage({ result, id });
-    });
-  }
-}

client-tsconfig.json

@@ -14,6 +14,7 @@
     // for comlink
     "src/features/**/worker/**/*",
     "src/features-worker/**/*",
-    "src/features/worker-utils/**/*"
+    "src/features/worker-utils/**/*",
+    "src/worker-shared/**/*"
   ]
 }

codecs/avif/Makefile

@@ -1,20 +1,25 @@
-CODEC_URL = https://github.com/AOMediaCodec/libavif/archive/31d7c6d1e32cf467ac24fb8c7a76c4902a4c00db.tar.gz
+# libavif and libaom versions are from
+# google3/third_party/libavif/METADATA
+CODEC_URL = https://github.com/AOMediaCodec/libavif/archive/647c3c208cf152395d777c1bf7240d2ecf7df5a9.tar.gz
 CODEC_PACKAGE = node_modules/libavif.tar.gz
 
-LIBAOM_URL = https://aomedia.googlesource.com/aom/+archive/v2.0.0.tar.gz
+LIBAOM_URL = https://aomedia.googlesource.com/aom/+archive/v3.6.0.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
 
+override CFLAGS += "-Wno-unused-macros"
+export
+
 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
+OUT_NODE_ENC_MT_JS = enc/avif_node_enc_mt.js
 OUT_DEC_JS = dec/avif_dec.js
 OUT_NODE_DEC_JS = dec/avif_node_dec.js
 
-OUT_ENC_CPP = enc/avif_enc.cpp
 OUT_ENC_CPP = enc/avif_enc.cpp
 OUT_DEC_CPP = dec/avif_dec.cpp
 ENVIRONMENT = worker
@@ -23,9 +28,9 @@ HELPER_MAKEFLAGS := -f helper.Makefile
 
 .PHONY: all clean
 
-all: $(OUT_ENC_JS) $(OUT_DEC_JS) $(OUT_ENC_MT_JS) $(OUT_NODE_ENC_JS) $(OUT_NODE_DEC_JS)
+all: $(OUT_ENC_JS) $(OUT_DEC_JS) $(OUT_ENC_MT_JS) $(OUT_NODE_ENC_JS) $(OUT_NODE_ENC_MT_JS) $(OUT_NODE_DEC_JS)
 
-$(OUT_NODE_ENC_JS): ENVIRONMENT=node 
+$(OUT_NODE_ENC_JS) $(OUT_NODE_ENC_MT_JS): ENVIRONMENT=node
 $(OUT_NODE_ENC_JS) $(OUT_ENC_JS): $(OUT_ENC_CPP) $(CODEC_DIR)/CMakeLists.txt $(LIBAOM_DIR)/CMakeLists.txt
 	$(MAKE) \
 		$(HELPER_MAKEFLAGS) \
@@ -39,7 +44,7 @@ $(OUT_NODE_ENC_JS) $(OUT_ENC_JS): $(OUT_ENC_CPP) $(CODEC_DIR)/CMakeLists.txt $(L
 		ENVIRONMENT=$(ENVIRONMENT) \
 		LIBAVIF_FLAGS="-DAVIF_CODEC_AOM_DECODE=0"
 
-$(OUT_ENC_MT_JS): $(OUT_ENC_CPP) $(CODEC_DIR)/CMakeLists.txt $(LIBAOM_DIR)/CMakeLists.txt
+$(OUT_ENC_MT_JS) $(OUT_NODE_ENC_MT_JS): $(OUT_ENC_CPP) $(CODEC_DIR)/CMakeLists.txt $(LIBAOM_DIR)/CMakeLists.txt
 	$(MAKE) \
 		$(HELPER_MAKEFLAGS) \
 		OUT_JS=$@ \
@@ -84,4 +89,7 @@ $(LIBAOM_DIR)/CMakeLists.txt: $(LIBAOM_PACKAGE)
 clean:
 	$(MAKE) $(HELPER_MAKEFLAGS) OUT_JS=$(OUT_ENC_JS) clean
 	$(MAKE) $(HELPER_MAKEFLAGS) OUT_JS=$(OUT_ENC_MT_JS) clean
+	$(MAKE) $(HELPER_MAKEFLAGS) OUT_JS=$(OUT_ENC_NODE_JS) clean
+	$(MAKE) $(HELPER_MAKEFLAGS) OUT_JS=$(OUT_ENC_NODE_MT_JS) clean
 	$(MAKE) $(HELPER_MAKEFLAGS) OUT_JS=$(OUT_DEC_JS) clean
+	$(MAKE) $(HELPER_MAKEFLAGS) OUT_JS=$(OUT_DEV_NODE_JS) clean

codecs/avif/enc/avif_enc.cpp

@@ -9,10 +9,9 @@ struct AvifOptions {
   // [0 - 63]
   // 0 = lossless
   // 63 = worst quality
-  int minQuantizer;
-  int maxQuantizer;
-  int minQuantizerAlpha;
-  int maxQuantizerAlpha;
+  int cqLevel;
+  // As above, but -1 means 'use cqLevel'
+  int cqAlphaLevel;
   // [0 - 6]
   // Creates 2^n tiles in that dimension
   int tileRowsLog2;
@@ -26,6 +25,16 @@ 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");
@@ -49,18 +58,19 @@ 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 (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) {
+  if (lossless) {
     image->matrixCoefficients = AVIF_MATRIX_COEFFICIENTS_IDENTITY;
   } else {
-    image->matrixCoefficients = AVIF_MATRIX_COEFFICIENTS_BT709;
+    image->matrixCoefficients = AVIF_MATRIX_COEFFICIENTS_BT601;
   }
 
-  uint8_t* rgba = (uint8_t*)buffer.c_str();
+  uint8_t* rgba = reinterpret_cast<uint8_t*>(const_cast<char*>(buffer.data()));
 
   avifRGBImage srcRGB;
   avifRGBImageSetDefaults(&srcRGB, image);
@@ -69,14 +79,44 @@ 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) {
@@ -91,13 +131,15 @@ val encode(std::string buffer, int width, int height, AvifOptions options) {
 
 EMSCRIPTEN_BINDINGS(my_module) {
   value_object<AvifOptions>("AvifOptions")
-      .field("minQuantizer", &AvifOptions::minQuantizer)
-      .field("maxQuantizer", &AvifOptions::maxQuantizer)
-      .field("minQuantizerAlpha", &AvifOptions::minQuantizerAlpha)
-      .field("maxQuantizerAlpha", &AvifOptions::maxQuantizerAlpha)
+      .field("cqLevel", &AvifOptions::cqLevel)
+      .field("cqAlphaLevel", &AvifOptions::cqAlphaLevel)
       .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,12 +1,20 @@
+export const enum AVIFTune {
+  auto,
+  psnr,
+  ssim,
+}
+
 export interface EncodeOptions {
-  minQuantizer: number;
-  maxQuantizer: number;
-  minQuantizerAlpha: number;
-  maxQuantizerAlpha: number;
+  cqLevel: number;
+  denoiseLevel: number;
+  cqAlphaLevel: 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 @@
-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}};
+"use strict";var Module={};var initializedJS=false;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:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);receiveInstance(instance);Module["wasmModule"]=null;return instance.exports};function moduleLoaded(){}self.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;(e.data.urlOrBlob?import(e.data.urlOrBlob):import("./avif_enc_mt.js")).then(function(exports){return exports.default(Module)}).then(function(instance){Module=instance;moduleLoaded()})}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;Module["__emscripten_thread_init"](e.data.threadInfoStruct,0,0);var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInit();if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["invokeEntryPoint"](e.data.start_routine,e.data.arg);if(Module["keepRuntimeAlive"]()){Module["PThread"].setExitStatus(result)}else{Module["PThread"].threadExit(result)}}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){if(ex instanceof Module["ExitStatus"]){if(Module["keepRuntimeAlive"]()){}else{Module["PThread"].threadExit(ex.status)}}else{Module["PThread"].threadExit(-2);throw ex}}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(Module["_pthread_self"]()){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/enc/avif_node_enc_mt.worker.js

@@ -0,0 +1 @@
+"use strict";var Module={};if(typeof process==="object"&&typeof process.versions==="object"&&typeof process.versions.node==="string"){var nodeWorkerThreads=require("worker_threads");var parentPort=nodeWorkerThreads.parentPort;parentPort.on("message",function(data){onmessage({data:data})});var nodeFS=require("fs");Object.assign(global,{self:global,require:require,Module:Module,location:{href:__filename},Worker:nodeWorkerThreads.Worker,importScripts:function(f){(0,eval)(nodeFS.readFileSync(f,"utf8"))},postMessage:function(msg){parentPort.postMessage(msg)},performance:global.performance||{now:function(){return Date.now()}}})}var initializedJS=false;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:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);receiveInstance(instance);Module["wasmModule"]=null;return instance.exports};function moduleLoaded(){}self.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;(e.data.urlOrBlob?import(e.data.urlOrBlob):import("./avif_node_enc_mt.js")).then(function(exports){return exports.default(Module)}).then(function(instance){Module=instance;moduleLoaded()})}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;Module["__emscripten_thread_init"](e.data.threadInfoStruct,0,0);var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInit();if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["invokeEntryPoint"](e.data.start_routine,e.data.arg);if(Module["keepRuntimeAlive"]()){Module["PThread"].setExitStatus(result)}else{Module["PThread"].threadExit(result)}}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){if(ex instanceof Module["ExitStatus"]){if(Module["keepRuntimeAlive"]()){}else{Module["PThread"].threadExit(ex.status)}}else{Module["PThread"].threadExit(-2);throw ex}}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(Module["_pthread_self"]()){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,13 +32,8 @@ $(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 \
 		-s ENVIRONMENT=$(ENVIRONMENT) \
 		-s EXPORT_ES6=1 \
-		-s EXPORT_NAME="$(basename $(@F))" \
 		-o $@ \
 		$+
 

codecs/cpp.Dockerfile

@@ -1,9 +1,17 @@
-FROM emscripten/emsdk:2.0.8
+FROM emscripten/emsdk:2.0.23
 RUN apt-get update && apt-get install -qqy autoconf libtool pkg-config
-ENV CFLAGS "-O3 -flto -s FILESYSTEM=0"
+ENV CFLAGS "-O3 -flto"
 ENV CXXFLAGS "${CFLAGS} -std=c++17"
-ENV LDFLAGS "${CFLAGS} -s PTHREAD_POOL_SIZE=navigator.hardwareConcurrency"
-# Build and cache standard libraries with these flags
-RUN emcc ${CXXFLAGS} --bind -xc++ /dev/null -o /dev/null
+ENV LDFLAGS "${CFLAGS} \
+-s FILESYSTEM=0 \
+-s PTHREAD_POOL_SIZE=navigator.hardwareConcurrency \
+-s ALLOW_MEMORY_GROWTH=1 \
+-s TEXTDECODER=2 \
+-s NODEJS_CATCH_EXIT=0 -s NODEJS_CATCH_REJECTION=0 \
+"
+# Build and cache standard libraries with these flags + Embind.
+RUN emcc ${CXXFLAGS} ${LDFLAGS} --bind -xc++ /dev/null -o /dev/null
+# And another set for the pthread variant.
+RUN emcc ${CXXFLAGS} ${LDFLAGS} --bind -pthread -xc++ /dev/null -o /dev/null
 WORKDIR /src
 CMD ["sh", "-c", "emmake make -j`nproc`"]

codecs/hqx/Cargo.lock

@@ -4,286 +4,289 @@
 name = "bumpalo"
 version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
 
 [[package]]
 name = "cfg-if"
 version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "console_error_panic_hook"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10",
+ "wasm-bindgen",
 ]
 
 [[package]]
 name = "futures"
 version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef"
 
 [[package]]
 name = "hqx"
 version = "0.1.0"
-source = "git+https://github.com/CryZe/wasmboy-rs?tag=v0.1.2#5f19cda24191ccc7c0c4920b6b246b4e242f377c"
+source = "git+https://github.com/CryZe/wasmboy-rs?tag=v0.1.3#d7cbae67906796928c8e451b186f3c653924beb8"
 dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static",
 ]
 
 [[package]]
 name = "js-sys"
 version = "0.3.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52732a3d3ad72c58ad2dc70624f9c17b46ecd0943b9a4f1ee37c4c18c5d983e2"
 dependencies = [
- "wasm-bindgen 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen",
 ]
 
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
 version = "0.2.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd7d4bd64732af4bf3a67f367c27df8520ad7e230c5817b8ff485864d80242b9"
 
 [[package]]
 name = "log"
 version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10",
 ]
 
 [[package]]
 name = "memory_units"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
 
 [[package]]
 name = "proc-macro2"
 version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
 dependencies = [
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.1.0",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.19"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
 dependencies = [
- "unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.2.1",
 ]
 
 [[package]]
 name = "quote"
 version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
 dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.30",
 ]
 
 [[package]]
 name = "quote"
 version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
 dependencies = [
- "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.27",
 ]
 
 [[package]]
 name = "scoped-tls"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
 
 [[package]]
 name = "squooshhqx"
 version = "0.1.0"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "hqx 0.1.0 (git+https://github.com/CryZe/wasmboy-rs?tag=v0.1.2)",
- "wasm-bindgen 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-test 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
- "wee_alloc 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10",
+ "console_error_panic_hook",
+ "hqx",
+ "wasm-bindgen",
+ "wasm-bindgen-test",
+ "wee_alloc",
 ]
 
 [[package]]
 name = "syn"
-version = "1.0.35"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82"
 dependencies = [
- "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.27",
+ "quote 1.0.7",
+ "unicode-xid 0.2.1",
 ]
 
 [[package]]
 name = "unicode-xid"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 
 [[package]]
 name = "unicode-xid"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.65"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-macro 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 1.0.0",
+ "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.65"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900"
 dependencies = [
- "bumpalo 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-shared 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bumpalo",
+ "lazy_static",
+ "log",
+ "proc-macro2 1.0.27",
+ "quote 1.0.7",
+ "syn",
+ "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
 version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83420b37346c311b9ed822af41ec2e82839bfe99867ec6c54e2da43b7538771c"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "js-sys 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "web-sys 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10",
+ "futures",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.65"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4"
 dependencies = [
- "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-macro-support 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.7",
+ "wasm-bindgen-macro-support",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.65"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97"
 dependencies = [
- "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-backend 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-shared 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.27",
+ "quote 1.0.7",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.65"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f"
 
 [[package]]
 name = "wasm-bindgen-test"
 version = "0.2.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2d9693b63a742d481c7f80587e057920e568317b2806988c59cd71618bc26c1"
 dependencies = [
- "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "js-sys 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-futures 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-test-macro 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "console_error_panic_hook",
+ "futures",
+ "js-sys",
+ "scoped-tls",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-bindgen-test-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-test-macro"
 version = "0.2.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0789dac148a8840bbcf9efe13905463b733fa96543bfbf263790535c11af7ba5"
 dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.30",
+ "quote 0.6.13",
 ]
 
 [[package]]
 name = "web-sys"
 version = "0.3.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8be2398f326b7ba09815d0b403095f34dd708579220d099caae89be0b32137b2"
 dependencies = [
- "js-sys 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys",
+ "wasm-bindgen",
 ]
 
 [[package]]
 name = "wee_alloc"
 version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbb3b5a6b2bb17cb6ad44a2e68a43e8d2722c997da10e928665c72ec6c0a0b8e"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)",
- "memory_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10",
+ "libc",
+ "memory_units",
+ "winapi",
 ]
 
 [[package]]
 name = "winapi"
 version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 dependencies = [
- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
 ]
 
 [[package]]
 name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[metadata]
-"checksum bumpalo 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
-"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-"checksum console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
-"checksum futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef"
-"checksum hqx 0.1.0 (git+https://github.com/CryZe/wasmboy-rs?tag=v0.1.2)" = "<none>"
-"checksum js-sys 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)" = "52732a3d3ad72c58ad2dc70624f9c17b46ecd0943b9a4f1ee37c4c18c5d983e2"
-"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-"checksum libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)" = "bd7d4bd64732af4bf3a67f367c27df8520ad7e230c5817b8ff485864d80242b9"
-"checksum log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
-"checksum memory_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
-"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-"checksum proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12"
-"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-"checksum quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
-"checksum scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
-"checksum syn 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "fb7f4c519df8c117855e19dd8cc851e89eb746fe7a73f0157e0d95fdec5369b0"
-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-"checksum unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
-"checksum wasm-bindgen 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "f3edbcc9536ab7eababcc6d2374a0b7bfe13a2b6d562c5e07f370456b1a8f33d"
-"checksum wasm-bindgen-backend 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "89ed2fb8c84bfad20ea66b26a3743f3e7ba8735a69fe7d95118c33ec8fc1244d"
-"checksum wasm-bindgen-futures 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)" = "83420b37346c311b9ed822af41ec2e82839bfe99867ec6c54e2da43b7538771c"
-"checksum wasm-bindgen-macro 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "eb071268b031a64d92fc6cf691715ca5a40950694d8f683c5bb43db7c730929e"
-"checksum wasm-bindgen-macro-support 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "cf592c807080719d1ff2f245a687cbadb3ed28b2077ed7084b47aba8b691f2c6"
-"checksum wasm-bindgen-shared 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "72b6c0220ded549d63860c78c38f3bcc558d1ca3f4efa74942c536ddbbb55e87"
-"checksum wasm-bindgen-test 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "a2d9693b63a742d481c7f80587e057920e568317b2806988c59cd71618bc26c1"
-"checksum wasm-bindgen-test-macro 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "0789dac148a8840bbcf9efe13905463b733fa96543bfbf263790535c11af7ba5"
-"checksum web-sys 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)" = "8be2398f326b7ba09815d0b403095f34dd708579220d099caae89be0b32137b2"
-"checksum wee_alloc 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "dbb3b5a6b2bb17cb6ad44a2e68a43e8d2722c997da10e928665c72ec6c0a0b8e"
-"checksum winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

codecs/hqx/Cargo.toml

@@ -3,9 +3,6 @@ name = "squooshhqx"
 version = "0.1.0"
 authors = ["Surma <surma@surma.link>"]
 
-[package.metadata.wasm-pack.profile.release]
-wasm-opt = false
-
 [lib]
 crate-type = ["cdylib"]
 
@@ -16,7 +13,7 @@ default = ["console_error_panic_hook", "wee_alloc"]
 cfg-if = "0.1.2"
 wasm-bindgen = "0.2.38"
 # lazy_static = "1.0.0"
-hqx = {git = "https://github.com/CryZe/wasmboy-rs", tag="v0.1.2"}
+hqx = {git = "https://github.com/CryZe/wasmboy-rs", tag="v0.1.3"}
 
 # The `console_error_panic_hook` crate provides better debugging of panics by
 # logging them with `console.error`. This is great for development, but requires

codecs/hqx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqx",
   "scripts": {
-    "build": "RUST_IMG=rust:1.40 ../build-rust.sh"
+    "build": "../build-rust.sh"
   }
 }

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,19 +37,23 @@ function getArrayU32FromWasm0(ptr, len) {
 * @returns {Uint32Array}
 */
 export function resize(input_image, input_width, input_height, factor) {
-    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];
-    var v1 = getArrayU32FromWasm0(r0, r1).slice();
-    wasm.__wbindgen_free(r0, r1 * 4);
-    return v1;
+    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(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) {
     if (typeof Response === 'function' && module instanceof Response) {
-
         if (typeof WebAssembly.instantiateStreaming === 'function') {
             try {
                 return await WebAssembly.instantiateStreaming(module, imports);
@@ -68,7 +72,6 @@ async function load(module, imports) {
         return await WebAssembly.instantiate(bytes, imports);
 
     } else {
-
         const instance = await WebAssembly.instantiate(module, imports);
 
         if (instance instanceof WebAssembly.Instance) {
@@ -82,7 +85,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 = {};
 
@@ -91,6 +94,8 @@ async function init(input) {
         input = fetch(input);
     }
 
+
+
     const { instance, module } = await load(await input, imports);
 
     wasm = instance.exports;

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/imagequant/Makefile

@@ -8,7 +8,7 @@ ENVIRONMENT = worker
 
 .PHONY: all clean
 
-all: $(OUT_JS) $(OUT_NODE_JS)
+all: $(OUT_JS)
 
 imagequant_node.js: ENVIRONMENT=node
 $(OUT_JS): $(CODEC_OUT)
@@ -17,31 +17,12 @@ $(OUT_JS): $(CODEC_OUT)
 		${CXXFLAGS} \
 		${LDFLAGS} \
 		--bind \
-		--closure 1 \
-		-s ALLOW_MEMORY_GROWTH=1 \
-		-s MODULARIZE=1 \
-		-s TEXTDECODER=2 \
 		-s ENVIRONMENT=$(ENVIRONMENT) \
 		-s EXPORT_ES6=1 \
 		-o $@ \
 		$+ \
 		imagequant.cpp
 
-	$(CXX) \
-		-I $(CODEC_DIR) \
-		${CXXFLAGS} \
-		${LDFLAGS} \
-		--bind \
-		--closure 1 \
-		-s ALLOW_MEMORY_GROWTH=1 \
-		-s MODULARIZE=1 \
-		-s TEXTDECODER=2 \
-		-s ENVIRONMENT='node' \
-		-s EXPORT_ES6=1 \
-		-o $@ \
-		$+ \
-		imagequant.cpp
-
 $(CODEC_OUT): $(CODEC_DIR)/config.mk
 	$(MAKE) -C $(CODEC_DIR) $(CODEC_OUT_RELATIVE)
 

codecs/jxl/Makefile

@@ -1,5 +1,5 @@
-CODEC_URL = https://gitlab.com/wg1/jpeg-xl.git
-CODEC_VERSION = v0.2
+CODEC_URL = https://github.com/libjxl/libjxl.git
+CODEC_VERSION = 9f544641ec83f6abd9da598bdd08178ee8a003e0
 CODEC_DIR = node_modules/jxl
 CODEC_BUILD_ROOT := $(CODEC_DIR)/build
 CODEC_MT_BUILD_DIR := $(CODEC_BUILD_ROOT)/mt
@@ -28,6 +28,10 @@ enc/jxl_node_enc.js dec/jxl_node_dec.js enc/jxl_enc.js dec/jxl_dec.js: $(CODEC_M
 enc/jxl_enc_mt.js: $(CODEC_MT_BUILD_DIR)/lib/libjxl.a $(CODEC_MT_BUILD_DIR)/lib/libjxl_threads.a
 enc/jxl_enc_mt_simd.js: $(CODEC_MT_SIMD_BUILD_DIR)/lib/libjxl.a $(CODEC_MT_SIMD_BUILD_DIR)/lib/libjxl_threads.a
 
+# Disable errors on deprecated SIMD intrinsics.
+# JPEG-XL & Highway need to catch up, once they do, we can remove this suppression.
+export CXXFLAGS += -Wno-deprecated-declarations
+
 # Compile multithreaded wrappers with -pthread.
 enc/jxl_enc_mt.js enc/jxl_enc_mt_simd.js: CXXFLAGS+=-pthread
 
@@ -42,13 +46,8 @@ $(OUT_JS):
 		-I $(CODEC_DIR)/third_party/highway \
 		-I $(CODEC_DIR)/third_party/skcms \
 		--bind \
-		--closure 1 \
-		-s ALLOW_MEMORY_GROWTH=1 \
-		-s MODULARIZE=1 \
-		-s TEXTDECODER=2 \
 		-s ENVIRONMENT=$(ENVIRONMENT) \
 		-s EXPORT_ES6=1 \
-		-s EXPORT_NAME="$(basename $(@F))" \
 		-o $@ \
 		$+ \
 		$(CODEC_BUILD_DIR)/third_party/brotli/libbrotlidec-static.a \
@@ -73,10 +72,14 @@ $(CODEC_MT_SIMD_BUILD_DIR)/Makefile: CXXFLAGS+=-msimd128
 	-DJPEGXL_ENABLE_BENCHMARK=0 \
 	-DJPEGXL_ENABLE_EXAMPLES=0 \
 	-DBUILD_TESTING=0 \
+	-DCMAKE_CROSSCOMPILING_EMULATOR=node \
 	-B $(@D) \
 	$(<D)
+	emcc -Wall -O3 -o $(CODEC_DIR)/third_party/skcms/skcms.cc.o -I$(CODEC_DIR)/third_party/skcms -c $(CODEC_DIR)/third_party/skcms/skcms.cc
+	llvm-ar rc $(CODEC_BUILD_DIR)/third_party/libskcms.a $(CODEC_DIR)/third_party/skcms/skcms.cc.o
+	rm $(CODEC_DIR)/third_party/skcms/skcms.cc.o
 
-$(CODEC_DIR)/CMakeLists.txt: 
+$(CODEC_DIR)/CMakeLists.txt:
 	$(RM) -r $(@D)
 	git init $(@D)
 	git -C $(@D) fetch $(CODEC_URL) $(CODEC_VERSION) --depth 1

codecs/jxl/dec/jxl_dec.cpp

@@ -52,13 +52,14 @@ val decode(std::string data) {
 
   auto next_in = (const uint8_t*)data.c_str();
   auto avail_in = data.size();
-  EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec.get(), &next_in, &avail_in));
+  JxlDecoderSetInput(dec.get(), next_in, avail_in);
+  EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec.get()));
   JxlBasicInfo info;
   EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec.get(), &info));
   size_t pixel_count = info.xsize * info.ysize;
   size_t component_count = pixel_count * COMPONENTS_PER_PIXEL;
 
-  EXPECT_EQ(JXL_DEC_COLOR_ENCODING, JxlDecoderProcessInput(dec.get(), &next_in, &avail_in));
+  EXPECT_EQ(JXL_DEC_COLOR_ENCODING, JxlDecoderProcessInput(dec.get()));
   static const JxlPixelFormat format = {COMPONENTS_PER_PIXEL, JXL_TYPE_FLOAT, JXL_LITTLE_ENDIAN, 0};
   size_t icc_size;
   EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetICCProfileSize(dec.get(), &format,
@@ -68,11 +69,15 @@ val decode(std::string data) {
             JxlDecoderGetColorAsICCProfile(dec.get(), &format, JXL_COLOR_PROFILE_TARGET_DATA,
                                            icc_profile.data(), icc_profile.size()));
 
+  EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec.get()));
+  size_t buffer_size;
+  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderImageOutBufferSize(dec.get(), &format, &buffer_size));
+  EXPECT_EQ(buffer_size, component_count * sizeof(float));
+
   auto float_pixels = std::make_unique<float[]>(component_count);
-  EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec.get(), &next_in, &avail_in));
   EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetImageOutBuffer(dec.get(), &format, float_pixels.get(),
                                                          component_count * sizeof(float)));
-  EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec.get(), &next_in, &avail_in));
+  EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec.get()));
 
   auto byte_pixels = std::make_unique<uint8_t[]>(component_count);
   // Convert to sRGB.

codecs/jxl/enc/jxl_enc.cpp

@@ -2,22 +2,23 @@
 #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"
+#include "lib/jxl/enc_color_management.h"
 
 using namespace emscripten;
 
 thread_local const val Uint8Array = val::global("Uint8Array");
 
 struct JXLOptions {
-  // 1 = slowest
-  // 7 = fastest
-  int speed;
+  int effort;
   float quality;
   bool progressive;
   int epf;
-  int nearLossless;
   bool lossyPalette;
+  size_t decodingSpeedTier;
+  float photonNoiseIso;
+  bool lossyModular;
 };
 
 val encode(std::string image, int width, int height, JXLOptions options) {
@@ -32,35 +33,35 @@ val encode(std::string image, int width, int height, JXLOptions options) {
   pool_ptr = &pool;
 #endif
 
+  size_t st = 10 - options.effort;
+  cparams.speed_tier = jxl::SpeedTier(st);
+
   cparams.epf = options.epf;
-  cparams.speed_tier = static_cast<jxl::SpeedTier>(options.speed);
-  cparams.near_lossless = options.nearLossless;
+  cparams.decoding_speed_tier = options.decodingSpeedTier;
+  cparams.photon_noise_iso = options.photonNoiseIso;
 
   if (options.lossyPalette) {
     cparams.lossy_palette = true;
     cparams.palette_colors = 0;
     cparams.options.predictor = jxl::Predictor::Zero;
-  }
-
-  // Reduce memory usage of tree learning for lossless data.
-  // TODO(veluca93): this is a mitigation for excessive memory usage in the JXL encoder.
-  float megapixels = width * height * 0.000001;
-  if (megapixels > 8) {
-    cparams.options.nb_repeats = 0.1;
-  } else if (megapixels > 4) {
-    cparams.options.nb_repeats = 0.3;
-  } else {
-    // default is OK.
+    // Near-lossless assumes -R 0
+    cparams.responsive = 0;
+    cparams.modular_mode = true;
   }
 
   float quality = options.quality;
 
   // Quality settings roughly match libjpeg qualities.
-  if (quality < 7 || quality == 100) {
+  if (options.lossyModular || quality == 100) {
     cparams.modular_mode = true;
     // Internal modular quality to roughly match VarDCT size.
-    cparams.quality_pair.first = cparams.quality_pair.second =
-        std::min(35 + (quality - 7) * 3.0f, 100.0f);
+    if (quality < 7) {
+      cparams.quality_pair.first = cparams.quality_pair.second =
+          std::min(35 + (quality - 7) * 3.0f, 100.0f);
+    } else {
+      cparams.quality_pair.first = cparams.quality_pair.second =
+          std::min(35 + (quality - 7) * 65.f / 93.f, 100.0f);
+    }
   } else {
     cparams.modular_mode = false;
     if (quality >= 30) {
@@ -86,12 +87,6 @@ val encode(std::string image, int width, int height, JXLOptions options) {
     }
   }
 
-  if (cparams.near_lossless) {
-    // Near-lossless assumes -R 0
-    cparams.responsive = 0;
-    cparams.modular_mode = true;
-  }
-
   io.metadata.m.SetAlphaBits(8);
   if (!io.metadata.size.Set(width, height)) {
     return val::null();
@@ -99,18 +94,18 @@ val encode(std::string image, int width, int height, JXLOptions options) {
 
   uint8_t* inBuffer = (uint8_t*)image.c_str();
 
-  auto result = jxl::ConvertImage(
+  auto result = jxl::ConvertFromExternal(
       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, JXL_LITTLE_ENDIAN,
-      /*flipped_y=*/false, pool_ptr, main);
+      /*alpha_is_premultiplied=*/false, /*bits_per_sample=*/8, /*endiannes=*/JXL_LITTLE_ENDIAN,
+      /*flipped_y=*/false, pool_ptr, main, /*(only true if bits_per_sample==32) float_in=*/false);
 
   if (!result) {
     return val::null();
   }
 
   auto js_result = val::null();
-  if (EncodeFile(cparams, &io, &passes_enc_state, &bytes, /*aux=*/nullptr, pool_ptr)) {
+  if (EncodeFile(cparams, &io, &passes_enc_state, &bytes, jxl::GetJxlCms(), /*aux=*/nullptr, pool_ptr)) {
     js_result = Uint8Array.new_(typed_memory_view(bytes.size(), bytes.data()));
   }
 
@@ -119,11 +114,13 @@ val encode(std::string image, int width, int height, JXLOptions options) {
 
 EMSCRIPTEN_BINDINGS(my_module) {
   value_object<JXLOptions>("JXLOptions")
-      .field("speed", &JXLOptions::speed)
+      .field("effort", &JXLOptions::effort)
       .field("quality", &JXLOptions::quality)
       .field("progressive", &JXLOptions::progressive)
-      .field("nearLossless", &JXLOptions::nearLossless)
       .field("lossyPalette", &JXLOptions::lossyPalette)
+      .field("decodingSpeedTier", &JXLOptions::decodingSpeedTier)
+      .field("photonNoiseIso", &JXLOptions::photonNoiseIso)
+      .field("lossyModular", &JXLOptions::lossyModular)
       .field("epf", &JXLOptions::epf);
 
   function("encode", &encode);

codecs/jxl/enc/jxl_enc.d.ts

@@ -1,10 +1,12 @@
 export interface EncodeOptions {
-  speed: number;
+  effort: number;
   quality: number;
   progressive: boolean;
   epf: number;
-  nearLossless: number;
   lossyPalette: boolean;
+  decodingSpeedTier: number;
+  photonNoiseIso: number;
+  lossyModular: boolean;
 }
 
 export interface JXLModule extends EmscriptenWasm.Module {

codecs/jxl/enc/jxl_enc_mt.worker.js

@@ -1 +1 @@
-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(jxl_enc_mt){return jxl_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}};
+"use strict";var Module={};var initializedJS=false;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:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);receiveInstance(instance);Module["wasmModule"]=null;return instance.exports};function moduleLoaded(){}self.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;(e.data.urlOrBlob?import(e.data.urlOrBlob):import("./jxl_enc_mt.js")).then(function(exports){return exports.default(Module)}).then(function(instance){Module=instance;moduleLoaded()})}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;Module["__emscripten_thread_init"](e.data.threadInfoStruct,0,0);var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInit();if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["invokeEntryPoint"](e.data.start_routine,e.data.arg);if(Module["keepRuntimeAlive"]()){Module["PThread"].setExitStatus(result)}else{Module["PThread"].threadExit(result)}}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){if(ex instanceof Module["ExitStatus"]){if(Module["keepRuntimeAlive"]()){}else{Module["PThread"].threadExit(ex.status)}}else{Module["PThread"].threadExit(-2);throw ex}}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(Module["_pthread_self"]()){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/jxl/enc/jxl_enc_mt_simd.worker.js

@@ -1 +1 @@
-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(jxl_enc_mt_simd){return jxl_enc_mt_simd.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}};
+"use strict";var Module={};var initializedJS=false;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:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);receiveInstance(instance);Module["wasmModule"]=null;return instance.exports};function moduleLoaded(){}self.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;(e.data.urlOrBlob?import(e.data.urlOrBlob):import("./jxl_enc_mt_simd.js")).then(function(exports){return exports.default(Module)}).then(function(instance){Module=instance;moduleLoaded()})}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;Module["__emscripten_thread_init"](e.data.threadInfoStruct,0,0);var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInit();if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["invokeEntryPoint"](e.data.start_routine,e.data.arg);if(Module["keepRuntimeAlive"]()){Module["PThread"].setExitStatus(result)}else{Module["PThread"].threadExit(result)}}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){if(ex instanceof Module["ExitStatus"]){if(Module["keepRuntimeAlive"]()){}else{Module["PThread"].threadExit(ex.status)}}else{Module["PThread"].threadExit(-2);throw ex}}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(Module["_pthread_self"]()){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/mozjpeg/Makefile

@@ -22,11 +22,7 @@ enc/mozjpeg_node_enc.js dec/mozjpeg_node_dec.js: ENVIRONMENT = node
 		-I $(CODEC_DIR) \
 		${CXXFLAGS} \
 		${LDFLAGS} \
-		--closure 1 \
 		--bind \
-		-s ALLOW_MEMORY_GROWTH=1 \
-		-s MODULARIZE=1 \
-		-s TEXTDECODER=2 \
 		-s ENVIRONMENT=$(ENVIRONMENT) \
 		-s EXPORT_ES6=1 \
 		-o $@ \

codecs/mozjpeg/enc/mozjpeg_enc.cpp

@@ -141,6 +141,7 @@ 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.
@@ -157,6 +158,11 @@ val encode(std::string image_in, int image_width, int image_height, MozJpegOptio
   if (!opts.auto_subsample && opts.color_space == JCS_YCbCr) {
     cinfo.comp_info[0].h_samp_factor = opts.chroma_subsample;
     cinfo.comp_info[0].v_samp_factor = opts.chroma_subsample;
+
+    if (opts.chroma_subsample > 2) {
+      // Otherwise encoding fails.
+      jpeg_c_set_int_param(&cinfo, JINT_DC_SCAN_OPT_MODE, 1);
+    }
   }
 
   if (!opts.baseline && opts.progressive) {

codecs/oxipng/Cargo.lock

@@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "adler"
 version = "0.2.3"
@@ -232,6 +234,15 @@ 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"
@@ -350,12 +361,6 @@ 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"
@@ -401,9 +406,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.24"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
 dependencies = [
  "unicode-xid",
 ]
@@ -484,24 +489,28 @@ 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.58"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc60a3d73ea6594cd712d830cc1f0390fd71542d8c8cd24e70cc54cdfd5e05d5"
+checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -522,9 +531,9 @@ checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.69"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e"
+checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd"
 dependencies = [
  "cfg-if 1.0.0",
  "wasm-bindgen-macro",
@@ -532,9 +541,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.69"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62"
+checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -547,9 +556,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.69"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084"
+checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -557,9 +566,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.69"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549"
+checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -569,7 +578,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.69"
+name = "wasm-bindgen-rayon"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158"
+checksum = "3069d2a42e7a7e3bfde668f84adb5fbc35701ca2b39b27a064cbd5ede4e78194"
+dependencies = [
+ "js-sys",
+ "rayon",
+ "spmc",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.74"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f"

codecs/oxipng/Cargo.toml

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

codecs/oxipng/build.sh

@@ -4,12 +4,6 @@ set -e
 
 rm -rf pkg,{-parallel}
 export CFLAGS="${CFLAGS} -DUNALIGNED_ACCESS_IS_FAST=1"
-wasm-pack build -t web -- --locked
-RUSTFLAGS='-C target-feature=+atomics,+bulk-memory' wasm-pack build -t web -d pkg-parallel -- -Z build-std=panic_abort,std --features=parallel --locked
-# Workaround https://github.com/rustwasm/wasm-bindgen/issues/2133:
-sed -i "s|maybe_memory:|maybe_memory?:|" pkg-parallel/squoosh_oxipng.d.ts
-# Workaround wasm-pack using a very old wasm-opt.
-echo "Optimizing wasm binaries with \`wasm-opt\`..."
-wasm-opt -O pkg/squoosh_oxipng_bg.wasm -o pkg/squoosh_oxipng_bg.wasm
-wasm-opt -O pkg-parallel/squoosh_oxipng_bg.wasm -o pkg-parallel/squoosh_oxipng_bg.wasm
+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
 rm pkg{,-parallel}/.gitignore

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

@@ -0,0 +1,98 @@
+/**
+ * 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,29 +3,49 @@
 /**
 * @param {Uint8Array} data
 * @param {number} level
+* @param {boolean} interlace
 * @returns {Uint8Array}
 */
-export function optimise(data: Uint8Array, level: number): Uint8Array;
+export function optimise(data: Uint8Array, level: number, interlace: boolean): Uint8Array;
 /**
-* @param {number} num
-* @returns {any}
+* @param {number} num_threads
+* @returns {Promise<any>}
 */
-export function worker_initializer(num: number): any;
+export function initThreadPool(num_threads: number): Promise<any>;
+/**
+* @param {number} receiver
+*/
+export function wbg_rayon_start_worker(receiver: number): void;
 /**
 */
-export function start_main_thread(): void;
+export class wbg_rayon_PoolBuilder {
+  free(): void;
+/**
+* @returns {number}
+*/
+  numThreads(): number;
+/**
+* @returns {number}
+*/
+  receiver(): number;
 /**
 */
-export function start_worker_thread(): void;
+  build(): void;
+}
 
 export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
 
 export interface InitOutput {
-  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 __wasm_init_memory: () => void;
+  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 __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;
@@ -41,4 +61,3 @@ 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,21 +1,6 @@
+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 });
 
@@ -33,6 +18,21 @@ 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) {
+export function optimise(data, level, interlace) {
     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.optimise(retptr, ptr0, len0, level);
+        wasm.optimise(retptr, ptr0, len0, level, interlace);
         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_export_1.value += 16;
+        wasm.__wbindgen_add_to_stack_pointer(16);
     }
 }
 
@@ -89,29 +89,66 @@ function takeObject(idx) {
     return ret;
 }
 /**
-* @param {number} num
-* @returns {any}
+* @param {number} num_threads
+* @returns {Promise<any>}
 */
-export function worker_initializer(num) {
-    var ret = wasm.worker_initializer(num);
+export function initThreadPool(num_threads) {
+    var ret = wasm.initThreadPool(num_threads);
     return takeObject(ret);
 }
 
 /**
+* @param {number} receiver
 */
-export function start_main_thread() {
-    wasm.start_main_thread();
+export function wbg_rayon_start_worker(receiver) {
+    wasm.wbg_rayon_start_worker(receiver);
 }
 
 /**
 */
-export function start_worker_thread() {
-    wasm.start_worker_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);
+    }
 }
 
-async function load(module, imports, maybe_memory) {
+async function load(module, imports) {
     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);
@@ -130,7 +167,6 @@ async function load(module, imports, maybe_memory) {
         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) {
@@ -144,10 +180,13 @@ async function load(module, imports, maybe_memory) {
 
 async function init(input, maybe_memory) {
     if (typeof input === 'undefined') {
-        input = import.meta.url.replace(/\.js$/, '_bg.wasm');
+        input = new URL('squoosh_oxipng_bg.wasm', import.meta.url);
     }
     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);
@@ -156,19 +195,18 @@ async function init(input, maybe_memory) {
         var ret = wasm.__wbindgen_export_0;
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_of_6510501edc06d65e = function(arg0, arg1) {
-        var ret = Array.of(takeObject(arg0), takeObject(arg1));
+    imports.wbg.__wbg_startWorkers_914655bb4d5bb5e1 = function(arg0, arg1, arg2) {
+        var ret = startWorkers(takeObject(arg0), takeObject(arg1), wbg_rayon_PoolBuilder.__wrap(arg2));
         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);
     }
 
-    const { instance, module } = await load(await input, imports, maybe_memory);
+    imports.wbg.memory = maybe_memory || new WebAssembly.Memory({initial:17,maximum:16384,shared:true});
+
+    const { instance, module } = await load(await input, imports);
 
     wasm = instance.exports;
     init.__wbindgen_wasm_module = module;

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

@@ -1,10 +1,15 @@
 /* tslint:disable */
 /* eslint-disable */
-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 function __wasm_init_memory(): void;
+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 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,15 +3,17 @@
 /**
 * @param {Uint8Array} data
 * @param {number} level
+* @param {boolean} interlace
 * @returns {Uint8Array}
 */
-export function optimise(data: Uint8Array, level: number): Uint8Array;
+export function optimise(data: Uint8Array, level: number, interlace: boolean): 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) => void;
+  readonly optimise: (a: number, b: number, c: number, d: number, e: 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;
 }
@@ -25,4 +27,3 @@ 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,28 +40,27 @@ function getArrayU8FromWasm0(ptr, len) {
 /**
 * @param {Uint8Array} data
 * @param {number} level
+* @param {boolean} interlace
 * @returns {Uint8Array}
 */
-export function optimise(data, level) {
+export function optimise(data, level, interlace) {
     try {
-        const retptr = wasm.__wbindgen_export_0.value - 16;
-        wasm.__wbindgen_export_0.value = retptr;
+        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
         var ptr0 = passArray8ToWasm0(data, wasm.__wbindgen_malloc);
         var len0 = WASM_VECTOR_LEN;
-        wasm.optimise(retptr, ptr0, len0, level);
+        wasm.optimise(retptr, ptr0, len0, level, interlace);
         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_export_0.value += 16;
+        wasm.__wbindgen_add_to_stack_pointer(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);
@@ -80,7 +79,6 @@ async function load(module, imports) {
         return await WebAssembly.instantiate(bytes, imports);
 
     } else {
-
         const instance = await WebAssembly.instantiate(module, imports);
 
         if (instance instanceof WebAssembly.Instance) {
@@ -94,7 +92,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_oxipng_bg.wasm', import.meta.url);
     }
     const imports = {};
     imports.wbg = {};
@@ -106,6 +104,8 @@ 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,6 +1,7 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
-export function optimise(a: number, b: number, c: number, d: number): void;
+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 __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) -> Vec<u8> {
+pub fn optimise(data: &[u8], level: u8, interlace: bool) -> Vec<u8> {
     let mut options = oxipng::Options::from_preset(level);
     options.alphas.insert(AlphaOptim::Black);
     options.alphas.insert(AlphaOptim::White);
@@ -13,6 +13,7 @@ pub fn optimise(data: &[u8], level: u8) -> 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

@@ -1,62 +0,0 @@
-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,6 +18,12 @@ 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"
@@ -30,13 +36,19 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
 [[package]]
 name = "crc32fast"
 version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
 ]
 
 [[package]]
@@ -70,7 +82,7 @@ version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
 ]
 
 [[package]]
@@ -96,9 +108,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.18"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
+checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
 dependencies = [
  "unicode-xid",
 ]
@@ -112,20 +124,30 @@ 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",
 ]
 
 [[package]]
 name = "syn"
-version = "1.0.34"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936cae2873c940d92e697597c5eee105fb570cd5689c695806f672883653349b"
+checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -140,19 +162,19 @@ checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.68"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ac64ead5ea5f05873d7c12b545865ca2b8d28adfc50a49b84770a3a97265d42"
+checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.68"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f22b422e2a757c35a73774860af8e112bff612ce6cb604224e8e47641a9e4f68"
+checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -165,9 +187,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.68"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b13312a745c08c469f0b292dd2fcd6411dba5f7160f593da6ef69b64e407038"
+checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -175,9 +197,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.68"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe"
+checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -188,9 +210,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.68"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307"
+checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f"
 
 [[package]]
 name = "web-sys"

codecs/png/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2018"
 publish = false
 
 [package.metadata.wasm-pack.profile.release]
-wasm-opt = false
+wasm-opt = ["-O", "--no-validation"]
 
 [lib]
 crate-type = ["cdylib"]
@@ -15,6 +15,7 @@ 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,6 +1,22 @@
 
 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) {
@@ -28,14 +44,6 @@ 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) {
@@ -64,8 +72,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);
@@ -75,7 +82,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);
     }
 }
 
@@ -105,7 +112,6 @@ export function decode(data) {
 
 async function load(module, imports) {
     if (typeof Response === 'function' && module instanceof Response) {
-
         if (typeof WebAssembly.instantiateStreaming === 'function') {
             try {
                 return await WebAssembly.instantiateStreaming(module, imports);
@@ -124,7 +130,6 @@ async function load(module, imports) {
         return await WebAssembly.instantiate(bytes, imports);
 
     } else {
-
         const instance = await WebAssembly.instantiate(module, imports);
 
         if (instance instanceof WebAssembly.Instance) {
@@ -138,7 +143,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 = {};
@@ -148,11 +153,16 @@ 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);
     }
 
+
+
     const { instance, module } = await load(await input, imports);
 
     wasm = instance.exports;

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,5 +1,7 @@
-use std::io::Cursor;
-
+use rgb::{
+    alt::{GRAY8, GRAYA8},
+    AsPixels, FromSlice, RGB8, RGBA8,
+};
 use wasm_bindgen::prelude::*;
 use wasm_bindgen::Clamped;
 
@@ -18,38 +20,61 @@ extern "C" {
     ) -> ImageData;
 }
 
-#[wasm_bindgen(catch)]
+#[wasm_bindgen]
 pub fn encode(data: &[u8], width: u32, height: u32) -> Vec<u8> {
-    let mut buffer = Cursor::new(Vec::<u8>::new());
+    let mut buffer = Vec::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();
-        writer.write_image_data(data).unwrap();
+        let mut writer = encoder.write_header().unwrap_throw();
+        writer.write_image_data(data).unwrap_throw();
     }
 
-    buffer.into_inner()
+    buffer
 }
 
-#[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();
+// 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);
+    decoder.set_transformations(
+        png::Transformations::EXPAND | // Turn paletted images into RGB
+        png::Transformations::PACKING | // Turn images <8bit to 8bit
+        png::Transformations::STRIP_16, // Turn 16bit into 8 bit
+    );
+    let (info, mut reader) = decoder.read_info().unwrap_throw();
     let num_pixels = (info.width * info.height) as usize;
     let mut buf = vec![0; num_pixels * 4];
-    reader.next_frame(&mut buf).unwrap();
+    reader.next_frame(&mut buf).unwrap_throw();
 
-    // 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;
+    // 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")
         }
     }
 

codecs/qoi/Makefile

@@ -0,0 +1,42 @@
+CODEC_URL = https://github.com/phoboslab/qoi/archive/8d35d93cdca85d2868246c2a8a80a1e2c16ba2a8.tar.gz
+
+CODEC_DIR = node_modules/qoi
+CODEC_BUILD_DIR:= $(CODEC_DIR)/build
+ENVIRONMENT = worker
+
+OUT_JS = enc/qoi_enc.js dec/qoi_dec.js
+OUT_WASM := $(OUT_JS:.js=.wasm)
+
+.PHONY: all clean
+
+all: $(OUT_JS)
+
+$(filter enc/%,$(OUT_JS)): enc/qoi_enc.o
+$(filter dec/%,$(OUT_JS)): dec/qoi_dec.o
+
+# ALL .js FILES
+$(OUT_JS):
+	$(LD) \
+		$(LDFLAGS) \
+		--bind \
+		-s ENVIRONMENT=$(ENVIRONMENT) \
+		-s EXPORT_ES6=1 \
+		-o $@ \
+		$+
+
+# ALL .o FILES
+%.o: %.cpp $(CODEC_DIR)
+	$(CXX) -c \
+		$(CXXFLAGS) \
+		-I $(CODEC_DIR) \
+		-o $@ \
+		$<
+
+# CREATE DIRECTORY
+$(CODEC_DIR):
+	mkdir -p $(CODEC_DIR)
+	curl -sL $(CODEC_URL) | tar xz --strip 1 -C $(CODEC_DIR)
+
+clean:
+	$(RM) $(OUT_JS) $(OUT_WASM)
+	$(MAKE) -C $(CODEC_DIR) clean

codecs/qoi/dec/qoi_dec.cpp

@@ -0,0 +1,30 @@
+#include <emscripten/bind.h>
+#include <emscripten/val.h>
+
+#define QOI_IMPLEMENTATION
+#include "qoi.h"
+
+using namespace emscripten;
+
+thread_local const val Uint8ClampedArray = val::global("Uint8ClampedArray");
+thread_local const val ImageData = val::global("ImageData");
+
+val decode(std::string qoiimage) {
+  qoi_desc desc;
+  uint8_t* rgba = (uint8_t*)qoi_decode(qoiimage.c_str(), qoiimage.length(), &desc, 4);
+
+  // Resultant width and height stored in descriptor
+  int decodedWidth = desc.width;
+  int decodedHeight = desc.height;
+
+  val result = ImageData.new_(
+      Uint8ClampedArray.new_(typed_memory_view(4 * decodedWidth * decodedHeight, rgba)),
+      decodedWidth, decodedHeight);
+  free(rgba);
+
+  return result;
+}
+
+EMSCRIPTEN_BINDINGS(my_module) {
+  function("decode", &decode);
+}