fix firefox audio glitches by seperate period size from sab

.prettierrc

@@ -3,6 +3,6 @@
   "printWidth": 100,
   "tabWidth": 2,
   "singleQuote": true,
-  "trailingComma": true,
+  "trailingComma": 'all',
   "jsxBracketSameLine": false
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "csound-wasm",
-  "version": "6.14.0-6",
+  "version": "6.15.0-0",
   "author": "Hlödver Sigurdsson <[email protected]>",
   "license": "LGPL-3.0",
   "main": "./dist/libcsound.mjs",

src/filesystem.js

@@ -135,11 +135,11 @@ function rmrfFsRec(rmrfPath) {
   }
   if (wasmFs.fs.existsSync(rmrfPathSandboxed)) {
     wasmFs.fs.readdirSync(rmrfPathSandboxed).forEach(file => {
-      var curPath = path.join(rmrfPathSandboxed, file);
-      if (wasmFs.fs.lstatSync(curPath).isDirectory()) {
-        rmrfFsRec(curPath);
-      } else {
-        wasmFs.fs.unlinkSync(curPath);
+      var currentPath = path.join(rmrfPathSandboxed, file);
+      if (wasmFs.fs.lstatSync(currentPath).isDirectory()) {
+        rmrfFsRec(currentPath);
+       } else {
+        wasmFs.fs.unlinkSync(currentPath);
       }
     });
     wasmFs.fs.rmdirSync(rmrfPathSandboxed);

src/mains/messages.main.js

@@ -51,12 +51,12 @@ const safelyClosePorts = ([p1, p2]) => {
   if (typeof p1.close !== 'undefined') {
     try {
       p1.close();
-    } catch (e) {}
+    } catch {}
   }
   if (typeof p2.close !== 'undefined') {
     try {
       p2.close();
-    } catch (e) {}
+    } catch {}
   }
 };
 

src/mains/vanilla.main.js

@@ -23,7 +23,6 @@ import {
   csoundWorkerFrameRequestPort,
 } from '@root/mains/messages.main';
 
-let isInitialized = false;
 
 class VanillaWorkerMainThread {
   constructor(audioWorker, wasmDataURI) {

src/mains/worklet.main.js

@@ -4,12 +4,8 @@ import log, { logWorklet } from '@root/logger';
 import {
   audioWorkerAudioInputPort,
   audioWorkerFrameRequestPort,
-  cleanupPorts,
   emitInternalCsoundLogEvent,
   workerMessagePortAudio,
-  restartMessagePortAudio,
-  restartWorkerFrameRequestPort,
-  restartWorkerAudioInputPort,
 } from '@root/mains/messages.main';
 
 const connectedMidiDevices = new Set();
@@ -48,9 +44,8 @@ class AudioWorkletMainThread {
         logWorklet(
           'event received: realtimePerformanceEnded' + !this.csoundWorkerMain.hasSharedArrayBuffer
             ? ` cleaning up Vanilla ports`
-            : ''
+            : '',
         );
-        !this.csoundWorkerMain.hasSharedArrayBuffer; // && cleanupPorts(this.csoundWorkerMain);
         this.audioCtx.close();
         this.audioWorkletNode.disconnect();
         delete this.audioWorkletNode;
@@ -109,7 +104,7 @@ class AudioWorkletMainThread {
       return;
     }
 
-    let createWorkletNode = (audoContext, inputsCount) => {
+    const createWorkletNode = (audoContext, inputsCount) => {
       return new AudioWorkletNode(audoContext, 'csound-worklet-processor', {
         numberOfInputs: 1,
         numberOfOutputs: 1,
@@ -142,11 +137,11 @@ class AudioWorkletMainThread {
             for (let input = midiInputs.next(); input && !input.done; input = midiInputs.next()) {
               emitInternalCsoundLogEvent(
                 this.csoundWorkerMain,
-                `Connecting midi-input: ${input.value.name || 'unkown'}`
+                `Connecting midi-input: ${input.value.name || 'unkown'}`,
               );
               if (!connectedMidiDevices.has(input.value.name || 'unkown')) {
                 input.value.onmidimessage = this.csoundWorkerMain.handleMidiInput.bind(
-                  this.csoundWorkerMain
+                  this.csoundWorkerMain,
                 );
                 connectedMidiDevices.add(input.value.name || 'unkown');
               }
@@ -157,13 +152,13 @@ class AudioWorkletMainThread {
         } catch (error) {
           emitInternalCsoundLogEvent(
             this.csoundWorkerMain,
-            'error while connecting web-midi: ' + error
+            'error while connecting web-midi: ' + error,
           );
         }
       } else {
         emitInternalCsoundLogEvent(
           this.csoundWorkerMain,
-          'no web-midi support found, midi-input will not work!'
+          'no web-midi support found, midi-input will not work!',
         );
       }
     }
@@ -174,7 +169,7 @@ class AudioWorkletMainThread {
           ? navigator.mediaDevices.getUserMedia
           : navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia;
 
-      const microphoneCallback = stream => {
+      const microphoneCallback = (stream) => {
         if (stream) {
           const liveInput = newAudioContext.createMediaStreamSource(stream);
           this.inputsCount = liveInput.channelCount;
@@ -207,7 +202,7 @@ class AudioWorkletMainThread {
               },
             },
             microphoneCallback,
-            log.error
+            log.error,
           );
     } else {
       const newNode = createWorkletNode(newAudioContext, 0);

src/workers/worklet.worker.js

@@ -3,7 +3,8 @@ import { AUDIO_STATE, MAX_HARDWARE_BUFFER_SIZE } from '@root/constants';
 import { instantiateAudioPacket } from '@root/workers/common.utils';
 import { logWorklet } from '@root/logger';
 
-const PERIODS = 3;
+const SAB_PERIODS = 3;
+const VANILLA_PERIODS = 4;
 
 const workerMessagePort = {
   ready: false,
@@ -38,7 +39,7 @@ function processSharedArrayBuffer(inputs, outputs) {
 
   this.isPerformingLastTime = isPerforming;
 
-  if (this.preProcessCount < PERIODS && this.isPerformingLastTime && isPerforming) {
+  if (this.preProcessCount < SAB_PERIODS && this.isPerformingLastTime && isPerforming) {
     Atomics.store(this.sharedArrayBuffer, AUDIO_STATE.ATOMIC_NOFITY, 1);
     Atomics.notify(this.sharedArrayBuffer, AUDIO_STATE.ATOMIC_NOTIFY);
     this.preProcessCount += 1;
@@ -51,7 +52,7 @@ function processSharedArrayBuffer(inputs, outputs) {
   const hasWriteableInputChannels = writeableInputChannels.length > 0;
   const availableOutputBuffers = Atomics.load(this.sharedArrayBuffer, AUDIO_STATE.AVAIL_OUT_BUFS);
 
-  if (availableOutputBuffers < this.softwareBufferSize * PERIODS) {
+  if (availableOutputBuffers < this.softwareBufferSize * SAB_PERIODS) {
     Atomics.store(this.sharedArrayBuffer, AUDIO_STATE.ATOMIC_NOFITY, 1);
     Atomics.notify(this.sharedArrayBuffer, AUDIO_STATE.ATOMIC_NOTIFY);
   }
@@ -147,7 +148,7 @@ function processVanillaBuffers(inputs, outputs) {
     });
 
     if (this.inputsCount > 0 && hasWriteableInputChannels && writeableInputChannels[0].length > 0) {
-      const inputBufferLength = this.softwareBufferSize * PERIODS;
+      const inputBufferLength = this.softwareBufferSize * VANILLA_PERIODS;
       writeableInputChannels.forEach((channelBuffer, channelIndex) => {
         this.vanillaInputChannels[channelIndex].set(channelBuffer, this.vanillaInputReadIndex);
       });
@@ -186,8 +187,8 @@ function processVanillaBuffers(inputs, outputs) {
   }
 
   if (
-    this.vanillaAvailableFrames < this.softwareBufferSize * PERIODS &&
-    this.pendingFrames < this.softwareBufferSize * PERIODS * 2
+    this.vanillaAvailableFrames < this.softwareBufferSize * VANILLA_PERIODS &&
+    this.pendingFrames < this.softwareBufferSize * VANILLA_PERIODS * 2
   ) {
     const futureOutputReadIndex =
       (this.vanillaAvailableFrames + nextOutputReadIndex + this.pendingFrames) %
@@ -198,9 +199,9 @@ function processVanillaBuffers(inputs, outputs) {
         futureOutputReadIndex < this.hardwareBufferSize
           ? futureOutputReadIndex
           : futureOutputReadIndex + 1,
-      numFrames: this.softwareBufferSize * PERIODS,
+      numFrames: this.softwareBufferSize * VANILLA_PERIODS
     });
-    this.pendingFrames += this.softwareBufferSize * PERIODS;
+    this.pendingFrames += this.softwareBufferSize * VANILLA_PERIODS;
   }
 
   return true;