Merge pull request #46 from eshaz/size-optimize

Size Optimize
eshaz · May 30, 2022 · a45b0b9 · a45b0b9
2 parents 73fa2cd + 572483b
commit a45b0b9
Show file tree

Hide file tree

Showing 53 changed files with 1,318 additions and 1,053 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,9 @@
 node_modules
 .vscode
 
+*.tmp.js
+*.sizes.json
+
 coverage
 test/actual/*
 test/expected/*.wav
diff --git a/Makefile b/Makefile
@@ -2,46 +2,50 @@ default: dist
 
 clean: dist-clean opus-wasmlib-clean mpg123-wasmlib-clean configures-clean
 
-DEMO_PATH=demo
+DEMO_PATH=demo/
 
 dist: opus-decoder ogg-opus-decoder mpg123-decoder
 dist-clean:
-	rm -rf $(DEMO_PATH)/*.js
-	rm -rf $(OPUS_DECODER_PATH)/dist/*
-	rm -rf $(OGG_OPUS_DECODER_PATH)/dist/*
-	rm -rf $(MPG123_DECODER_PATH)/dist/*
+	rm -rf $(DEMO_PATH)*.js
+	rm -rf $(OPUS_DECODER_PATH)dist/*
+	rm -rf $(OGG_OPUS_DECODER_PATH)dist/*
+	rm -rf $(MPG123_DECODER_PATH)dist/*
 	rm -rf $(OPUS_DECODER_EMSCRIPTEN_BUILD)
 	rm -rf $(OGG_OPUS_DECODER_EMSCRIPTEN_BUILD)
 	rm -rf $(MPG123_EMSCRIPTEN_BUILD)
 
 
 # ogg-opus-decoder
-OGG_OPUS_DECODER_PATH=src/ogg-opus-decoder
-OGG_OPUS_DECODER_EMSCRIPTEN_BUILD=$(OGG_OPUS_DECODER_PATH)/src/EmscriptenWasm.js
-OGG_OPUS_DECODER_MODULE=$(OGG_OPUS_DECODER_PATH)/dist/ogg-opus-decoder.js
-OGG_OPUS_DECODER_MODULE_MIN=$(OGG_OPUS_DECODER_PATH)/dist/ogg-opus-decoder.min.js
+OGG_OPUS_DECODER_PATH=src/ogg-opus-decoder/
+OGG_OPUS_DECODER_EMSCRIPTEN_BUILD=$(OGG_OPUS_DECODER_PATH)src/EmscriptenWasm.tmp.js
+OGG_OPUS_DECODER_MODULE=$(OGG_OPUS_DECODER_PATH)dist/ogg-opus-decoder.js
+OGG_OPUS_DECODER_MODULE_MIN=$(OGG_OPUS_DECODER_PATH)dist/ogg-opus-decoder.min.js
 
+# Iterations, 222 = 110314
 ogg-opus-decoder: opus-wasmlib ogg-opus-decoder-minify $(OGG_OPUS_DECODER_EMSCRIPTEN_BUILD)
 ogg-opus-decoder-minify: $(OGG_OPUS_DECODER_EMSCRIPTEN_BUILD)
 	SOURCE_PATH=$(OGG_OPUS_DECODER_PATH) \
 	MODULE=$(OGG_OPUS_DECODER_MODULE) \
 	MODULE_MIN=$(OGG_OPUS_DECODER_MODULE_MIN) \
+	COMPRESSION_ITERATIONS=222 \
 	npm run minify
-	cp $(OGG_OPUS_DECODER_MODULE) $(DEMO_PATH)
+	cp $(OGG_OPUS_DECODER_MODULE) $(OGG_OPUS_DECODER_MODULE_MIN) $(OGG_OPUS_DECODER_MODULE_MIN).map $(DEMO_PATH)
 
 # opus-decoder
-OPUS_DECODER_PATH=src/opus-decoder
-OPUS_DECODER_EMSCRIPTEN_BUILD=$(OPUS_DECODER_PATH)/src/EmscriptenWasm.js
-OPUS_DECODER_MODULE=$(OPUS_DECODER_PATH)/dist/opus-decoder.js
-OPUS_DECODER_MODULE_MIN=$(OPUS_DECODER_PATH)/dist/opus-decoder.min.js
+OPUS_DECODER_PATH=src/opus-decoder/
+OPUS_DECODER_EMSCRIPTEN_BUILD=$(OPUS_DECODER_PATH)src/EmscriptenWasm.tmp.js
+OPUS_DECODER_MODULE=$(OPUS_DECODER_PATH)dist/opus-decoder.js
+OPUS_DECODER_MODULE_MIN=$(OPUS_DECODER_PATH)dist/opus-decoder.min.js
 
+# Iterations, 230 = 84392, 840 = 84384
 opus-decoder: opus-wasmlib opus-decoder-minify $(OPUS_DECODER_EMSCRIPTEN_BUILD)
 opus-decoder-minify: $(OPUS_DECODER_EMSCRIPTEN_BUILD)
 	SOURCE_PATH=$(OPUS_DECODER_PATH) \
 	MODULE=$(OPUS_DECODER_MODULE) \
 	MODULE_MIN=$(OPUS_DECODER_MODULE_MIN) \
+	COMPRESSION_ITERATIONS=840 \
 	npm run minify
-	cp $(OPUS_DECODER_MODULE) $(DEMO_PATH)
+	cp $(OPUS_DECODER_MODULE) $(OPUS_DECODER_MODULE_MIN) $(OPUS_DECODER_MODULE_MIN).map $(DEMO_PATH)
 
 # libopus
 OPUS_WASM_LIB=tmp/opus.bc
@@ -50,20 +54,22 @@ opus-wasmlib-clean: dist-clean
 	rm -rf $(OPUS_WASM_LIB)
 
 # mpg123-decoder
-MPG123_SRC=modules/mpg123
+MPG123_SRC=modules/mpg123/
 MPG123_WASM_LIB=tmp/mpg123.bc
-MPG123_DECODER_PATH=src/mpg123-decoder
-MPG123_EMSCRIPTEN_BUILD=$(MPG123_DECODER_PATH)/src/EmscriptenWasm.js
-MPG123_MODULE=$(MPG123_DECODER_PATH)/dist/mpg123-decoder.js
-MPG123_MODULE_MIN=$(MPG123_DECODER_PATH)/dist/mpg123-decoder.min.js
+MPG123_DECODER_PATH=src/mpg123-decoder/
+MPG123_EMSCRIPTEN_BUILD=$(MPG123_DECODER_PATH)src/EmscriptenWasm.tmp.js
+MPG123_MODULE=$(MPG123_DECODER_PATH)dist/mpg123-decoder.js
+MPG123_MODULE_MIN=$(MPG123_DECODER_PATH)dist/mpg123-decoder.min.js
 
+# Iterations, 108 = 72560, 729 = 72474
 mpg123-decoder: mpg123-wasmlib mpg123-decoder-minify ${MPG123_EMSCRIPTEN_BUILD}
 mpg123-decoder-minify: $(MPG123_EMSCRIPTEN_BUILD)
 	SOURCE_PATH=$(MPG123_DECODER_PATH) \
 	MODULE=$(MPG123_MODULE) \
 	MODULE_MIN=$(MPG123_MODULE_MIN) \
+	COMPRESSION_ITERATIONS=729 \
 	npm run minify
-	cp $(MPG123_MODULE) $(DEMO_PATH)
+	cp $(MPG123_MODULE) $(MPG123_MODULE_MIN) $(MPG123_MODULE_MIN).map $(DEMO_PATH)
 
 mpg123-wasmlib: $(MPG123_WASM_LIB)
 mpg123-wasmlib-clean: dist-clean
@@ -109,14 +115,14 @@ define OPUS_DECODER_EMCC_OPTS
   , '_opus_frame_decode_float_deinterleaved' \
   , '_opus_frame_decoder_create' \
 ]" \
---pre-js '$(OPUS_DECODER_PATH)/src/emscripten-pre.js' \
---post-js '$(OPUS_DECODER_PATH)/src/emscripten-post.js' \
+--pre-js '$(OPUS_DECODER_PATH)src/emscripten-pre.js' \
+--post-js '$(OPUS_DECODER_PATH)src/emscripten-post.js' \
 -I "modules/opus/include" \
-$(OPUS_DECODER_PATH)/src/opus_frame_decoder.c
+$(OPUS_DECODER_PATH)src/opus_frame_decoder.c
 endef
 
 $(OPUS_DECODER_EMSCRIPTEN_BUILD): $(OPUS_WASM_LIB)
-	@ mkdir -p $(OPUS_DECODER_PATH)/dist
+	@ mkdir -p $(OPUS_DECODER_PATH)dist
 	@ echo "Building Emscripten WebAssembly module $(OPUS_DECODER_EMSCRIPTEN_BUILD)..."
 	@ emcc \
 		-o "$(OPUS_DECODER_EMSCRIPTEN_BUILD)" \
@@ -140,16 +146,16 @@ define OGG_OPUS_DECODER_EMCC_OPTS
   , '_ogg_opus_decoder_free' \
   , '_ogg_opus_decoder_decode' \
 ]" \
---pre-js '$(OGG_OPUS_DECODER_PATH)/src/emscripten-pre.js' \
---post-js '$(OGG_OPUS_DECODER_PATH)/src/emscripten-post.js' \
+--pre-js '$(OGG_OPUS_DECODER_PATH)src/emscripten-pre.js' \
+--post-js '$(OGG_OPUS_DECODER_PATH)src/emscripten-post.js' \
 -I modules/opusfile/include \
 -I "modules/ogg/include" \
 -I "modules/opus/include" \
-$(OGG_OPUS_DECODER_PATH)/src/ogg_opus_decoder.c
+$(OGG_OPUS_DECODER_PATH)src/ogg_opus_decoder.c
 endef
 
 $(OGG_OPUS_DECODER_EMSCRIPTEN_BUILD): $(OPUS_WASM_LIB)
-	@ mkdir -p $(OGG_OPUS_DECODER_PATH)/dist
+	@ mkdir -p $(OGG_OPUS_DECODER_PATH)dist
 	@ echo "Building Emscripten WebAssembly module $(OGG_OPUS_DECODER_EMSCRIPTEN_BUILD)..."
 	@ emcc \
 		-o "$(OGG_OPUS_DECODER_EMSCRIPTEN_BUILD)" \
@@ -227,16 +233,16 @@ define MPG123_EMCC_OPTS
   ,	'_mpeg_decode_interleaved' \
 ]" \
 -s ERROR_ON_UNDEFINED_SYMBOLS=0 \
---pre-js '$(MPG123_DECODER_PATH)/src/emscripten-pre.js' \
---post-js '$(MPG123_DECODER_PATH)/src/emscripten-post.js' \
--I "$(MPG123_SRC)/src/libmpg123" \
--I "$(MPG123_DECODER_PATH)/src/mpg123" \
-$(MPG123_DECODER_PATH)/src/mpeg_frame_decoder.c 
+--pre-js '$(MPG123_DECODER_PATH)src/emscripten-pre.js' \
+--post-js '$(MPG123_DECODER_PATH)src/emscripten-post.js' \
+-I "$(MPG123_SRC)src/libmpg123" \
+-I "$(MPG123_DECODER_PATH)src/mpg123" \
+$(MPG123_DECODER_PATH)src/mpeg_frame_decoder.c 
 endef
 
-# $(MPG123_SRC)/src/libmpg123/.libs/libmpg123.so
+# $(MPG123_SRC)src/libmpg123/.libs/libmpg123.so
 ${MPG123_EMSCRIPTEN_BUILD}: $(MPG123_WASM_LIB)
-	@ mkdir -p $(MPG123_DECODER_PATH)/dist
+	@ mkdir -p $(MPG123_DECODER_PATH)dist
 	@ echo "Building Emscripten WebAssembly module $(MPG123_EMSCRIPTEN_BUILD)..."
 	@ emcc $(MPG123_WASM_LIB) \
 		-o "$(MPG123_EMSCRIPTEN_BUILD)" \
@@ -313,23 +319,23 @@ $(MPG123_WASM_LIB):
 	  -s NO_FILESYSTEM=1 \
 	  -s STRICT=1 \
 	  -DOPT_GENERIC -DREAL_IS_FLOAT \
-	  -I "$(MPG123_SRC)/src" \
-	  -I "$(MPG123_SRC)/src/libmpg123" \
-	  -I "$(MPG123_SRC)/src/compat" \
-	  -I "$(MPG123_DECODER_PATH)/src/mpg123" \
-  	  $(MPG123_SRC)/src/libmpg123/parse.c \
-  	  $(MPG123_SRC)/src/libmpg123/frame.c \
-  	  $(MPG123_SRC)/src/libmpg123/format.c \
-  	  $(MPG123_SRC)/src/libmpg123/dct64.c \
-  	  $(MPG123_SRC)/src/libmpg123/id3.c \
-  	  $(MPG123_SRC)/src/libmpg123/optimize.c \
-  	  $(MPG123_SRC)/src/libmpg123/readers.c \
-  	  $(MPG123_SRC)/src/libmpg123/tabinit.c \
-  	  $(MPG123_SRC)/src/libmpg123/libmpg123.c \
-  	  $(MPG123_SRC)/src/libmpg123/layer1.c \
-  	  $(MPG123_SRC)/src/libmpg123/layer2.c \
-  	  $(MPG123_SRC)/src/libmpg123/layer3.c \
-  	  $(MPG123_SRC)/src/libmpg123/synth_real.c 
+	  -I "$(MPG123_SRC)src" \
+	  -I "$(MPG123_SRC)src/libmpg123" \
+	  -I "$(MPG123_SRC)src/compat" \
+	  -I "$(MPG123_DECODER_PATH)src/mpg123" \
+  	  $(MPG123_SRC)src/libmpg123/parse.c \
+  	  $(MPG123_SRC)src/libmpg123/frame.c \
+  	  $(MPG123_SRC)src/libmpg123/format.c \
+  	  $(MPG123_SRC)src/libmpg123/dct64.c \
+  	  $(MPG123_SRC)src/libmpg123/id3.c \
+  	  $(MPG123_SRC)src/libmpg123/optimize.c \
+  	  $(MPG123_SRC)src/libmpg123/readers.c \
+  	  $(MPG123_SRC)src/libmpg123/tabinit.c \
+  	  $(MPG123_SRC)src/libmpg123/libmpg123.c \
+  	  $(MPG123_SRC)src/libmpg123/layer1.c \
+  	  $(MPG123_SRC)src/libmpg123/layer2.c \
+  	  $(MPG123_SRC)src/libmpg123/layer3.c \
+  	  $(MPG123_SRC)src/libmpg123/synth_real.c 
 	@ echo "+-------------------------------------------------------------------------------"
 	@ echo "|"
 	@ echo "|  Successfully built: $(MPG123_WASM_LIB)"

diff --git a/README.md b/README.md
@@ -14,15 +14,15 @@ Pre-built minified JS files are available from NPM and in each decoder's `dist`
 
 ### [`mpg123-decoder`](https://github.com/eshaz/wasm-audio-decoders/tree/master/src/mpg123-decoder)
 Decodes MPEG Layer I/II/III into PCM
-  * 71.3 KiB minified bundle size
+  * 70.8 KiB minified bundle size
   * Browser and NodeJS support
   * Built in Web Worker support
   * Based on [`mpg123`](https://www.mpg123.de/)
   * Install using [NPM](https://www.npmjs.com/package/mpg123-decoder)
 
 ### [`ogg-opus-decoder`](https://github.com/eshaz/wasm-audio-decoders/tree/master/src/ogg-opus-decoder)
 Decodes Ogg Opus data into PCM
-  * 108.4 KiB minified bundle size
+  * 107.7 KiB minified bundle size
   * Browser and NodeJS support
   * Built in Web Worker support
   * Multichannel decoding (up to 8 channels)
@@ -31,7 +31,7 @@ Decodes Ogg Opus data into PCM
 
 ### [`opus-decoder`](https://github.com/eshaz/wasm-audio-decoders/tree/master/src/opus-decoder)
 Decodes raw Opus audio frames into PCM
-  * 83.0 KiB minified bundle size
+  * 82.4 KiB minified bundle size
   * Browser and NodeJS support
   * Built in Web Worker support
   * Multichannel decoding (up to 255 channels)