Merge branch 'main' of https://github.com/processing/p5.js-sound into Abhijay007/AudioIn-fields

Author: Abhijay007

src/audioWorklet/ringBuffer.js

@@ -67,7 +67,8 @@ class RingBuffer {
     for (let i = 0; i < sourceLength; ++i) {
       let writeIndex = (this._writeIndex + i) % this._length;
       for (let channel = 0; channel < this._channelCount; ++channel) {
-        this._channelData[channel][writeIndex] = arraySequence[channel][i];
+        if (arraySequence[channel])
+          this._channelData[channel][writeIndex] = arraySequence[channel][i];
       }
     }
 

src/fft.js

@@ -298,7 +298,7 @@ class FFT {
    *  <a href="https://en.wikipedia.org/wiki/Audio_frequency" target="_blank">
    *  frequency</a>, or the average amount of energy between two
    *  frequencies. Accepts Number(s) corresponding
-   *  to frequency (in Hz), or a "string" corresponding to predefined
+   *  to frequency (in Hz) (frequency must be >= 0), or a "string" corresponding to predefined
    *  frequency ranges ("bass", "lowMid", "mid", "highMid", "treble").
    *  Returns a range between 0 (no energy/volume at that frequency) and
    *  255 (maximum energy).
@@ -318,8 +318,8 @@ class FFT {
    *                                will return average amount of
    *                                energy that exists between the
    *                                two frequencies.
-   *  @return {Number}   Energy   Energy (volume/amplitude) from
-   *                              0 and 255.
+   *  @return {Number}  Energy (volume/amplitude) from
+   *                    0 and 255.
    *
    */
   getEnergy(frequency1, frequency2) {
@@ -350,7 +350,9 @@ class FFT {
       var index = Math.round((frequency1 / nyquist) * this.freqDomain.length);
       return this.freqDomain[index];
     }
-
+    if (frequency1 < 0 || frequency2 < 0) {
+      throw 'invalid input for getEnergy(), frequency cannot be a negative number';
+    }
     // if two parameters:
     // if second is higher than first
     if (frequency1 > frequency2) {

src/main.js

@@ -87,7 +87,8 @@ p5.prototype.outputVolume = function (vol, rampTime = 0, tFromNow = 0) {
     var now = p5sound.audiocontext.currentTime;
     var currentVol = p5sound.output.gain.value;
     p5sound.output.gain.cancelScheduledValues(now + tFromNow);
-    p5sound.output.gain.linearRampToValueAtTime(currentVol, now + tFromNow);
+    if (rampTime !== 0)
+      p5sound.output.gain.linearRampToValueAtTime(currentVol, now + tFromNow);
     p5sound.output.gain.linearRampToValueAtTime(vol, now + tFromNow + rampTime);
   } else if (vol) {
     vol.connect(p5sound.output.gain);

src/monosynth.js

@@ -77,14 +77,21 @@ class MonoSynth extends AudioVoice {
      * @for p5.MonoSynth
      */
     /**
+     * Allows user to set the decay time of the envelope (ADSR) of the MonoSynth class.
+     * It is a getter and setter that can be used to retrieve or change the decay time.
+     * Used in conjunction with the attack, sustain, and release fields/functions to set the full envelope of the synthesizer.
      * @property {Number} decay
      * @for p5.MonoSynth
      */
     /**
+     * Allows the user to retrieve and adjust the sustain level of the envelope,
+     * which controls the level at which the sound is sustained during the sustain phase of the envelope.
+     * The default sustain level is set to 0.15.
      * @property {Number} sustain
      * @for p5.MonoSynth
      */
     /**
+     * Allows the user to access and change the release time of the envelope.
      * @property {Number} release
      * @for p5.MonoSynth
      */

src/soundfile.js

@@ -1362,40 +1362,39 @@ class SoundFile {
     var now = ac.currentTime;
     var cNode = ac.createBufferSource();
 
-    const workletBufferSize = safeBufferSize(256);
-
-    // dispose of worklet node if it already exists
-    if (self._workletNode) {
-      self._workletNode.disconnect();
-      delete self._workletNode;
-    }
-    self._workletNode = new AudioWorkletNode(
-      ac,
-      processorNames.soundFileProcessor,
-      {
-        processorOptions: { bufferSize: workletBufferSize },
-      }
-    );
-    self._workletNode.port.onmessage = (event) => {
-      if (event.data.name === 'position') {
-        // event.data.position should only be 0 when paused
-        if (event.data.position === 0) {
-          return;
+    // Reuse the worklet node rather than creating a new one. Even if we
+    // disconnect it, it seems to leak and cause choppy audio after a
+    // while.
+    if (!self._workletNode) {
+      const workletBufferSize = safeBufferSize(256);
+      self._workletNode = new AudioWorkletNode(
+        ac,
+        processorNames.soundFileProcessor,
+        {
+          processorOptions: { bufferSize: workletBufferSize },
         }
-        this._lastPos = event.data.position;
+      );
+      self._workletNode.port.onmessage = (event) => {
+        if (event.data.name === 'position') {
+          // event.data.position should only be 0 when paused
+          if (event.data.position === 0) {
+            return;
+          }
+          this._lastPos = event.data.position;
 
-        // do any callbacks that have been scheduled
-        this._onTimeUpdate(self._lastPos);
-      }
-    };
+          // do any callbacks that have been scheduled
+          this._onTimeUpdate(self._lastPos);
+        }
+      };
+      self._workletNode.connect(p5.soundOut._silentNode);
+    }
 
     // create counter buffer of the same length as self.buffer
     cNode.buffer = _createCounterBuffer(self.buffer);
 
     cNode.playbackRate.setValueAtTime(self.playbackRate, now);
 
     cNode.connect(self._workletNode);
-    self._workletNode.connect(p5.soundOut._silentNode);
 
     return cNode;
   }

test/tests/p5.Amplitude.js

@@ -67,10 +67,11 @@ describe('p5.Amplitude', function () {
       expect(amp.normalize).to.be.false;
     });
 
-    it('gets oscillator level', function () {
+    it('gets oscillator level', function (done) {
       amp.setInput(osc);
       setTimeout(function () {
         expect(amp.getLevel()).to.be.closeTo(0.55, 0.25);
+        done();
       }, 100);
     });
 

test/tests/p5.AudioIn.js

@@ -95,7 +95,6 @@ describe('p5.AudioIn', function () {
 
     it('can get sources', function (done) {
       mic.getSources().then(function (sources) {
-        console.log(sources);
         expect(sources).to.be.an('array');
         done();
       });

test/tests/p5.SoundFile.js

@@ -60,7 +60,7 @@ describe('p5.SoundFile', function () {
       () => done(),
       () => {},
       (progress) => {
-        if (progress) {
+        if (progress && progress !== 'size unknown') {
           expect(progress)
             .to.be.a('number')
             .to.be.greaterThan(0)
@@ -104,7 +104,7 @@ describe('p5.SoundFile', function () {
         () => done(),
         () => {},
         (progress) => {
-          if (progress) {
+          if (progress && progress !== 'size unknown') {
             expect(progress)
               .to.be.a('number')
               .to.be.greaterThan(0)
@@ -185,7 +185,7 @@ describe('p5.SoundFile', function () {
         setTimeout(() => {
           expect(sf._playing).to.be.false;
           done();
-        }, 500); // as play back is 2 & cued 500ms , 500ms is enough to complete playing
+        }, 550); // as play back is 2 & cued 500ms , 500ms is enough to complete playing
       });
     });
     it('can play with some given duration', function (done) {
@@ -266,8 +266,8 @@ describe('p5.SoundFile', function () {
         setTimeout(() => {
           expect(sf.bufferSourceNode._playing).to.be.false;
           expect(sf._playing).to.be.false;
+          done();
         }, 100);
-        done();
       });
     });
 

test/tests/p5.SoundRecorder.js

@@ -72,12 +72,23 @@ describe('p5.SoundRecorder', function () {
       recorder.setInput(mic);
       const outputSoundFile = new p5.SoundFile();
       setTimeout(() => {
-        recorder.record(outputSoundFile, recordingDuration, function () {
-          expect(outputSoundFile.duration()).to.eq(recordingDuration);
+        recorder.record(outputSoundFile, 5 * recordingDuration, function () {
+          expect(outputSoundFile.duration()).to.be.approximately(
+            5 * recordingDuration,
+            0.01
+          );
 
           const outputChannel = outputSoundFile.buffer.getChannelData(0);
-          expect(outputChannel[0]).to.not.eq(0);
+          let isAllZero = true;
 
+          for (let i = 0; i < outputChannel.length; i++) {
+            if (outputChannel[i] !== 0) {
+              isAllZero = false;
+              break;
+            }
+          }
+
+          expect(isAllZero).to.be.false;
           outputSoundFile.dispose();
           mic.dispose();
           p5.prototype.outputVolume(0);