speaker-calibration 2.2.264 → 2.2.265

package/package.json

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

package/src/peer-connection/speaker.js

@@ -622,7 +622,7 @@ class Speaker extends AudioPeer {
       // p.style.fontWeight = 'normal';
       // p.style.paddingTop = '20px';
       // const timeToCalibrateText = phrases.RC_howLongToCalibrate['en-US'];
-      // p.innerHTML = timeToCalibrateText.replace('111', this.timeToCalibrate);
+      // p.innerHTML = timeToCalibrateText.replace('[[N11]]', this.timeToCalibrate);
       // instructionDisplay.appendChild(p);
     }
 
@@ -630,7 +630,7 @@ class Speaker extends AudioPeer {
     if (timeToCalibrateDisplay) {
       const timeToCalibrateText = this.phrases.RC_howLongToCalibrate[this.language];
       timeToCalibrateDisplay.innerHTML = timeToCalibrateText.replace(
-        '[[111]]',
+        '[[N11]]',
         this.timeToCalibrate
       );
       timeToCalibrateDisplay.style.fontWeight = 'normal';

package/src/tasks/combination/combination.js

@@ -375,9 +375,9 @@ class Combination extends AudioCalibrator {
       : '';
 
     const samplingParamText = this.phrases.RC_SamplingHzBits[this.language]
-      .replace('[[111]]', this.sourceSamplingRate)
-      .replace('[[222]]', this.sinkSamplingRate)
-      .replace('[[333]]', this.calibrateSoundSamplingDesiredBits);
+      .replace('[[N11]]', this.sourceSamplingRate)
+      .replace('[[N22]]', this.sinkSamplingRate)
+      .replace('[[N33]]', this.calibrateSoundSamplingDesiredBits);
     const reportParameters = `${simulateText}${samplingParamText} ↓${this._calibrateSoundBurstDownsample}:1`;
     if (this.flags) {
       flags = `<br> autoGainControl: ${this.flags.autoGainControl}, echoCancellation: ${this.flags.echoCancellation}, noiseSuppression: ${this.flags.noiseSuppression}`;
@@ -843,12 +843,14 @@ class Combination extends AudioCalibrator {
             }
             this.recordingChecks['unfiltered'].push(result);
             console.log('start calculate impulse response');
-            const usedPeriodStart = this._calibrateSoundBurstPreSec * this.sourceSamplingRate;
+            // const usedPeriodStart = this._calibrateSoundBurstPreSec * this.sourceSamplingRate;
+            const usedPeriodStart = this.num_mls_to_skip * this.sourceSamplingRate;
             const usedPeriodEnd =
               (this._calibrateSoundBurstPreSec +
                 this._calibrateSoundBurstRepeats * this._calibrateSoundBurstSec) *
               this.sourceSamplingRate;
-            const payload_skipped_warmUp = payload.slice(usedPeriodStart, usedPeriodEnd);
+            // const payload_skipped_warmUp = payload.slice(usedPeriodStart, usedPeriodEnd);
+            const payload_skipped_warmUp = payload.slice(usedPeriodStart);
 
             console.log('payload.length', payload.length);
             console.log('usedPeriodStart', usedPeriodStart);
@@ -1075,11 +1077,12 @@ class Combination extends AudioCalibrator {
    * @example
    */
   #createCalibrationNodeFromBuffer = dataBuffer => {
-    const mlsSignal = reorderMLS(
-      dataBuffer,
-      this.calibrateSound1000HzPreSec,
-      this.sourceSamplingRate
-    );
+    const mlsSignal = dataBuffer;
+    // reorderMLS(
+    //   dataBuffer,
+    //   this.calibrateSound1000HzPreSec,
+    //   this.sourceSamplingRate
+    // );
     console.log('length databuffer');
     console.log(mlsSignal.length);
     if (!this.sourceAudioContext) {
@@ -2396,11 +2399,12 @@ class Combination extends AudioCalibrator {
         //  Followed by two whole MLS. Followed by the initial 1 sec of MLS. Again, all the pieces together
         // should be one contiguous piece cut out from an infinitely repeating MLS.
         // Get the MLS signal for this capture
-        const mlsSignal = reorderMLS(
-          this.#mlsBufferView[this.icapture],
-          this.calibrateSound1000HzPreSec,
-          this.sourceSamplingRate
-        );
+        const mlsSignal = this.#mlsBufferView[this.icapture];
+        // reorderMLS(
+        //   this.#mlsBufferView[this.icapture],
+        //   this.calibrateSound1000HzPreSec,
+        //   this.sourceSamplingRate
+        // );
 
         // Run the simulation
         await this.simulatedMLSCalibration(
@@ -3438,7 +3442,11 @@ class Combination extends AudioCalibrator {
             );
             console.log('this.recordingChecks: ', this.recordingChecks);
             console.log('this.soundCheck: ', this.soundCheck);
-            this.recordingChecks[this.soundCheck].push(result);
+            if (this.recordingChecks[this.soundCheck]) {
+              this.recordingChecks[this.soundCheck].push(result);
+            } else {
+              this.recordingChecks[this.soundCheck] = [result];
+            }
             // Now we do at most 2 attempts if sd > _calibrateSoundBurstMaxSD_dB
             // Second attempt is the final
             if (this.numSuccessfulCaptured < 2) {