@grame/faustwasm 0.1.2 → 0.1.4

package/dist/cjs/index.d.ts

@@ -395,6 +395,12 @@ declare class WasmAllocator {
 	 * @returns The view of the memory buffer as Int32Array.
 	 */
 	getInt32Array(): Int32Array;
+	/**
+	 * Returns the Int64 view of the underlying buffer object.
+	 *
+	 * @returns The view of the memory buffer as BigInt64Array.
+	 */
+	getInt64Array(): BigInt64Array;
 	/**
 	 * Returns the Float32 view of the underlying buffer object.
 	 *
@@ -416,8 +422,9 @@ declare class Soundfile {
 	private readonly fOffset;
 	private readonly fSampleSize;
 	private readonly fPtrSize;
+	private readonly fIntSize;
 	private readonly fAllocator;
-	constructor(allocator: WasmAllocator, ptrSize: number, sampleSize: number, curChan: number, length: number, maxChan: number, totalParts: number);
+	constructor(allocator: WasmAllocator, sampleSize: number, curChan: number, length: number, maxChan: number, totalParts: number);
 	private allocBuffers;
 	shareBuffers(curChan: number, maxChan: number): void;
 	copyToOut(part: number, maxChannels: number, offset: number, buffer: AudioBuffer): void;
@@ -432,11 +439,17 @@ declare class Soundfile {
 }
 declare class SoundfileReader {
 	private readonly fAllocator;
-	private readonly fPtrSize;
 	private readonly fSampleSize;
 	private readonly fContext;
 	private readonly fAudioBuffers;
-	constructor(allocator: WasmAllocator, context: BaseAudioContext, ptrSize: number, sampleSize: number);
+	constructor(allocator: WasmAllocator, context: BaseAudioContext, sampleSize: number);
+	/**
+	 * Check if the file exists.
+	 *
+	 * @param url : the url of the file to check
+	 * @returns : true if the file exists, otherwise false
+	 */
+	private checkFileExists;
 	/**
 	 * Check if the file exists in the given directories.
 	 *
@@ -476,9 +489,8 @@ declare class SoundfileReader {
 	 * Crate a soundfile, load all parts and copy audio data to the wasm soundfile buffer.
 	 * @param pathNameList : list of soundfile paths
 	 * @param maxChan : maximum number of channels
-	 * @param isDouble : whether the soundfile will be copied as double
 	 */
-	createSoundfile(pathNameList: string[], maxChan: number, isDouble: boolean): Promise<Soundfile | null>;
+	createSoundfile(pathNameList: string[], maxChan: number): Promise<Soundfile | null>;
 	getHEAP32(): Int32Array;
 }
 /**

package/dist/cjs/index.js

@@ -1890,11 +1890,9 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
       }
     }
     static async createAsyncMonoDSPInstance(factory) {
-      const parsedJson = JSON.parse(factory.json);
-      if (Array.isArray(parsedJson.ui) && parsedJson.ui.some((group) => {
-        var _a;
-        return (_a = group.items) == null ? void 0 : _a.some((item) => item.type === "soundfile");
-      })) {
+      const pattern = /"type":\s*"soundfile"/;
+      const isDetected = pattern.test(factory.json);
+      if (isDetected) {
         const memory = this.createMemoryMono(factory);
         const instance = await WebAssembly.instantiate(factory.module, this.createWasmImport(memory));
         return this.createMonoDSPInstanceAux(instance, factory.json, memory);
@@ -1904,11 +1902,9 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
       }
     }
     static createSyncMonoDSPInstance(factory) {
-      const parsedJson = JSON.parse(factory.json);
-      if (Array.isArray(parsedJson.ui) && parsedJson.ui.some((group) => {
-        var _a;
-        return (_a = group.items) == null ? void 0 : _a.some((item) => item.type === "soundfile");
-      })) {
+      const pattern = /"type":\s*"soundfile"/;
+      const isDetected = pattern.test(factory.json);
+      if (isDetected) {
         const memory = this.createMemoryMono(factory);
         const instance = new WebAssembly.Instance(factory.module, this.createWasmImport(memory));
         return this.createMonoDSPInstanceAux(instance, factory.json, memory);
@@ -2002,6 +1998,9 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
     getInt32Array() {
       return new Int32Array(this.memory.buffer);
     }
+    getInt64Array() {
+      return new BigInt64Array(this.memory.buffer);
+    }
     getFloat32Array() {
       return new Float32Array(this.memory.buffer);
     }
@@ -2013,22 +2012,23 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
   var MAX_CHAN = 64;
   var BUFFER_SIZE = 1024;
   var SAMPLE_RATE = 44100;
-  var intSize = 4;
   var Soundfile = class {
-    constructor(allocator, ptrSize, sampleSize, curChan, length2, maxChan, totalParts) {
+    constructor(allocator, sampleSize, curChan, length2, maxChan, totalParts) {
       this.fSampleSize = sampleSize;
-      this.fPtrSize = ptrSize;
+      this.fIntSize = this.fSampleSize;
+      this.fPtrSize = 4;
       this.fAllocator = allocator;
-      this.fPtr = allocator.alloc(4 * ptrSize);
-      this.fLength = allocator.alloc(MAX_SOUNDFILE_PARTS * intSize);
-      this.fSR = allocator.alloc(MAX_SOUNDFILE_PARTS * intSize);
-      this.fOffset = allocator.alloc(MAX_SOUNDFILE_PARTS * intSize);
+      console.log(`Soundfile constructor: curChan: ${curChan}, length: ${length2}, maxChan: ${maxChan}, totalParts: ${totalParts}`);
+      this.fPtr = allocator.alloc(4 * this.fPtrSize);
+      this.fLength = allocator.alloc(MAX_SOUNDFILE_PARTS * this.fIntSize);
+      this.fSR = allocator.alloc(MAX_SOUNDFILE_PARTS * this.fIntSize);
+      this.fOffset = allocator.alloc(MAX_SOUNDFILE_PARTS * this.fIntSize);
       this.fBuffers = this.allocBuffers(curChan, length2, maxChan);
       const HEAP32 = this.fAllocator.getInt32Array();
       HEAP32[this.fPtr >> 2] = this.fBuffers;
-      HEAP32[this.fPtr + ptrSize >> 2] = this.fLength;
-      HEAP32[this.fPtr + 2 * ptrSize >> 2] = this.fSR;
-      HEAP32[this.fPtr + 3 * ptrSize >> 2] = this.fOffset;
+      HEAP32[this.fPtr + this.fPtrSize >> 2] = this.fLength;
+      HEAP32[this.fPtr + 2 * this.fPtrSize >> 2] = this.fSR;
+      HEAP32[this.fPtr + 3 * this.fPtrSize >> 2] = this.fOffset;
       for (let chan = 0; chan < curChan; chan++) {
         const buffer = HEAP32[(this.fBuffers >> 2) + chan];
         console.log(`allocBuffers AFTER: ${chan} - ${buffer}`);
@@ -2051,10 +2051,18 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
       }
     }
     copyToOut(part, maxChannels, offset, buffer) {
-      const HEAP32 = this.fAllocator.getInt32Array();
-      HEAP32[(this.fLength >> 2) + part] = buffer.length;
-      HEAP32[(this.fSR >> 2) + part] = buffer.sampleRate;
-      HEAP32[(this.fOffset >> 2) + part] = offset;
+      if (this.fIntSize === 4) {
+        const HEAP32 = this.fAllocator.getInt32Array();
+        HEAP32[(this.fLength >> Math.log2(this.fIntSize)) + part] = buffer.length;
+        HEAP32[(this.fSR >> Math.log2(this.fIntSize)) + part] = buffer.sampleRate;
+        HEAP32[(this.fOffset >> Math.log2(this.fIntSize)) + part] = offset;
+      } else {
+        const HEAP64 = this.fAllocator.getInt64Array();
+        HEAP64[(this.fLength >> Math.log2(this.fIntSize)) + part] = BigInt(buffer.length);
+        HEAP64[(this.fSR >> Math.log2(this.fIntSize)) + part] = BigInt(buffer.sampleRate);
+        HEAP64[(this.fOffset >> Math.log2(this.fIntSize)) + part] = BigInt(offset);
+      }
+      console.log(`copyToOut: part: ${part}, maxChannels: ${maxChannels}, offset: ${offset}, buffer: ${buffer}`);
       if (this.fSampleSize === 8) {
         this.copyToOutReal64(maxChannels, offset, buffer);
       } else {
@@ -2067,6 +2075,9 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
       for (let chan = 0; chan < buffer.numberOfChannels; chan++) {
         const input = buffer.getChannelData(chan);
         const output = HEAP32[(this.fBuffers >> 2) + chan];
+        const begin = output + offset * this.fSampleSize >> Math.log2(this.fSampleSize);
+        const end = output + (offset + input.length) * this.fSampleSize >> Math.log2(this.fSampleSize);
+        console.log(`copyToOutReal32 begin: ${begin}, end: ${end}, delta: ${end - begin}`);
         const outputReal = HEAPF.subarray(
           output + offset * this.fSampleSize >> Math.log2(this.fSampleSize),
           output + (offset + input.length) * this.fSampleSize >> Math.log2(this.fSampleSize)
@@ -2082,6 +2093,9 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
       for (let chan = 0; chan < buffer.numberOfChannels; chan++) {
         const input = buffer.getChannelData(chan);
         const output = HEAP32[(this.fBuffers >> 2) + chan];
+        const begin = output + offset * this.fSampleSize >> Math.log2(this.fSampleSize);
+        const end = output + (offset + input.length) * this.fSampleSize >> Math.log2(this.fSampleSize);
+        console.log(`copyToOutReal64 begin: ${begin}, end: ${end}, delta: ${end - begin}`);
         const outputReal = HEAPF.subarray(
           output + offset * this.fSampleSize >> Math.log2(this.fSampleSize),
           output + (offset + input.length) * this.fSampleSize >> Math.log2(this.fSampleSize)
@@ -2092,10 +2106,17 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
       }
     }
     emptyFile(part, offset) {
-      const HEAP32 = this.fAllocator.getInt32Array();
-      HEAP32[(this.fLength >> 2) + part] = BUFFER_SIZE;
-      HEAP32[(this.fSR >> 2) + part] = SAMPLE_RATE;
-      HEAP32[(this.fOffset >> 2) + part] = offset;
+      if (this.fIntSize === 4) {
+        const HEAP32 = this.fAllocator.getInt32Array();
+        HEAP32[(this.fLength >> Math.log2(this.fIntSize)) + part] = BUFFER_SIZE;
+        HEAP32[(this.fSR >> Math.log2(this.fIntSize)) + part] = SAMPLE_RATE;
+        HEAP32[(this.fOffset >> Math.log2(this.fIntSize)) + part] = offset;
+      } else {
+        const HEAP64 = this.fAllocator.getInt64Array();
+        HEAP64[(this.fLength >> Math.log2(this.fIntSize)) + part] = BigInt(BUFFER_SIZE);
+        HEAP64[(this.fSR >> Math.log2(this.fIntSize)) + part] = BigInt(SAMPLE_RATE);
+        HEAP64[(this.fOffset >> Math.log2(this.fIntSize)) + part] = BigInt(offset);
+      }
       return offset + BUFFER_SIZE;
     }
     displayMemory(where = "", mem = false) {
@@ -2127,30 +2148,29 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
     }
   };
   var SoundfileReader = class {
-    constructor(allocator, context, ptrSize, sampleSize) {
+    constructor(allocator, context, sampleSize) {
       this.fAllocator = allocator;
-      this.fPtrSize = ptrSize;
       this.fSampleSize = sampleSize;
       this.fContext = context;
       this.fAudioBuffers = [];
     }
-    async checkFile(directories, fileName) {
-      async function checkFileExists(url) {
-        try {
-          console.log(`"checkFileExists" url: ${url}`);
-          const response = await fetch(url, { method: "HEAD" });
-          return response.ok;
-        } catch (error) {
-          console.error("Fetch error:", error);
-          return false;
-        }
+    async checkFileExists(url) {
+      try {
+        console.log(`"checkFileExists" url: ${url}`);
+        const response = await fetch(url, { method: "HEAD" });
+        return response.ok;
+      } catch (error) {
+        console.error("Fetch error:", error);
+        return false;
       }
-      if (await checkFileExists(fileName)) {
+    }
+    async checkFile(directories, fileName) {
+      if (await this.checkFileExists(fileName)) {
         return fileName;
       } else {
         for (let i = 0; i < directories.length; i++) {
           const pathName = directories[i] + "/" + fileName;
-          if (await checkFileExists(pathName)) {
+          if (await this.checkFileExists(pathName)) {
             return pathName;
           }
         }
@@ -2196,7 +2216,7 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
         return offset + BUFFER_SIZE;
       }
     }
-    async createSoundfile(pathNameList, maxChan, isDouble) {
+    async createSoundfile(pathNameList, maxChan) {
       try {
         let curChan = 1;
         let totalLength = 0;
@@ -2214,7 +2234,7 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
           totalLength += len;
         }
         totalLength += (MAX_SOUNDFILE_PARTS - pathNameList.length) * BUFFER_SIZE;
-        let soundfile = new Soundfile(this.fAllocator, this.fPtrSize, this.fSampleSize, curChan, totalLength, maxChan, pathNameList.length);
+        let soundfile = new Soundfile(this.fAllocator, this.fSampleSize, curChan, totalLength, maxChan, pathNameList.length);
         let offset = 0;
         for (let part = 0; part < pathNameList.length; part++) {
           if (pathNameList[part] === "__empty_sound__") {
@@ -2338,7 +2358,7 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
           console.log(`Soundfile CACHE ${url}} : ${name} loaded at ${item.basePtr} in wasm memory with index ${item.index}`);
           HEAP32[baseDSP + item.index >> 2] = item.basePtr;
         } else {
-          const soundfile = await sfReader.createSoundfile(sfPathNames, MAX_CHAN, this.fSampleSize === 8);
+          const soundfile = await sfReader.createSoundfile(sfPathNames, MAX_CHAN);
           if (soundfile) {
             const HEAP32 = soundfile.getHEAP32();
             item.basePtr = soundfile.getPtr();
@@ -2472,6 +2492,7 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
     constructor(instance, sampleRate, sampleSize, bufferSize) {
       super(sampleSize, bufferSize);
       this.fInstance = instance;
+      console.log("sampleSize: " + sampleSize + " bufferSize: " + bufferSize);
       this.fJSONDsp = JSON.parse(this.fInstance.json);
       FaustBaseWebAudioDsp.parseUI(this.fJSONDsp.ui, this.fUICallback);
       this.fEndMemory = this.initMemory();
@@ -2480,7 +2501,7 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
     async init(context) {
       if (this.fSoundfiles.length > 0 && context) {
         const allocator = new WasmAllocator(this.fInstance.memory, this.fEndMemory);
-        const sfReader = new SoundfileReader(allocator, context, this.fPtrSize, this.fSampleSize);
+        const sfReader = new SoundfileReader(allocator, context, this.fSampleSize);
         await this.initSoundfileMemory(allocator, sfReader, this.fDSP);
       }
     }
@@ -2684,6 +2705,7 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
     constructor(instance, sampleRate, sampleSize, bufferSize) {
       super(sampleSize, bufferSize);
       this.fInstance = instance;
+      console.log("sampleSize: " + sampleSize + " bufferSize: " + bufferSize);
       this.fJSONDsp = JSON.parse(this.fInstance.voiceJSON);
       this.fJSONEffect = this.fInstance.effectAPI && this.fInstance.effectJSON ? JSON.parse(this.fInstance.effectJSON) : null;
       FaustBaseWebAudioDsp.parseUI(this.fJSONDsp.ui, this.fUICallback);
@@ -2706,7 +2728,7 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
     async init(context) {
       if (this.fSoundfiles.length > 0 && context) {
         const allocator = new WasmAllocator(this.fInstance.memory, this.fEndMemory);
-        const sfReader = new SoundfileReader(allocator, context, this.fPtrSize, this.fSampleSize);
+        const sfReader = new SoundfileReader(allocator, context, this.fSampleSize);
         for (let voice = 0; voice < this.fInstance.voices; voice++) {
           await this.initSoundfileMemory(allocator, sfReader, this.fJSONDsp.size * voice);
         }