Dependency update.

Scripts update.

Author: programingjd

.gitignore

@@ -1,3 +1,4 @@
 /target/
 **/*.rs.bk
 Cargo.lock
+jellyfish_small.avif

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "avif"
-version = "0.3.0"
+version = "0.4.0"
 edition = "2021"
 
 [lib]
@@ -9,7 +9,7 @@ crate-type = ["cdylib",'rlib']
 [dependencies]
 wasm-bindgen = "0.2"
 avif-serialize = "0.8"
-rav1e = { version = "0.6.6", default-features = false, features = ["wasm"] }
+rav1e = { version = "0.7.1", default-features = false, features = ["wasm"] }
 
 [profile.release]
 debug = false

avif.d.ts

@@ -8,8 +8,9 @@ declare module 'avif' {
    * @param {number} height
    * @param {number} [quality=50] (1 to 100)
    * @param {number} [speed=6] (1 to 10)
-   * @return {Promise<Uint8Array>}
+   * @return {Uint8Array}
    */
   export function avif(bytes: Uint8Array, width: number, height: number, quality: number, speed: number): Uint8Array;
+
   export default avif;
-}
+}

avif.mjs

@@ -1,14 +1,12 @@
-const url=new URL('./avif.wasm',import.meta.url);
+const url=new URL('avif.wasm',import.meta.url);
 const imports={
-  wbg:{
-    __wbg_log_d415f1170b035824: (p,n)=>{
-      console.log(
-        new TextDecoder().decode(new Uint8Array(wasm.memory.buffer).subarray(p,p+n))
-      )
+  wbg: {
+    __wbg_log_12edb8942696c207: (p,n)=>{
+      console.log(new TextDecoder().decode(new Uint8Array(wasm.memory.buffer).subarray(p,p+n)));
     }
   }
 };
-const {instance:{exports:wasm}}=await WebAssembly.instantiateStreaming(await fetch(url,{cache:'force-cache'}),imports);
+const {instance: {exports: wasm}}=await WebAssembly.instantiateStreaming(await fetch(url,{cache: 'force-cache'}),imports);
 const malloc=wasm.__wbindgen_malloc;
 const free=wasm.__wbindgen_free;
 const pointer=wasm.__wbindgen_add_to_stack_pointer;
@@ -19,21 +17,24 @@ const pointer=wasm.__wbindgen_add_to_stack_pointer;
  * @param {number} height
  * @param {number} quality (1 to 100)
  * @param {number} speed (1 to 10)
- * @return {Promise<Uint8Array>}
+ * @return {Uint8Array}
  */
-const avif=(bytes,width,height, quality=50,speed=6)=>{
+const avif=(bytes,width,height,quality=50,speed=6)=>{
   const n1=bytes.length;
   const p1=malloc(n1,1);
   const r=pointer(-16);
   try{
     new Uint8Array(wasm.memory.buffer).set(bytes,p1);
     wasm.avif_from_imagedata(r,p1,n1,width,height,quality,speed);
     const arr=new Int32Array(wasm.memory.buffer);
-    const p2=arr[r/4];const n2=arr[r/4+1];
+    const p2=arr[r/4];
+    const n2=arr[r/4+1];
     const res=new Uint8Array(wasm.memory.buffer).subarray(p2,p2+n2).slice();
     free(p2,n2);
     return res;
-  }finally{pointer(16)}
+  }finally{
+    pointer(16)
+  }
 };
 export {avif};
-export default avif;
+export default avif;

avif.svg

@@ -1,14 +1,12 @@
 const avif=(async()=>{
   const imports={
-    wbg:{
-      __wbg_log_d415f1170b035824: (p,n)=>{
-        console.log(
-          new TextDecoder().decode(new Uint8Array(wasm.memory.buffer).subarray(p,p+n))
-        )
+    wbg: {
+      __wbg_log_12edb8942696c207: (p,n)=>{
+        console.log(new TextDecoder().decode(new Uint8Array(wasm.memory.buffer).subarray(p,p+n)));
       }
     }
   };
-  const {instance:{exports:wasm}}=await WebAssembly.instantiateStreaming(await fetch('./avif.wasm',{cache:'force-cache'}),imports);
+  const {instance: {exports: wasm}}=await WebAssembly.instantiateStreaming(await fetch('./avif.wasm',{cache: 'force-cache'}),imports);
   const malloc=wasm.__wbindgen_malloc;
   const free=wasm.__wbindgen_free;
   const pointer=wasm.__wbindgen_add_to_stack_pointer;
@@ -20,10 +18,13 @@ const avif=(async()=>{
       new Uint8Array(wasm.memory.buffer).set(data,p1);
       wasm.avif_from_imagedata(r,p1,n1,width,height,quality,speed);
       const arr=new Int32Array(wasm.memory.buffer);
-      const p2=arr[r/4];const n2=arr[r/4+1];
+      const p2=arr[r/4];
+      const n2=arr[r/4+1];
       const res=new Uint8Array(wasm.memory.buffer).subarray(p2,p2+n2).slice();
       free(p2,n2);
       return res;
-    }finally{pointer(16)}
+    }finally{
+      pointer(16)
+    }
   };
-})();
+})();

avif.wasm

@@ -3,7 +3,7 @@ await (await fetch(url)).arrayBuffer();
 const worker=await new Promise(r=>{
   // For browsers that don't support type: module on workers (firefox < 114, safari < 15)
   // const worker=new Worker(new URL('./avif_worker_script.js',import.meta.url));
-  const worker=new Worker(new URL('./avif_worker_script.mjs',import.meta.url),{type:'module'});
+  const worker=new Worker(new URL('./avif_worker_script.mjs',import.meta.url),{type: 'module'});
   worker.onmessage=msg=>{
     if(msg.data==='ready'){
       worker.onmessage=null;
@@ -20,7 +20,7 @@ const worker=await new Promise(r=>{
  * @param {number} speed (1 to 10)
  * @return {Promise<Uint8Array>}
  */
-const avif=(bytes,width,height, quality=50,speed=6)=>new Promise(r=>{
+const avif=(bytes,width,height,quality=50,speed=6)=>new Promise(r=>{
   worker.onmessage=msg=>{
     worker.onmessage=null;
     r(msg.data);
@@ -29,4 +29,4 @@ const avif=(bytes,width,height, quality=50,speed=6)=>new Promise(r=>{
 });
 
 export {avif};
-export default avif;
+export default avif;

avif.wasm.br

@@ -20,7 +20,7 @@ impl Encoder {
     // Quality `1..=100`. Panics if out of range.
     #[must_use]
     pub fn with_quality(mut self, quality: f32) -> Self {
-        assert!(quality >= 1. && quality <= 100.);
+        debug_assert!(quality >= 1. && quality <= 100.);
         self.quantizer = quality_to_quantizer(quality);
         self
     }
@@ -29,7 +29,7 @@ impl Encoder {
     // 10 = quick, but larger file sizes and lower quality.
     #[must_use]
     pub fn with_speed(mut self, speed: u8) -> Self {
-        assert!(speed >= 1 && speed <= 10);
+        debug_assert!(speed >= 1 && speed <= 10);
         self.speed = speed;
         self
     }
@@ -254,7 +254,7 @@ impl SpeedTweaks {
             }
         };
         if let Some((min, max)) = self.partition_range {
-            assert!(min <= max);
+            debug_assert!(min <= max);
             fn sz(s: u8) -> BlockSize {
                 match s {
                     4 => BlockSize::BLOCK_4X4,

avif_for_importScripts.js

@@ -29,7 +29,7 @@ pub fn avif_from_imagedata(
         .with_quality(quality)
         .with_speed(speed)
         .encode_rgb(width, height, rgba.chunks_exact(4))
-        .map_err(|e| log(format!("{:?}", e).as_str()))
+        .map_err(|e| log(format!("{e:?}").as_str()))
         .unwrap()
 }
 

avif_worker.mjs

@@ -15,7 +15,7 @@
 const image=new Image();
 await new Promise((r)=>{
   image.onload=r;
-  image.src='jellyfish.jpg';
+  image.src='./jellyfish.jpg';
 });
 canvas.width=image.width;
 canvas.height=image.height;
@@ -25,11 +25,11 @@
 const {avif}=await import('./avif_worker.mjs');
 const rgba=new Uint8Array(data.data);
 const quality=50.0;
-for (const speed of [10,9,8,7,6,5,4,3,2,1]){
+for(const speed of [10,9,8,7,6,5,4,3,2,1]){
   const t=Date.now();
   const bytes=await avif(rgba,data.width,data.height,quality,speed);
   console.log(`avif: ${bytes.length}, speed: ${speed}, time: ${((Date.now()-t)/1000).toFixed(1)}`);
-  const b=new Blob([bytes],{type:'image/avif'});
+  const b=new Blob([bytes],{type: 'image/avif'});
   const link=document.createElement('a');
   link.download=`jellyfish_s${speed}.avif`;
   const img=document.createElement('img');