@grame/faustwasm 0.16.2 → 0.16.3

package/faustwasm-soundfile-wav-samplerate.patch

@@ -0,0 +1,77 @@
+diff --git a/src/SoundfileReader.ts b/src/SoundfileReader.ts
+index 0cc287f..43290e7 100644
+--- a/src/SoundfileReader.ts
++++ b/src/SoundfileReader.ts
+@@ -1,4 +1,5 @@
+ import { FaustBaseWebAudioDsp } from './FaustWebAudioDsp';
++import WavDecoder from './WavDecoder';
+ import type {
+     AudioData,
+     FaustDspMeta,
+@@ -21,7 +22,8 @@ class SoundfileReader {
+         const origin = loc?.origin;
+         const parent = href ? this.getParentUrl(href) : null;
+         return [href, parent, origin].filter(
+-            (value): value is string => typeof value === 'string' && value.length > 0
++            (value): value is string =>
++                typeof value === 'string' && value.length > 0
+         );
+     }
+ 
+@@ -50,6 +52,30 @@ class SoundfileReader {
+         } as AudioData;
+     }
+ 
++    private static isWaveFile(buffer: ArrayBuffer) {
++        if (buffer.byteLength < 12) return false;
++        const reader = new DataView(buffer);
++        const riff =
++            reader.getUint8(0) === 0x52 &&
++            reader.getUint8(1) === 0x49 &&
++            reader.getUint8(2) === 0x46 &&
++            reader.getUint8(3) === 0x46;
++        const wave =
++            reader.getUint8(8) === 0x57 &&
++            reader.getUint8(9) === 0x41 &&
++            reader.getUint8(10) === 0x56 &&
++            reader.getUint8(11) === 0x45;
++        return riff && wave;
++    }
++
++    private static decodeWaveFile(buffer: ArrayBuffer): AudioData {
++        const decoded = WavDecoder.decode(buffer);
++        return {
++            sampleRate: decoded.sampleRate,
++            audioBuffer: decoded.channelData
++        };
++    }
++
+     /**
+      * Extract the URLs from the metadata.
+      *
+@@ -64,8 +90,9 @@ class SoundfileReader {
+             if (item.type === 'soundfile') {
+                 const urls = FaustBaseWebAudioDsp.splitSoundfileNames(item.url);
+                 // soundfiles.map[item.label] = urls;
+-                urls.filter((url) => url.trim().length > 0)
+-                    .forEach((url) => (soundfiles[url] = null));
++                urls.filter((url) => url.trim().length > 0).forEach(
++                    (url) => (soundfiles[url] = null)
++                );
+             }
+         };
+         FaustBaseWebAudioDsp.parseUI(dspMeta.ui, callback);
+@@ -90,6 +117,13 @@ class SoundfileReader {
+             );
+         // Decode the audio data
+         const arrayBuffer = await response.arrayBuffer();
++        if (this.isWaveFile(arrayBuffer)) {
++            try {
++                return this.decodeWaveFile(arrayBuffer);
++            } catch (error) {
++                console.error(error);
++            }
++        }
+         const audioBuffer = await audioCtx.decodeAudioData(arrayBuffer);
+         return this.toAudioData(audioBuffer);
+     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@grame/faustwasm",
-    "version": "0.16.2",
+    "version": "0.16.3",
     "description": "WebAssembly version of Faust Compiler",
     "main": "dist/cjs/index.js",
     "types": "dist/esm/index.d.ts",

package/src/SoundfileReader.ts

@@ -1,4 +1,5 @@
 import { FaustBaseWebAudioDsp } from './FaustWebAudioDsp';
+import WavDecoder from './WavDecoder';
 import type {
     AudioData,
     FaustDspMeta,
@@ -21,7 +22,8 @@ class SoundfileReader {
         const origin = loc?.origin;
         const parent = href ? this.getParentUrl(href) : null;
         return [href, parent, origin].filter(
-            (value): value is string => typeof value === 'string' && value.length > 0
+            (value): value is string =>
+                typeof value === 'string' && value.length > 0
         );
     }
 
@@ -50,6 +52,30 @@ class SoundfileReader {
         } as AudioData;
     }
 
+    private static isWaveFile(buffer: ArrayBuffer) {
+        if (buffer.byteLength < 12) return false;
+        const reader = new DataView(buffer);
+        const riff =
+            reader.getUint8(0) === 0x52 &&
+            reader.getUint8(1) === 0x49 &&
+            reader.getUint8(2) === 0x46 &&
+            reader.getUint8(3) === 0x46;
+        const wave =
+            reader.getUint8(8) === 0x57 &&
+            reader.getUint8(9) === 0x41 &&
+            reader.getUint8(10) === 0x56 &&
+            reader.getUint8(11) === 0x45;
+        return riff && wave;
+    }
+
+    private static decodeWaveFile(buffer: ArrayBuffer): AudioData {
+        const decoded = WavDecoder.decode(buffer);
+        return {
+            sampleRate: decoded.sampleRate,
+            audioBuffer: decoded.channelData
+        };
+    }
+
     /**
      * Extract the URLs from the metadata.
      *
@@ -64,8 +90,9 @@ class SoundfileReader {
             if (item.type === 'soundfile') {
                 const urls = FaustBaseWebAudioDsp.splitSoundfileNames(item.url);
                 // soundfiles.map[item.label] = urls;
-                urls.filter((url) => url.trim().length > 0)
-                    .forEach((url) => (soundfiles[url] = null));
+                urls.filter((url) => url.trim().length > 0).forEach(
+                    (url) => (soundfiles[url] = null)
+                );
             }
         };
         FaustBaseWebAudioDsp.parseUI(dspMeta.ui, callback);
@@ -90,6 +117,13 @@ class SoundfileReader {
             );
         // Decode the audio data
         const arrayBuffer = await response.arrayBuffer();
+        if (this.isWaveFile(arrayBuffer)) {
+            try {
+                return this.decodeWaveFile(arrayBuffer);
+            } catch (error) {
+                console.error(error);
+            }
+        }
         const audioBuffer = await audioCtx.decodeAudioData(arrayBuffer);
         return this.toAudioData(audioBuffer);
     }

package/test/faustlive-wasm/faustwasm/index.d.ts

@@ -1419,6 +1419,8 @@ export declare class SoundfileReader {
 	 * @returns : the audio data
 	 */
 	private static toAudioData;
+	private static isWaveFile;
+	private static decodeWaveFile;
 	/**
 	 * Extract the URLs from the metadata.
 	 *

package/test/faustlive-wasm/faustwasm/index.js

@@ -4619,6 +4619,20 @@ var SoundfileReader = class {
       audioBuffer: new Array(numberOfChannels).fill(null).map((v, i) => audioBuffer.getChannelData(i))
     };
   }
+  static isWaveFile(buffer) {
+    if (buffer.byteLength < 12) return false;
+    const reader = new DataView(buffer);
+    const riff = reader.getUint8(0) === 82 && reader.getUint8(1) === 73 && reader.getUint8(2) === 70 && reader.getUint8(3) === 70;
+    const wave = reader.getUint8(8) === 87 && reader.getUint8(9) === 65 && reader.getUint8(10) === 86 && reader.getUint8(11) === 69;
+    return riff && wave;
+  }
+  static decodeWaveFile(buffer) {
+    const decoded = WavDecoder_default.decode(buffer);
+    return {
+      sampleRate: decoded.sampleRate,
+      audioBuffer: decoded.channelData
+    };
+  }
   /**
    * Extract the URLs from the metadata.
    *
@@ -4630,7 +4644,9 @@ var SoundfileReader = class {
     const callback = (item) => {
       if (item.type === "soundfile") {
         const urls = FaustBaseWebAudioDsp.splitSoundfileNames(item.url);
-        urls.filter((url) => url.trim().length > 0).forEach((url) => soundfiles[url] = null);
+        urls.filter((url) => url.trim().length > 0).forEach(
+          (url) => soundfiles[url] = null
+        );
       }
     };
     FaustBaseWebAudioDsp.parseUI(dspMeta.ui, callback);
@@ -4651,6 +4667,13 @@ var SoundfileReader = class {
         `Failed to load sound file from ${url}: ${response.statusText}`
       );
     const arrayBuffer = await response.arrayBuffer();
+    if (this.isWaveFile(arrayBuffer)) {
+      try {
+        return this.decodeWaveFile(arrayBuffer);
+      } catch (error) {
+        console.error(error);
+      }
+    }
     const audioBuffer = await audioCtx.decodeAudioData(arrayBuffer);
     return this.toAudioData(audioBuffer);
   }