speaker-calibration 2.2.195 → 2.2.197

package/package.json

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

package/src/tasks/audioCalibrator.js

@@ -128,7 +128,10 @@ class AudioCalibrator extends AudioRecorder {
     mode,
     checkRec
   ) => {
-    this.numSuccessfulCaptured = 0;
+    // if it finished 2 attempts, it move to next iteration so reset numSuccessfulCaptured
+    if (this.numSuccessfulCaptured >=2) {
+      this.numSuccessfulCaptured = 0;
+    }
 
     // do something before playing such as using the MLS to fill the buffers
     console.warn('beforePlay');

package/src/tasks/combination/combination.js

@@ -594,14 +594,14 @@ class Combination extends AudioCalibrator {
       })
       .then(async result => {
         if (result) {
-          if (result['sd'] > this._calibrateSoundBurstMaxSD_dB & 
+          if (result['sd'] > this._calibrateSoundBurstMaxSD_dB && 
             this.numSuccessfulCaptured == 0) {
               console.log('SD: ' + result['sd'] + ', greater than _calibrateSoundBurstMaxSD_dB: ' + this._calibrateSoundBurstMaxSD_dB);
             this.recordingChecks['unfiltered'].push(result);
             this.clearLastUnfilteredRecordedSignals();
             this.numSuccessfulCaptured +=1;
           } else {
-            if (result['sd'] < this._calibrateSoundBurstMaxSD_dB) {
+            if (result['sd'] <= this._calibrateSoundBurstMaxSD_dB) {
               console.log('SD: ' + result['sd'] + ', less than _calibrateSoundBurstMaxSD_dB: ' + this._calibrateSoundBurstMaxSD_dB);
             } else {
               console.log('SD: ' + result['sd'] + ', greater than _calibrateSoundBurstMaxSD_dB: ' + this._calibrateSoundBurstMaxSD_dB);
@@ -609,13 +609,15 @@ class Combination extends AudioCalibrator {
               this.status =
               `Redoing all Hz recording because SD ${result['sd']} dB> ${this._calibrateSoundBurstMaxSD_dB} dB`.toString() +
               this.generateTemplate().toString();
+              this.emit('update', {
+                message: this.status,
+              });
             }
             if (this.numSuccessfulCaptured == 1) {
               console.log('pop last unfiltered mls volume check');
               this.recordingChecks['unfiltered'].pop();
             }
             this.recordingChecks['unfiltered'].push(result);
-            await this.pyServerAPI.checkMemory();
             // let start = new Date().getTime() / 1000;
             //   const payloadT = tf.tensor1d(payload);
             //   payloadT.print();
@@ -628,6 +630,7 @@ class Combination extends AudioCalibrator {
             // console.log("dimention:", xfft.shape);
             // let end = new Date().getTime() / 1000;
             // console.log("Time taken:", end - start, "seconds");
+            console.log('start calculate impulse response');
             const usedPeriodStart = this.num_mls_to_skip  * this.sourceSamplingRate;
             const payload_skipped_warmUp = payload.slice(usedPeriodStart);
             await this.pyServerAPI
@@ -642,7 +645,6 @@ class Combination extends AudioCalibrator {
                 this.fs2 = res['fs2'];
                 this.L_new_n = res['L_new_n'];
                 this.dL_n = res['dL_n'];
-                await this.pyServerAPI.checkMemory();
                 this.impulseResponses.push(
                   await this.pyServerAPI
                     .getImpulseResponse({
@@ -655,7 +657,6 @@ class Combination extends AudioCalibrator {
                       dL_n: this.dL_n,
                     })
                     .then(res => {
-                      if (this.numSuccessfulCaptured < this.numCaptures) {
                         this.numSuccessfulCaptured += 2;
                         this.stepNum += 1;
                         console.log('got impulse response ' + this.stepNum);
@@ -667,7 +668,6 @@ class Combination extends AudioCalibrator {
                           message: this.status,
                         });
                         return res['ir'];
-                      }
                     })
                     .catch(err => {
                       console.error(err);
@@ -2256,6 +2256,9 @@ class Combination extends AudioCalibrator {
       this.status =
       `Redoing 1000 Hz recording because SD ${this.recordingChecks['volume'][this.inDB]} dB> ${this.calibrateSound1000HzMaxSD_dB} dB`.toString() +
       this.generateTemplate().toString();
+      this.emit('update', {
+        message: this.status,
+      });
     }
     const totalDuration = this.CALIBRATION_TONE_DURATION * 1.2;
 
@@ -2657,12 +2660,15 @@ class Combination extends AudioCalibrator {
       })
       .then(result => {
         if (result) {
-          if (result['sd'] > this._calibrateSoundBurstMaxSD_dB & this.numSuccessfulCaptured == 0) {
+          if (result['sd'] > this._calibrateSoundBurstMaxSD_dB && this.numSuccessfulCaptured == 0) {
             console.log('filtered recording sd too high');
             this.recordingChecks['warnings'].push(`Redo all Hz recording because SD ${result['sd']} dB> ${this._calibrateSoundBurstMaxSD_dB} dB`);
             this.status =
             `Redoing all Hz recording because SD ${result['sd']} dB> ${this._calibrateSoundBurstMaxSD_dB} dB`.toString() +
             this.generateTemplate().toString();
+            this.emit('update', {
+              message: this.status,
+            });
             // numSuccessfulCaptured no longer to count number of successful capture but count attemps
             // is sd below _calibrateSoundBurstMaxSD_dB then count two attemps
             // else count one attemp
@@ -2755,8 +2761,8 @@ class Combination extends AudioCalibrator {
     calibrateSoundLimit,
     _calibrateSoundBurstNormalizeBy1000HzGainBool = false,
     _calibrateSoundBurstScalarDB = 71,
-    calibrateSound1000HzMaxSD_dB = 4,
-    _calibrateSoundBurstMaxSD_dB = 4
+    calibrateSound1000HzMaxSD_dB = 0.1,
+    _calibrateSoundBurstMaxSD_dB = 0.1
   ) => {
     this.TAPER_SECS = _calibrateSoundTaperSec;
     this.calibrateSoundLimit = calibrateSoundLimit;