speaker-calibration 2.2.240 → 2.2.242

package/package.json

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

package/src/tasks/combination/combination.js

@@ -320,7 +320,7 @@ class Combination extends AudioCalibrator {
       .replace('111', this.sourceSamplingRate)
       .replace('222', this.sinkSamplingRate)
       .replace('333', this.calibrateSoundSamplingDesiredBits);
-    const reportParameters = `${samplingParamText}`;
+    const reportParameters = `${samplingParamText} ↓${this._calibrateSoundBurstDownsample}:1`;
     if (this.flags) {
       flags = `<br> autoGainControl: ${this.flags.autoGainControl}, echoCancellation: ${this.flags.echoCancellation}, noiseSuppression: ${this.flags.noiseSuppression}`;
     }
@@ -397,12 +397,12 @@ class Combination extends AudioCalibrator {
     this.emit('update', {message: this.status});
     const filteredComputedIRs_slice = filteredComputedIRs.slice(0, this.numCaptures);
     // for each element in filteredComputedIRs_slice, downsample it
-    const payload_downsampled = filteredComputedIRs_slice.map(ir =>
-      this.downsampleSignal(ir, this._calibrateSoundBurstDownsample)
-    );
+    // const payload_downsampled = filteredComputedIRs_slice.map(ir =>
+    //   this.downsampleSignal(ir, this._calibrateSoundBurstDownsample)
+    // );
     return await this.pyServerAPI
       .getSystemInverseImpulseResponseWithRetry({
-        payload: payload_downsampled,
+        payload: filteredComputedIRs_slice,
         mls,
         lowHz,
         highHz,
@@ -471,9 +471,9 @@ class Combination extends AudioCalibrator {
     const fMLS = this.sourceSamplingRate / this._calibrateSoundBurstDownsample;
     const filteredComputedIRs_slice = filteredComputedIRs.slice(0, this.numCaptures);
     // for each element in filteredComputedIRs_slice, downsample it
-    const payload_downsampled = filteredComputedIRs_slice.map(ir =>
-      this.downsampleSignal(ir, this._calibrateSoundBurstDownsample)
-    );
+    // const payload_downsampled = filteredComputedIRs_slice.map(ir =>
+    //   this.downsampleSignal(ir, this._calibrateSoundBurstDownsample)
+    // );
     let componentIRGains = this.componentIR['Gain'];
     const componentIRFreqs = this.componentIR['Freq'];
     //normalize the component IR gains
@@ -503,7 +503,7 @@ class Combination extends AudioCalibrator {
 
     return this.pyServerAPI
       .getComponentInverseImpulseResponseWithRetry({
-        payload: payload_downsampled,
+        payload: filteredComputedIRs_slice,
         mls,
         lowHz,
         highHz,
@@ -710,7 +710,7 @@ class Combination extends AudioCalibrator {
         binDesiredSec: this._calibrateSoundPowerBinDesiredSec,
         burstSec: this.desired_time_per_mls,
         repeats: this.numMLSPerCapture - this.num_mls_to_skip,
-        warmUp: this.num_mls_to_skip,
+        warmUp: this._calibrateSoundBurstPreSec,
         downsample: this._calibrateSoundBurstDownsample,
       })
       .then(async result => {
@@ -757,7 +757,7 @@ class Combination extends AudioCalibrator {
                   `(${pre.toFixed(1)} + ${repeats}×${burst.toFixed(1)} + ${post.toFixed(
                     1
                   )} s) of MLS ver.` +
-                  ` ${this.icapture}. SD = ${result['sd']} > ${this._calibrateSoundBurstMaxSD_dB}`
+                  ` ${this.icapture}. SD = ${result['sd']} <= ${this._calibrateSoundBurstMaxSD_dB}`
               );
             } else {
               console.log(
@@ -857,22 +857,30 @@ class Combination extends AudioCalibrator {
       message: this.status,
     });
     let time_to_wait = 0;
-    const fMLS = this.sourceSamplingRate / this._calibrateSoundBurstDownsample;
     if (this.mode === 'unfiltered') {
       //unfiltered
-      time_to_wait = (this.#mls[0].length / fMLS) * this.numMLSPerCapture;
-      time_to_wait = time_to_wait + this._calibrateSoundBurstPostSec;
+      //should be: pre + (burst * repeats) + post
+      // time_to_wait = (this.#mls[0].length / this.sourceSamplingRate) * this.numMLSPerCapture;
+      // time_to_wait = time_to_wait + this._calibrateSoundBurstPostSec;
+      time_to_wait =
+        this._calibrateSoundBurstPreSec +
+        this._calibrateSoundBurstSec * this._calibrateSoundBurstRepeats +
+        this._calibrateSoundBurstPostSec;
     } else if (this.mode === 'filtered') {
       //filtered
       // time_to_wait =
       //   (this.#currentConvolution.length / this.sourceSamplingRate) *
       //   (this.numMLSPerCapture / (this.num_mls_to_skip + this.numMLSPerCapture));
-      time_to_wait = (this.#currentConvolution.length / fMLS) * this.numMLSPerCapture;
-      time_to_wait = time_to_wait + this._calibrateSoundBurstPostSec;
+      // time_to_wait =
+      //   (this.#currentConvolution.length / this.sourceSamplingRate) * this.numMLSPerCapture;
+      // time_to_wait = time_to_wait + this._calibrateSoundBurstPostSec;
+      time_to_wait =
+        this._calibrateSoundBurstPreSec +
+        this._calibrateSoundBurstSec * this._calibrateSoundBurstRepeats +
+        this._calibrateSoundBurstPostSec;
     } else {
       throw new Error('Mode broke in awaitDesiredMLSLength');
     }
-
     await sleep(time_to_wait);
   };
 
@@ -908,15 +916,15 @@ class Combination extends AudioCalibrator {
     });
     let number_of_bursts_to_skip = 0;
     let time_to_sleep = 0;
-    const fMLS = this.sourceSamplingRate / this._calibrateSoundBurstDownsample;
     if (this.mode === 'unfiltered') {
-      time_to_sleep = (this.#mls[0].length / fMLS) * number_of_bursts_to_skip;
+      time_to_sleep = (this.#mls[0].length / this.sourceSamplingRate) * number_of_bursts_to_skip;
     } else if (this.mode === 'filtered') {
       console.log(this.#currentConvolution.length);
       // time_to_sleep =
       //   (this.#currentConvolution.length / this.sourceSamplingRate) *
       //   (number_of_bursts_to_skip / (number_of_bursts_to_skip + this.numMLSPerCapture));
-      time_to_sleep = (this.#currentConvolution.length / fMLS) * number_of_bursts_to_skip;
+      time_to_sleep =
+        (this.#currentConvolution.length / this.sourceSamplingRate) * number_of_bursts_to_skip;
     } else {
       throw new Error('Mode broke in awaitSignalOnset');
     }
@@ -1289,8 +1297,8 @@ class Combination extends AudioCalibrator {
     if (this.isCalibrating) return null;
     let component_iir_psd = await this.pyServerAPI
       .getPSDWithRetry({
-        unconv_rec: this.downsampleSignal(unconv_rec, this._calibrateSoundBurstDownsample),
-        conv_rec: this.downsampleSignal(conv_rec, this._calibrateSoundBurstDownsample),
+        unconv_rec,
+        conv_rec,
         sampleRate: fMLS,
         downsample: this._calibrateSoundBurstDownsample,
       })
@@ -1311,8 +1319,8 @@ class Combination extends AudioCalibrator {
     if (this.isCalibrating) return null;
     let system_iir_psd = await this.pyServerAPI
       .getPSDWithRetry({
-        unconv_rec: this.downsampleSignal(unconv_rec, this._calibrateSoundBurstDownsample),
-        conv_rec: this.downsampleSignal(conv_rec, this._calibrateSoundBurstDownsample),
+        unconv_rec,
+        conv_rec,
         sampleRate: fMLS,
         downsample: this._calibrateSoundBurstDownsample,
       })
@@ -1352,7 +1360,7 @@ class Combination extends AudioCalibrator {
     if (this.isCalibrating) return null;
     let system_filtered_mls_psd = await this.pyServerAPI
       .getMLSPSDWithRetry({
-        mls: this.downsampleSignal(this.systemConvolution, this._calibrateSoundBurstDownsample),
+        mls: this.systemConvolution,
         sampleRate: fMLS,
         downsample: this._calibrateSoundBurstDownsample,
       })
@@ -1370,10 +1378,7 @@ class Combination extends AudioCalibrator {
 
     let system_no_bandpass_filtered_mls_psd = await this.pyServerAPI
       .getMLSPSDWithRetry({
-        mls: this.downsampleSignal(
-          this.systemConvolutionNoBandpass,
-          this._calibrateSoundBurstDownsample
-        ),
+        mls: this.systemConvolutionNoBandpass,
         sampleRate: fMLS,
         downsample: this._calibrateSoundBurstDownsample,
       })
@@ -1393,7 +1398,7 @@ class Combination extends AudioCalibrator {
     if (this.isCalibrating) return null;
     let component_filtered_mls_psd = await this.pyServerAPI
       .getMLSPSDWithRetry({
-        mls: this.downsampleSignal(this.componentConvolution, this._calibrateSoundBurstDownsample),
+        mls: this.componentConvolution,
         sampleRate: fMLS,
         downsample: this._calibrateSoundBurstDownsample,
       })
@@ -1411,10 +1416,7 @@ class Combination extends AudioCalibrator {
 
     let component_no_bandpass_filtered_mls_psd = await this.pyServerAPI
       .getMLSPSDWithRetry({
-        mls: this.downsampleSignal(
-          this.componentConvolutionNoBandpass,
-          this._calibrateSoundBurstDownsample
-        ),
+        mls: this.componentConvolutionNoBandpass,
         sampleRate: fMLS,
         downsample: this._calibrateSoundBurstDownsample,
       })
@@ -1684,8 +1686,8 @@ class Combination extends AudioCalibrator {
 
       let component_iir_psd = await this.pyServerAPI
         .getPSDWithRetry({
-          unconv_rec: this.downsampleSignal(unconv_rec, this._calibrateSoundBurstDownsample),
-          conv_rec: this.downsampleSignal(conv_rec, this._calibrateSoundBurstDownsample),
+          unconv_rec: this.componentInvertedImpulseResponseNoBandpass,
+          conv_rec: this.componentInvertedImpulseResponse,
           sampleRate: fMLS,
           downsample: this._calibrateSoundBurstDownsample,
         })
@@ -1706,8 +1708,8 @@ class Combination extends AudioCalibrator {
       if (this.isCalibrating) return null;
       let system_iir_psd = await this.pyServerAPI
         .getPSDWithRetry({
-          unconv_rec: this.downsampleSignal(unconv_rec, this._calibrateSoundBurstDownsample),
-          conv_rec: this.downsampleSignal(conv_rec, this._calibrateSoundBurstDownsample),
+          unconv_rec: this.systemInvertedImpulseResponseNoBandpass,
+          conv_rec: this.systemInvertedImpulseResponse,
           sampleRate: fMLS,
           downsample: this._calibrateSoundBurstDownsample,
         })
@@ -1750,10 +1752,7 @@ class Combination extends AudioCalibrator {
       if (this.isCalibrating) return null;
       let filtered_mls_psd = await this.pyServerAPI
         .getMLSPSDWithRetry({
-          mls: this.downsampleSignal(
-            this.componentConvolution,
-            this._calibrateSoundBurstDownsample
-          ),
+          mls: this.componentConvolution,
           sampleRate: fMLS,
           downsample: this._calibrateSoundBurstDownsample,
         })
@@ -1771,10 +1770,7 @@ class Combination extends AudioCalibrator {
 
       let filtered_no_bandpass_mls_psd = await this.pyServerAPI
         .getMLSPSDWithRetry({
-          mls: this.downsampleSignal(
-            this.componentConvolutionNoBandpass,
-            this._calibrateSoundBurstDownsample
-          ),
+          mls: this.componentConvolutionNoBandpass,
           sampleRate: fMLS,
           downsample: this._calibrateSoundBurstDownsample,
         })
@@ -1907,8 +1903,8 @@ class Combination extends AudioCalibrator {
       if (this.isCalibrating) return null;
       let component_iir_psd = await this.pyServerAPI
         .getPSDWithRetry({
-          unconv_rec: this.downsampleSignal(unconv_rec, this._calibrateSoundBurstDownsample),
-          conv_rec: this.downsampleSignal(conv_rec, this._calibrateSoundBurstDownsample),
+          unconv_rec: this.componentInvertedImpulseResponseNoBandpass,
+          conv_rec: this.componentInvertedImpulseResponse,
           sampleRate: fMLS,
           downsample: this._calibrateSoundBurstDownsample,
         })
@@ -1929,8 +1925,8 @@ class Combination extends AudioCalibrator {
       if (this.isCalibrating) return null;
       let system_iir_psd = await this.pyServerAPI
         .getPSDWithRetry({
-          unconv_rec: this.downsampleSignal(unconv_rec, this._calibrateSoundBurstDownsample),
-          conv_rec: this.downsampleSignal(conv_rec, this._calibrateSoundBurstDownsample),
+          unconv_rec: this.systemInvertedImpulseResponseNoBandpass,
+          conv_rec: this.systemInvertedImpulseResponse,
           sampleRate: fMLS,
           downsample: this._calibrateSoundBurstDownsample,
         })
@@ -1973,7 +1969,7 @@ class Combination extends AudioCalibrator {
       if (this.isCalibrating) return null;
       let filtered_mls_psd = await this.pyServerAPI
         .getMLSPSDWithRetry({
-          mls: this.downsampleSignal(this.systemConvolution, this._calibrateSoundBurstDownsample),
+          mls: this.systemConvolution,
           sampleRate: fMLS,
           downsample: this._calibrateSoundBurstDownsample,
         })
@@ -1991,10 +1987,7 @@ class Combination extends AudioCalibrator {
 
       let filtered_no_bandpass_mls_psd = await this.pyServerAPI
         .getMLSPSDWithRetry({
-          mls: this.downsampleSignal(
-            this.systemConvolutionNoBandpass,
-            this._calibrateSoundBurstDownsample
-          ),
+          mls: this.systemConvolutionNoBandpass,
           sampleRate: fMLS,
           downsample: this._calibrateSoundBurstDownsample,
         })
@@ -2233,8 +2226,8 @@ class Combination extends AudioCalibrator {
       if (this.isCalibrating) return null;
       let component_iir_psd = await this.pyServerAPI
         .getPSDWithRetry({
-          unconv_rec: this.downsampleSignal(unconv_rec, this._calibrateSoundBurstDownsample),
-          conv_rec: this.downsampleSignal(conv_rec, this._calibrateSoundBurstDownsample),
+          unconv_rec: this.componentInvertedImpulseResponseNoBandpass,
+          conv_rec: this.componentInvertedImpulseResponse,
           sampleRate: fMLS,
           downsample: this._calibrateSoundBurstDownsample,
         })
@@ -2254,8 +2247,8 @@ class Combination extends AudioCalibrator {
       if (this.isCalibrating) return null;
       let system_iir_psd = await this.pyServerAPI
         .getPSDWithRetry({
-          unconv_rec: this.downsampleSignal(unconv_rec, this._calibrateSoundBurstDownsample),
-          conv_rec: this.downsampleSignal(conv_rec, this._calibrateSoundBurstDownsample),
+          unconv_rec: this.systemInvertedImpulseResponseNoBandpass,
+          conv_rec: this.systemInvertedImpulseResponse,
           sampleRate: fMLS,
           downsample: this._calibrateSoundBurstDownsample,
         })
@@ -2425,7 +2418,7 @@ class Combination extends AudioCalibrator {
     const gainNode = audioContext.createGain();
     const taperGainNode = audioContext.createGain();
     const offsetGainNode = audioContext.createGain();
-    const totalDuration = this.CALIBRATION_TONE_DURATION * 1.2;
+    const totalDuration = this.CALIBRATION_TONE_DURATION;
 
     oscilator.frequency.value = this.#CALIBRATION_TONE_FREQUENCY;
     oscilator.type = this.#CALIBRATION_TONE_TYPE;
@@ -2508,7 +2501,7 @@ class Combination extends AudioCalibrator {
         message: this.status,
       });
     }
-    const totalDuration = this.CALIBRATION_TONE_DURATION * 1.2;
+    const totalDuration = this.CALIBRATION_TONE_DURATION;
     console.log('this.calibrationNodes', this.calibrationNodes);
     this.calibrationNodes[0].start(0);
     this.calibrationNodes[0].stop(totalDuration);
@@ -2559,7 +2552,7 @@ class Combination extends AudioCalibrator {
       getPower(rec.slice(0, this.calibrateSound1000HzPreSec * this.sourceSamplingRate)).toFixed(1)
     );
     console.log(
-      'pre period power: ',
+      'sec period power: ',
       getPower(
         rec.slice(
           this.calibrateSound1000HzPreSec * this.sourceSamplingRate,
@@ -2568,7 +2561,7 @@ class Combination extends AudioCalibrator {
       ).toFixed(1)
     );
     console.log(
-      'pre period power: ',
+      'post period power: ',
       getPower(
         rec.slice(
           (this.calibrateSound1000HzPreSec + this.calibrateSound1000HzSec) * this.sourceSamplingRate
@@ -2963,7 +2956,7 @@ class Combination extends AudioCalibrator {
         binDesiredSec: this._calibrateSoundPowerBinDesiredSec,
         burstSec: this.desired_time_per_mls,
         repeats: this.numMLSPerCapture - this.num_mls_to_skip,
-        warmUp: this.num_mls_to_skip,
+        warmUp: this._calibrateSoundBurstPreSec,
         downsample: this._calibrateSoundBurstDownsample,
       })
       .then(result => {