Merge pull request #52 from GoogleChromeLabs/codec-fixes

Codec fixes
GoogleChromeLabs · Jun 14, 2018 · ba0ad81 · ba0ad81
2 parents d75a3ac + 695bbed
commit ba0ad81
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 5 deletions.
diff --git a/codecs/mozjpeg_enc/example.html b/codecs/mozjpeg_enc/example.html
@@ -27,6 +27,7 @@
       get_result_pointer: Module.cwrap('get_result_pointer', 'number', []),
       get_result_size: Module.cwrap('get_result_size', 'number', []),
     };
+    console.log('Version:', api.version().toString(16));
     const image = await loadImage('../example.png');
     const p = api.create_buffer(image.width, image.height);
     Module.HEAP8.set(image.data, p);

diff --git a/codecs/webp_dec/.gitignore b/codecs/webp_dec/.gitignore
diff --git a/codecs/webp_dec/example.html b/codecs/webp_dec/example.html
@@ -19,6 +19,7 @@
       get_result_width: Module.cwrap('get_result_width', 'number', []),
       get_result_height: Module.cwrap('get_result_height', 'number', []),
     };
+    console.log('Version:', api.version().toString(16));
     const image = await loadFile('../example.webp');
     const p = api.create_buffer(image.byteLength);
     Module.HEAP8.set(new Uint8Array(image), p);

diff --git a/codecs/webp_dec/package.json b/codecs/webp_dec/package.json
@@ -5,7 +5,7 @@
     "build": "docker run --rm -v $(pwd):/src trzeci/emscripten emcc -O3 -s WASM=1 -s EXTRA_EXPORTED_RUNTIME_METHODS='[\"cwrap\"]' -s ALLOW_MEMORY_GROWTH=1 -s MODULARIZE=1 -s 'EXPORT_NAME=\"webp_dec\"' -I node_modules/libwebp -o ./webp_dec.js webp_dec.c node_modules/libwebp/src/{dec,dsp,demux,enc,mux,utils}/*.c"
   },
   "napa": {
-    "libwebp": "webmproject/libwebp#v0.6.1"
+    "libwebp": "webmproject/libwebp#v1.0.0"
   },
   "devDependencies": {
     "napa": "^3.0.0"

diff --git a/codecs/webp_dec/webp_dec.js b/codecs/webp_dec/webp_dec.js
diff --git a/codecs/webp_dec/webp_dec.wasm b/codecs/webp_dec/webp_dec.wasm
diff --git a/codecs/webp_enc/example.html b/codecs/webp_enc/example.html
@@ -27,6 +27,7 @@
       get_result_pointer: Module.cwrap('get_result_pointer', 'number', []),
       get_result_size: Module.cwrap('get_result_size', 'number', []),
     };
+    console.log('Version:', api.version().toString(16));
     const image = await loadImage('../example.png');
     const p = api.create_buffer(image.width, image.height);
     Module.HEAP8.set(image.data, p);

diff --git a/codecs/webp_enc/package.json b/codecs/webp_enc/package.json
@@ -5,7 +5,7 @@
     "build": "docker run --rm -v $(pwd):/src trzeci/emscripten emcc -O3 -s WASM=1 -s EXTRA_EXPORTED_RUNTIME_METHODS='[\"cwrap\"]' -s ALLOW_MEMORY_GROWTH=1 -s MODULARIZE=1 -s 'EXPORT_NAME=\"webp_enc\"' -I node_modules/libwebp -o ./webp_enc.js webp_enc.c node_modules/libwebp/src/{dec,dsp,demux,enc,mux,utils}/*.c"
   },
   "napa": {
-    "libwebp": "webmproject/libwebp#v0.6.1"
+    "libwebp": "webmproject/libwebp#v1.0.0"
   },
   "devDependencies": {
     "napa": "^3.0.0"

diff --git a/codecs/webp_enc/webp_enc.js b/codecs/webp_enc/webp_enc.js
diff --git a/codecs/webp_enc/webp_enc.wasm b/codecs/webp_enc/webp_enc.wasm