extract buffer size calculation into shared method

Author: oshoham

lib/p5.sound.js

@@ -1,8 +1,9 @@
 'use strict';
 
 define(function (require) {
-  var p5sound = require('master');
-  var processorNames = require('./audioWorklet/processorNames');
+  const p5sound = require('master');
+  const { safeBufferSize } = require('helpers');
+  const processorNames = require('./audioWorklet/processorNames');
 
   /**
    *  Amplitude measures volume between 0.0 and 1.0.
@@ -47,7 +48,7 @@ define(function (require) {
   p5.Amplitude = function(smoothing) {
 
     // Set to 2048 for now. In future iterations, this should be inherited or parsed from p5sound's default
-    this.bufferSize = 2048;
+    this.bufferSize = safeBufferSize(2048);
 
     // set audio context
     this.audiocontext = p5sound.audiocontext;
@@ -72,17 +73,6 @@ define(function (require) {
       }
     }.bind(this);
 
-    // if the AudioWorkletNode is actually a ScriptProcessorNode created via polyfill,
-    // make sure that our chosen buffer size isn't smaller than the buffer size automatically
-    // selected by the polyfill
-    // reference: https://github.com/GoogleChromeLabs/audioworklet-polyfill/issues/13#issuecomment-425014930
-    if (this._workletNode instanceof ScriptProcessorNode) {
-      this._workletNode.port.postMessage({
-        name: 'bufferSize',
-        bufferSize: Math.max(this.bufferSize, this._workletNode.bufferSize)
-      });
-    }
-
     // for connections
     this.input = this._workletNode;
 

lib/p5.sound.js.map

@@ -12,7 +12,10 @@ class AmplitudeProcessor extends AudioWorkletProcessor {
     this.normalize = processorOptions.normalize || false;
     this.smoothing = processorOptions.smoothing || 0;
 
-    this.setBufferSize(processorOptions.bufferSize || 2048);
+    this.bufferSize = processorOptions.bufferSize || 2048;
+    this.inputRingBuffer = new RingBuffer(this.bufferSize, this.numInputChannels);
+    this.outputRingBuffer = new RingBuffer(this.bufferSize, this.numOutputChannels);
+    this.inputRingBufferArraySequence = new Array(this.numInputChannels).fill(null).map(() => new Float32Array(this.bufferSize));
 
     this.stereoVol = [0, 0];
     this.stereoVolNorm = [0, 0];
@@ -25,19 +28,10 @@ class AmplitudeProcessor extends AudioWorkletProcessor {
         this.normalize = data.normalize;
       } else if (data.name === 'smoothing') {
         this.smoothing = Math.max(0, Math.min(1, data.smoothing));
-      } else if (data.name === 'bufferSize') {
-        this.setBufferSize(data.bufferSize);
       }
     };
   }
 
-  setBufferSize(bufferSize) {
-    this.bufferSize = bufferSize;
-    this.inputRingBuffer = new RingBuffer(this.bufferSize, this.numInputChannels);
-    this.outputRingBuffer = new RingBuffer(this.bufferSize, this.numOutputChannels);
-    this.inputRingBufferArraySequence = new Array(this.numInputChannels).fill(null).map(() => new Float32Array(this.bufferSize));
-  }
-
   // TO DO make this stereo / dependent on # of audio channels
   process(inputs, outputs) {
     const input = inputs[0];

lib/p5.sound.min.js

@@ -20,17 +20,10 @@ class RecorderProcessor extends AudioWorkletProcessor {
         this.record(data.duration);
       } else if (data.name === 'stop') {
         this.stop();
-      } else if (data.name === 'bufferSize') {
-        this.setBufferSize(data.bufferSize);
       }
     };
   }
 
-  setBufferSize(bufferSize) {
-    this.bufferSize = bufferSize;
-    this.clear();
-  }
-
   process(inputs) {
     if (!this.recording) {
       return true;

lib/p5.sound.min.js.map

@@ -7,18 +7,7 @@ class SoundFileProcessor extends AudioWorkletProcessor {
     super();
 
     const processorOptions = options.processorOptions || {};
-    this.setBufferSize(processorOptions.bufferSize || 256);
-
-    this.port.onmessage = (event) => {
-      const data = event.data;
-      if (data.name === 'bufferSize') {
-        this.setBufferSize(data.bufferSize);
-      }
-    };
-  }
-
-  setBufferSize(bufferSize) {
-    this.bufferSize = bufferSize;
+    this.bufferSize = processorOptions.bufferSize || 256;
     this.inputRingBuffer = new RingBuffer(this.bufferSize, 1);
     this.inputRingBufferArraySequence = [new Float32Array(this.bufferSize)];
   }

src/amplitude.js

@@ -1,6 +1,7 @@
 'use strict';
 define(function (require) {
   var p5sound = require('master');
+  var processorNames = require('./audioWorklet/processorNames');
   /**
    * @for p5
    */
@@ -301,10 +302,28 @@ define(function (require) {
     }
   }
 
+  function safeBufferSize(idealBufferSize) {
+    let bufferSize = idealBufferSize;
+
+    // if the AudioWorkletNode is actually a ScriptProcessorNode created via polyfill,
+    // make sure that our chosen buffer size isn't smaller than the buffer size automatically
+    // selected by the polyfill
+    // reference: https://github.com/GoogleChromeLabs/audioworklet-polyfill/issues/13#issuecomment-425014930
+    let tempAudioWorkletNode = new AudioWorkletNode(p5sound.audiocontext, processorNames.soundFileProcessor);
+    if (tempAudioWorkletNode instanceof ScriptProcessorNode) {
+      bufferSize = tempAudioWorkletNode.bufferSize;
+    }
+    tempAudioWorkletNode.disconnect();
+    tempAudioWorkletNode = null;
+
+    return bufferSize;
+  }
+
   return {
     convertToWav: convertToWav,
     midiToFreq: midiToFreq,
-    noteToFreq: noteToFreq
+    noteToFreq: noteToFreq,
+    safeBufferSize: safeBufferSize
   };
 
 });

src/audioWorklet/amplitudeProcessor.js

@@ -4,10 +4,10 @@ define(function (require) {
 
   // inspiration: recorder.js, Tone.js & typedarray.org
 
-  var p5sound = require('master');
-  var convertToWav = require('helpers').convertToWav;
-  var processorNames = require('./audioWorklet/processorNames');
-  var ac = p5sound.audiocontext;
+  const p5sound = require('master');
+  const { convertToWav, safeBufferSize } = require('helpers');
+  const processorNames = require('./audioWorklet/processorNames');
+  const ac = p5sound.audiocontext;
 
   /**
    *  <p>Record sounds for playback and/or to save as a .wav file.
@@ -83,7 +83,7 @@ define(function (require) {
     this._inputChannels = 2;
     this._outputChannels = 2; // stereo output, even if input is mono
 
-    const workletBufferSize = 1024;
+    const workletBufferSize = safeBufferSize(1024);
 
     this._workletNode = new AudioWorkletNode(ac, processorNames.recorderProcessor, {
       outputChannelCount: [this._outputChannels],
@@ -103,17 +103,6 @@ define(function (require) {
       }
     }.bind(this);
 
-    // if the AudioWorkletNode is actually a ScriptProcessorNode created via polyfill,
-    // make sure that our chosen buffer size isn't smaller than the buffer size automatically
-    // selected by the polyfill
-    // reference: https://github.com/GoogleChromeLabs/audioworklet-polyfill/issues/13#issuecomment-425014930
-    if (this._workletNode instanceof ScriptProcessorNode) {
-      this._workletNode.port.postMessage({
-        name: 'bufferSize',
-        bufferSize: Math.max(workletBufferSize, this._workletNode.bufferSize)
-      });
-    }
-
     /**
      *  callback invoked when the recording is over
      *  @private