speaker-calibration 2.2.192 → 2.2.194

package/package.json

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

package/src/server/PythonServerAPI.js

@@ -80,7 +80,7 @@ class PythonServerAPI {
 
     const data = JSON.stringify({
       task,
-      payload,
+      'payload': payload,
       'sample-rate': sampleRate,
       mls,
       numPeriods,

package/src/tasks/audioCalibrator.js

@@ -55,6 +55,7 @@ class AudioCalibrator extends AudioRecorder {
   /** @private */
   startTime;
 
+  numCalibratingRoundsCompleted=0;
   /**
    * Called when a call is received.
    * Creates a local audio DOM element and attaches it to the page.

package/src/tasks/combination/combination.js

@@ -240,6 +240,7 @@ class Combination extends AudioCalibrator {
     unfiltered: [],
     system: [],
     component: [],
+    warnings:[]
   };
 
   inDB;
@@ -604,6 +605,10 @@ class Combination extends AudioCalibrator {
               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);
+              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();
             }
             if (this.numSuccessfulCaptured == 1) {
               console.log('pop last unfiltered mls volume check');
@@ -624,15 +629,12 @@ class Combination extends AudioCalibrator {
             // let end = new Date().getTime() / 1000;
             // console.log("Time taken:", end - start, "seconds");
             const usedPeriodStart = this.num_mls_to_skip  * this.sourceSamplingRate;
-            const usedPeriodEnd = this.numMLSPerCapture * this.sourceSamplingRate;
-            const payload_skipped_warmUp = payload.slice(usedPeriodStart, usedPeriodEnd);
-            console.log(payload.length);
-            console.log(payload_skipped_warmUp.length);
+            const payload_skipped_warmUp = payload.slice(usedPeriodStart);
             await this.pyServerAPI
               .getAutocorrelation({
+                mls:mls,
+                payload: payload_skipped_warmUp,
                 sampleRate: this.sourceSamplingRate || 96000,
-                payload,
-                mls,
                 numPeriods: this.numMLSPerCapture - this.num_mls_to_skip,
               })
               .then(async res => {
@@ -2249,6 +2251,12 @@ class Combination extends AudioCalibrator {
   };
 
   #playCalibrationAudioVolume = async () => {
+    if (this.numCalibratingRoundsCompleted==1) {
+      this.recordingChecks['warnings'].push(`Redo 1000 Hz, ${this.inDB} dB, recording because SD ${this.recordingChecks['volume'][this.inDB]['sd']} dB> ${this.calibrateSound1000HzMaxSD_dB} dB`);
+      this.status =
+      `Redoing 1000 Hz recording because SD ${this.recordingChecks['volume'][this.inDB]} dB> ${this.calibrateSound1000HzMaxSD_dB} dB`.toString() +
+      this.generateTemplate().toString();
+    }
     const totalDuration = this.CALIBRATION_TONE_DURATION * 1.2;
 
     this.calibrationNodes[0].start(0);
@@ -2344,6 +2352,7 @@ class Combination extends AudioCalibrator {
     //reset the values
     //this.incrementStatusBar();
 
+    console.log(this.recordingChecks['warnings']);
     this.outDBSPL = null;
     this.outDBSPL = null;
     this.outDBSPL1000 = null;
@@ -2650,6 +2659,10 @@ class Combination extends AudioCalibrator {
         if (result) {
           if (result['sd'] > this._calibrateSoundBurstMaxSD_dB & this.numSuccessfulCaptured) {
             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();
             // 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