speaker-calibration 2.2.165 → 2.2.167

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "speaker-calibration",
-  "version": "2.2.165",
+  "version": "2.2.167",
   "description": "Speaker calibration library for auditory testing",
   "main": "dist/main.js",
   "directories": {

package/src/peer-connection/speaker.js

@@ -117,6 +117,7 @@ class Speaker extends AudioPeer {
             params.calibrateSoundSmoothOctaves,
             params.calibrateSoundPowerBinDesiredSec,
             params.calibrateSoundPowerDbSDToleratedDb,
+            params.calibrateSoundTaperSec,
             params.micManufacturer,
             params.micSerialNumber,
             params.micModelNumber,
@@ -545,6 +546,7 @@ class Speaker extends AudioPeer {
         params.calibrateSoundSmoothOctaves,
         params.calibrateSoundPowerBinDesiredSec,
         params.calibrateSoundPowerDbSDToleratedDb,
+        params.calibrateSoundTaperSec,
         params.micManufacturer,
         params.micSerialNumber,
         params.micModelNumber,

package/src/tasks/combination/combination.js

@@ -102,8 +102,6 @@ class Combination extends AudioCalibrator {
   /** @private */
   #audioContext;
 
-  /** @private */
-  TAPER_SECS = 5;
 
   /** @private */
   offsetGainNode;
@@ -233,6 +231,10 @@ class Combination extends AudioCalibrator {
 
   webAudioDeviceNames = {loudspeaker: '', microphone: '', loudspeakerText: '', microphoneText: ''};
 
+  waveforms = {
+    volume: {}
+  };
+
   recordingChecks = {
     volume: {},
     unfiltered: [],
@@ -2145,6 +2147,7 @@ class Combination extends AudioCalibrator {
     const audioContext = this.makeNewSourceAudioContext();
     const oscilator = audioContext.createOscillator();
     const gainNode = audioContext.createGain();
+    console.log(gainValue);
     const taperGainNode = audioContext.createGain();
     const offsetGainNode = audioContext.createGain();
     const totalDuration = this.CALIBRATION_TONE_DURATION * 1.2;
@@ -2166,6 +2169,32 @@ class Combination extends AudioCalibrator {
     );
     offsetGainNode.connect(audioContext.destination);
 
+    const gainValuesOverTime = [];
+    const sampleRate = this.#CALIBRATION_TONE_FREQUENCY; // Number of samples per second
+    const interval = 1 / sampleRate; // Time between samples
+
+    for (let t = 0; t <= totalDuration; t += interval) {
+
+      let gainValueAtTime = gainValue;
+
+      // Apply the onset curve
+      if (t < this.TAPER_SECS) {
+          const onsetIndex = Math.floor((t / this.TAPER_SECS) * onsetCurve.length);
+          gainValueAtTime *= onsetCurve[onsetIndex];
+      }
+
+      // Apply the offset curve
+      if (t > totalDuration - this.TAPER_SECS) {
+          const offsetTime = t - (totalDuration - this.TAPER_SECS);
+          const offsetIndex = Math.floor((offsetTime / this.TAPER_SECS) * offsetCurve.length);
+          gainValueAtTime *= offsetCurve[offsetIndex];
+      }
+
+      gainValuesOverTime.push(gainValueAtTime);
+  }
+
+  this.waveforms['volume'][this.inDB] = gainValuesOverTime;
+
     this.addCalibrationNode(oscilator);
   };
 
@@ -2246,7 +2275,7 @@ class Combination extends AudioCalibrator {
   };
 
   startCalibrationVolume = async (stream, gainValues, lCalib, componentGainDBSPL) => {
-    console.log("JS used memory:", performance.memory.usedJSHeapSize/1024/1024, "mb");
+
     if (this.isCalibrating) return null;
     const trialIterations = gainValues.length;
     this.status_denominator += trialIterations;
@@ -2649,6 +2678,7 @@ class Combination extends AudioCalibrator {
     _calibrateSoundSmoothOctaves = 0.33,
     _calibrateSoundPowerBinDesiredSec = 0.2,
     _calibrateSoundPowerDbSDToleratedDb = 1,
+    _calibrateSoundTaperSec = 0.01,
     micManufacturer = '',
     micSerialNumber = '',
     micModelNumber = '',
@@ -2665,6 +2695,7 @@ class Combination extends AudioCalibrator {
     reminder,
     calibrateSoundLimit,
   ) => {
+    this.TAPER_SECS = _calibrateSoundTaperSec;
     this.calibrateSoundLimit = calibrateSoundLimit;
     this._calibrateSoundBurstDb = _calibrateSoundBurstDb;
     this._calibrateSoundBurstFilteredExtraDb = _calibrateSoundBurstFilteredExtraDb;
@@ -2876,6 +2907,7 @@ class Combination extends AudioCalibrator {
       const timeStampresult = [...this.timeStamp].join('\n');
       total_results['timeStamps'] = timeStampresult;
       total_results['recordingChecks'] = this.recordingChecks;
+      total_results['waveforms'] = this.waveforms;
       total_results['component']['phase'] = this.componentIRPhase;
       total_results['system']['phase'] = this.systemIRPhase;
       total_results['qualityMetrics'] = this.SDofFilteredRange;