Codecs cleanup (#189)

* Update imagequant processor

* Update mozjpeg encoder

* Update optipng encoder

* Update webp decoder

* Update webp encoder

* Remove old codec build tasks

* Add warning about docker image updates

codecs/imagequant/build.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+set -e
+
+export OPTIMIZE="-Os"
+export LDFLAGS="${OPTIMIZE}"
+export CFLAGS="${OPTIMIZE}"
+export CPPFLAGS="${OPTIMIZE}"
+
+echo "============================================="
+echo "Compiling libimagequant"
+echo "============================================="
+(
+  emcc \
+    --bind \
+    ${OPTIMIZE} \
+    -s ALLOW_MEMORY_GROWTH=1 \
+    -s MODULARIZE=1 \
+    -s 'EXPORT_NAME="imagequant"' \
+    -I node_modules/libimagequant \
+    --std=c99 \
+    -c \
+    node_modules/libimagequant/{libimagequant,pam,mediancut,blur,mempool,kmeans,nearest}.c
+)
+echo "============================================="
+echo "Compiling wasm module"
+echo "============================================="
+(
+  emcc \
+    --bind \
+    ${OPTIMIZE} \
+    -s ALLOW_MEMORY_GROWTH=1 \
+    -s MODULARIZE=1 \
+    -s 'EXPORT_NAME="imagequant"' \
+    -I node_modules/libimagequant \
+    -o ./imagequant.js \
+    --std=c++11 *.o \
+    -x c++ \
+    imagequant.cpp
+)
+echo "============================================="
+echo "Compiling wasm module done"
+echo "============================================="
+
+echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+echo "Did you update your docker image?"
+echo "Run \`docker pull trzeci/emscripten\`"
+echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

codecs/imagequant/package.json

@@ -2,11 +2,7 @@
   "name": "imagequant",
   "scripts": {
     "install": "napa",
-    "build": "npm run build:wasm",
+    "build": "docker run --rm -v $(pwd):/src trzeci/emscripten ./build.sh"
-    "build:wasm:lib": "docker run --rm -v $(pwd):/src trzeci/emscripten emcc --bind -O3 -s ALLOW_MEMORY_GROWTH=1 -s MODULARIZE=1 -s 'EXPORT_NAME=\"imagequant\"' -I node_modules/libimagequant --std=c99 node_modules/libimagequant/{libimagequant,pam,mediancut,blur,mempool,kmeans,nearest}.c -c ",
-    "build:wasm:module": "docker run --rm -v $(pwd):/src trzeci/emscripten emcc --bind -O3 -s ALLOW_MEMORY_GROWTH=1 -s MODULARIZE=1 -s 'EXPORT_NAME=\"imagequant\"' -I node_modules/libimagequant -o ./imagequant.js --std=c++11 *.o -x c++ imagequant.cpp",
-    "build:wasm": "npm run build:wasm:lib && npm run build:wasm:module"
-
   },
   "napa": {
     "libimagequant": "ImageOptim/libimagequant#2.12.1"

codecs/mozjpeg_enc/build.sh

@@ -2,6 +2,11 @@
 
 set -e
 
+export OPTIMIZE="-Os"
+export LDFLAGS="${OPTIMIZE}"
+export CFLAGS="${OPTIMIZE}"
+export CPPFLAGS="${OPTIMIZE}"
+
 apt-get update
 apt-get install -qqy autoconf libtool libpng-dev pkg-config
 
@@ -21,19 +26,28 @@ echo "============================================="
 echo "============================================="
 echo "Compiling wasm bindings"
 echo "============================================="
-emcc \
+(
-  --bind -O3 \
+  emcc \
-  -s WASM=1 \
+    --bind \
-  -s ALLOW_MEMORY_GROWTH=1 \
+    ${OPTIMIZE} \
-  -s MODULARIZE=1 \
+    -s WASM=1 \
-  -s 'EXPORT_NAME="mozjpeg_enc"' \
+    -s ALLOW_MEMORY_GROWTH=1 \
-  -I node_modules/mozjpeg \
+    -s MODULARIZE=1 \
-  -o ./mozjpeg_enc.js \
+    -s 'EXPORT_NAME="mozjpeg_enc"' \
-  -Wno-deprecated-register -Wno-writable-strings \
+    -I node_modules/mozjpeg \
-  node_modules/mozjpeg/rdswitch.c \
+    -o ./mozjpeg_enc.js \
-  -x c++ -std=c++11 \
+    -Wno-deprecated-register \
-  mozjpeg_enc.cpp \
+    -Wno-writable-strings \
-  node_modules/mozjpeg/.libs/libjpeg.a
+    node_modules/mozjpeg/rdswitch.c \
+    -x c++ -std=c++11 \
+    mozjpeg_enc.cpp \
+    node_modules/mozjpeg/.libs/libjpeg.a
+)
 echo "============================================="
 echo "Compiling wasm bindings done"
 echo "============================================="
+
+echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+echo "Did you update your docker image?"
+echo "Run \`docker pull trzeci/emscripten\`"
+echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

codecs/optipng/build.sh

@@ -2,10 +2,11 @@
 
 set -e
 
+export OPTIMIZE="-Os"
 export PREFIX="/src/build"
-export CFLAGS="-I${PREFIX}/include/"
+export CFLAGS="${OPTIMIZE} -I${PREFIX}/include/"
-export CPPFLAGS="-I${PREFIX}/include/"
+export CPPFLAGS="${OPTIMIZE} -I${PREFIX}/include/"
-export LDFLAGS="-L${PREFIX}/lib/"
+export LDFLAGS="${OPTIMIZE} -L${PREFIX}/lib/"
 
 apt-get update
 apt-get install -qqy autoconf libtool
@@ -42,7 +43,7 @@ echo "Compiling optipng"
 echo "============================================="
 (
   emcc \
-    -O3 \
+    ${OPTIMIZE} \
     -Wno-implicit-function-declaration \
     -I ${PREFIX}/include \
     -I node_modules/optipng/src/opngreduc \
@@ -60,7 +61,8 @@ echo "============================================="
     node_modules/optipng/src/optipng/*.c
 
   emcc \
-    --bind -O3 \
+    --bind \
+    ${OPTIMIZE} \
     -s ALLOW_MEMORY_GROWTH=1 -s MODULARIZE=1 -s 'EXPORT_NAME="optipng"' \
     -I ${PREFIX}/include \
     -I node_modules/optipng/src/opngreduc \
@@ -78,3 +80,8 @@ echo "============================================="
 echo "============================================="
 echo "Compiling optipng done"
 echo "============================================="
+
+echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+echo "Did you update your docker image?"
+echo "Run \`docker pull trzeci/emscripten\`"
+echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

codecs/webp_dec/build.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -e
+
+export OPTIMIZE="-Os"
+export LDFLAGS="${OPTIMIZE}"
+export CFLAGS="${OPTIMIZE}"
+export CPPFLAGS="${OPTIMIZE}"
+
+echo "============================================="
+echo "Compiling wasm bindings"
+echo "============================================="
+(
+  emcc \
+    ${OPTIMIZE} \
+    --bind \
+    -s ALLOW_MEMORY_GROWTH=1 \
+    -s MODULARIZE=1 \
+    -s 'EXPORT_NAME="webp_dec"' \
+    --std=c++11 \
+    -I node_modules/libwebp \
+    -o ./webp_dec.js \
+    node_modules/libwebp/src/{dec,dsp,demux,enc,mux,utils}/*.c \
+    -x c++ \
+    webp_dec.cpp
+)
+echo "============================================="
+echo "Compiling wasm bindings done"
+echo "============================================="
+
+echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+echo "Did you update your docker image?"
+echo "Run \`docker pull trzeci/emscripten\`"
+echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

codecs/webp_dec/package.json

@@ -2,7 +2,7 @@
   "name": "webp_dec",
   "scripts": {
     "install": "napa",
-    "build": "docker run --rm -v $(pwd):/src trzeci/emscripten emcc -O3 --bind -s ALLOW_MEMORY_GROWTH=1 -s MODULARIZE=1 -s 'EXPORT_NAME=\"webp_dec\"' --std=c++11 -I node_modules/libwebp -o ./webp_dec.js node_modules/libwebp/src/{dec,dsp,demux,enc,mux,utils}/*.c -x c++ webp_dec.cpp"
+    "build": "docker run --rm -v $(pwd):/src trzeci/emscripten ./build.sh"
   },
   "napa": {
     "libwebp": "webmproject/libwebp#v1.0.0"

codecs/webp_enc/build.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -e
+
+export OPTIMIZE="-Os"
+export LDFLAGS="${OPTIMIZE}"
+export CFLAGS="${OPTIMIZE}"
+export CPPFLAGS="${OPTIMIZE}"
+
+echo "============================================="
+echo "Compiling wasm bindings"
+echo "============================================="
+(
+  emcc \
+    ${OPTIMIZE} \
+    --bind \
+    -s ALLOW_MEMORY_GROWTH=1 \
+    -s MODULARIZE=1 \
+    -s 'EXPORT_NAME="webp_enc"' \
+    --std=c++11 \
+    -I node_modules/libwebp \
+    -o ./webp_enc.js \
+    node_modules/libwebp/src/{dec,dsp,demux,enc,mux,utils}/*.c \
+    -x c++ \
+    webp_enc.cpp
+)
+echo "============================================="
+echo "Compiling wasm bindings done"
+echo "============================================="
+
+echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+echo "Did you update your docker image?"
+echo "Run \`docker pull trzeci/emscripten\`"
+echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

codecs/webp_enc/package.json

@@ -2,7 +2,7 @@
   "name": "webp_enc",
   "scripts": {
     "install": "napa",
-    "build": "docker run --rm -v $(pwd):/src trzeci/emscripten emcc --bind -O3 -s WASM=1 -s ALLOW_MEMORY_GROWTH=1 -s MODULARIZE=1 -s 'EXPORT_NAME=\"webp_enc\"' -I node_modules/libwebp -o ./webp_enc.js -x c node_modules/libwebp/src/{dec,dsp,demux,enc,mux,utils}/*.c -x c++ -std=c++11 webp_enc.cpp"
+    "build": "docker run --rm -v $(pwd):/src trzeci/emscripten ./build.sh"
   },
   "napa": {
     "libwebp": "webmproject/libwebp#v1.0.0"

package.json

@@ -4,8 +4,6 @@
   "version": "0.0.0",
   "license": "apache-2.0",
   "scripts": {
-    "build:mozjpeg_enc": "cd codecs/mozjpeg_enc && npm run build",
-    "build:codecs": "npm run build:mozjpeg_enc",
     "start": "webpack serve --host 0.0.0.0 --hot",
     "build": "webpack -p",
     "lint": "tslint -c tslint.json -t verbose 'src/**/*.{ts,tsx,js,jsx}'",