Consolidating the existing RingBuffer Implementation.

.eleventy.js

@@ -78,6 +78,7 @@ module.exports = function(eleventyConfig) {
     'src/robots.txt',
     'src/README.md',
     'src/sitemap.xml',
+    'src/lib/**/*.js',
   ].map(path => eleventyConfig.addPassthroughCopy(path));
 
   // eleventyConfig.addPassthroughCopy('src/favicon');

src/audio-worklet/design-pattern/wasm-ring-buffer/ring-buffer-worklet-processor.js

@@ -15,7 +15,7 @@
  */
 
 import Module from './variable-buffer-kernel.wasmmodule.js';
-import {HeapAudioBuffer, RingBuffer} from '../lib/wasm-audio-helper.js';
+import { FreeQueue } from '../../../lib/free-queue/free-queue.js';
 
 /**
  * An example of AudioWorkletProcessor that uses RingBuffer inside. If your
@@ -40,17 +40,15 @@ class RingBufferWorkletProcessor extends AudioWorkletProcessor {
     this._kernelBufferSize = options.processorOptions.kernelBufferSize;
     this._channelCount = options.processorOptions.channelCount;
 
-    // RingBuffers for input and output.
-    this._inputRingBuffer =
-        new RingBuffer(this._kernelBufferSize, this._channelCount);
-    this._outputRingBuffer =
-        new RingBuffer(this._kernelBufferSize, this._channelCount);
+    this._inputAudioBuffer =
+      new FreeQueue(Module, this._kernelBufferSize, this._channelCount);
+    this._outputAudioBuffer =
+      new FreeQueue(Module, this._kernelBufferSize, this._channelCount);
 
-    // For WASM memory, also for input and output.
     this._heapInputBuffer =
-        new HeapAudioBuffer(Module, this._kernelBufferSize, this._channelCount);
+        new FreeQueue(Module, this._kernelBufferSize, this._channelCount);
     this._heapOutputBuffer =
-        new HeapAudioBuffer(Module, this._kernelBufferSize, this._channelCount);
+        new FreeQueue(Module, this._kernelBufferSize, this._channelCount);
 
     // WASM audio processing kernel.
     this._kernel = new Module.VariableBufferKernel(this._kernelBufferSize);
@@ -72,29 +70,29 @@ class RingBufferWorkletProcessor extends AudioWorkletProcessor {
 
     // AudioWorkletProcessor always gets 128 frames in and 128 frames out. Here
     // we push 128 frames into the ring buffer.
-    this._inputRingBuffer.push(input);
+    this._inputAudioBuffer.push(input);
 
     // Process only if we have enough frames for the kernel.
-    if (this._inputRingBuffer.framesAvailable >= this._kernelBufferSize) {
+    if (this._inputAudioBuffer.framesAvailable >= this._kernelBufferSize) {
       // Get the queued data from the input ring buffer.
-      this._inputRingBuffer.pull(this._heapInputBuffer.getChannelData());
+      this._inputAudioBuffer.pull(this._inputAudioBuffer.getChannelData());
 
       // This WASM process function can be replaced with ScriptProcessor's
       // |onaudioprocess| callback funciton. However, if the event handler
       // touches DOM in the main scope, it needs to be translated with the
       // async messaging via MessagePort.
       this._kernel.process(
-          this._heapInputBuffer.getHeapAddress(),
-          this._heapOutputBuffer.getHeapAddress(),
-          this._channelCount);
+        this._inputAudioBuffer.getHeapAddress(),
+        this._outputAudioBuffer.getHeapAddress(),
+        this._channelCount);
 
       // Fill the output ring buffer with the processed data.
-      this._outputRingBuffer.push(this._heapOutputBuffer.getChannelData());
+      this._outputAudioBuffer.push(this._outputAudioBuffer.getChannelData());
     }
 
     // Always pull 128 frames out. If the ring buffer does not have enough
     // frames, the output will be silent.
-    this._outputRingBuffer.pull(output);
+    this._outputAudioBuffer.pull(output);
 
     return true;
   }

src/audio-worklet/design-pattern/wasm-supersaw/synth-processor.js

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import Module from './synth.wasm.js';
-import {HeapAudioBuffer} from '../lib/wasm-audio-helper.js';
+import { FreeQueue } from '../../../lib/free-queue/free-queue.js';
 
 /* global sampleRate */
 
@@ -16,7 +16,7 @@ class SynthProcessor extends AudioWorkletProcessor {
     // Create an instance of Synthesizer and WASM memory helper. Then set up an
     // event handler for MIDI data from the main thread.
     this._synth = new Module.Synthesizer(sampleRate);
-    this._wasmHeapBuffer = new HeapAudioBuffer(Module, NUM_FRAMES, 1, 1);
+    this._wasmHeapBuffer = new FreeQueue(Module, NUM_FRAMES, 1, 1);
     this.port.onmessage = this._playTone.bind(this);
   }
 

src/audio-worklet/design-pattern/wasm/wasm-worklet-processor.js

@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 import Module from './simple-kernel.wasmmodule.js';
-import {RENDER_QUANTUM_FRAMES, MAX_CHANNEL_COUNT, HeapAudioBuffer}
-  from '../lib/wasm-audio-helper.js';
+import {RENDER_QUANTUM_FRAMES, MAX_CHANNEL_COUNT, FreeQueue}
+  from '../../../lib/free-queue/free-queue.js';
 
 /**
  * A simple demonstration of WASM-powered AudioWorkletProcessor.
@@ -21,9 +21,9 @@ class WASMWorkletProcessor extends AudioWorkletProcessor {
 
     // Allocate the buffer for the heap access. Start with stereo, but it can
     // be expanded up to 32 channels.
-    this._heapInputBuffer = new HeapAudioBuffer(
+    this._heapInputBuffer = new FreeQueue(
         Module, RENDER_QUANTUM_FRAMES, 2, MAX_CHANNEL_COUNT);
-    this._heapOutputBuffer = new HeapAudioBuffer(
+    this._heapOutputBuffer = new FreeQueue(
         Module, RENDER_QUANTUM_FRAMES, 2, MAX_CHANNEL_COUNT);
     this._kernel = new Module.SimpleKernel();
   }

src/audio-worklet/free-queue/examples/simple-passthrough/basic-processor.js

@@ -1,4 +1,4 @@
-import FreeQueue from "../../src/free-queue.js";
+import { FreeQueueSAB } from "../../../../lib/free-queue/free-queue-sab.js";
 import { FRAME_SIZE, RENDER_QUANTUM } from "./constants.js";
 
 /**
@@ -20,8 +20,8 @@ class BasicProcessor extends AudioWorkletProcessor {
     this.inputQueue = options.processorOptions.inputQueue;
     this.outputQueue = options.processorOptions.outputQueue;
     this.atomicState = options.processorOptions.atomicState;
-    Object.setPrototypeOf(this.inputQueue, FreeQueue.prototype);
-    Object.setPrototypeOf(this.outputQueue, FreeQueue.prototype);
+    Object.setPrototypeOf(this.inputQueue, FreeQueueSAB.prototype);
+    Object.setPrototypeOf(this.outputQueue, FreeQueueSAB.prototype);
 
   }
 

src/audio-worklet/free-queue/examples/simple-passthrough/main.js

@@ -1,12 +1,12 @@
-import FreeQueue from '../../src/free-queue.js'
+import { FreeQueueSAB } from '../../../../lib/free-queue/free-queue-sab.js'
 import { QUEUE_SIZE } from './constants.js';
 
 const toggleButton = document.getElementById('toggle');
 toggleButton.disabled = false;
 
 // Create 2 FreeQueue instances with 4096 buffer length and 1 channel.
-const inputQueue = new FreeQueue(QUEUE_SIZE, 1);
-const outputQueue = new FreeQueue(QUEUE_SIZE, 1);
+const inputQueue = new FreeQueueSAB(QUEUE_SIZE, 1);
+const outputQueue = new FreeQueueSAB(QUEUE_SIZE, 1);
 // Create an atomic state for synchronization between worker and AudioWorklet.
 const atomicState = new Int32Array(
     new SharedArrayBuffer(1 * Int32Array.BYTES_PER_ELEMENT)

src/audio-worklet/free-queue/examples/simple-passthrough/worker.js

@@ -1,4 +1,4 @@
-import FreeQueue from "../../src/free-queue.js";
+import { FreeQueueSAB } from "../../../../lib/free-queue/free-queue-sab.js";
 import { FRAME_SIZE } from "./constants.js";
 
 /**
@@ -9,8 +9,8 @@ import { FRAME_SIZE } from "./constants.js";
 self.onmessage = (msg) => {
   if (msg.data.type === "init") {
     let { inputQueue, outputQueue, atomicState } = msg.data.data;
-    Object.setPrototypeOf(inputQueue, FreeQueue.prototype);
-    Object.setPrototypeOf(outputQueue, FreeQueue.prototype);
+    Object.setPrototypeOf(inputQueue, FreeQueueSAB.prototype);
+    Object.setPrototypeOf(outputQueue, FreeQueueSAB.prototype);
 
     // buffer for storing data pulled out from queue.
     const input = new Float32Array(FRAME_SIZE);

src/lib/free-queue/README.md

@@ -0,0 +1 @@
+### Work In Progress ....