From 7f6ee3204f05689a6df8befd9c87bb4570b4a161 Mon Sep 17 00:00:00 2001 From: Jake Archibald Date: Wed, 3 Mar 2021 12:02:43 +0000 Subject: [PATCH] Remove mt AVIF encoder for now (#964) --- src/features/encoders/avif/worker/avifEncode.ts | 11 ----------- src/sw/to-cache.ts | 15 +-------------- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/src/features/encoders/avif/worker/avifEncode.ts b/src/features/encoders/avif/worker/avifEncode.ts index c5103c2b..69aee72b 100644 --- a/src/features/encoders/avif/worker/avifEncode.ts +++ b/src/features/encoders/avif/worker/avifEncode.ts @@ -13,22 +13,11 @@ import type { AVIFModule } from 'codecs/avif/enc/avif_enc'; import type { EncodeOptions } from '../shared/meta'; import wasmUrlWithoutMT from 'url:codecs/avif/enc/avif_enc.wasm'; -import wasmUrlWithMT from 'url:codecs/avif/enc/avif_enc_mt.wasm'; -import workerUrl from 'omt:codecs/avif/enc/avif_enc_mt.worker.js'; import { initEmscriptenModule } from 'features/worker-utils'; -import { threads } from 'wasm-feature-detect'; let emscriptenModule: Promise; async function init() { - if (await threads()) { - const avifEncoder = await import('codecs/avif/enc/avif_enc_mt'); - return initEmscriptenModule( - avifEncoder.default, - wasmUrlWithMT, - workerUrl, - ); - } const avifEncoder = await import('codecs/avif/enc/avif_enc.js'); return initEmscriptenModule(avifEncoder.default, wasmUrlWithoutMT); } diff --git a/src/sw/to-cache.ts b/src/sw/to-cache.ts index 72adfc2f..ed377415 100644 --- a/src/sw/to-cache.ts +++ b/src/sw/to-cache.ts @@ -68,9 +68,6 @@ import webpDecWasm from 'url:codecs/webp/dec/webp_dec.wasm'; import wp2DecWasm from 'url:codecs/wp2/dec/wp2_dec.wasm'; // AVIF -import * as avifEncMtWorker from 'entry-data:codecs/avif/enc/avif_enc_mt.worker.js'; -import * as avifEncMt from 'entry-data:codecs/avif/enc/avif_enc_mt'; -import avifEncMtWasm from 'url:codecs/avif/enc/avif_enc_mt.wasm'; import avifEncWasm from 'url:codecs/avif/enc/avif_enc.wasm'; import * as avifEnc from 'entry-data:codecs/avif/enc/avif_enc.js'; @@ -141,17 +138,7 @@ export const theRest = (async () => { if (!supportsWebP) items.push(webpDec.main, ...webpDec.deps, webpDecWasm); // AVIF - if (supportsThreads) { - items.push( - avifEncMtWorker.main, - ...avifEncMtWorker.deps, - avifEncMt.main, - ...avifEncMt.deps, - avifEncMtWasm, - ); - } else { - items.push(avifEnc.main, ...avifEnc.deps, avifEncWasm); - } + items.push(avifEnc.main, ...avifEnc.deps, avifEncWasm); // JXL if (supportsThreads && supportsSimd) {