speaker-calibration 2.2.227 → 2.2.229

package/package.json

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

package/src/peer-connection/listener.js

@@ -55,7 +55,6 @@ class Listener extends AudioPeer {
   };
 
   sendSamplingRate = sampleRate => {
-    this.displayUpdate('Listener - sendSamplingRate');
     this.connectionManager.send({
       name: 'SoundCalibration',
       payload: {
@@ -66,7 +65,6 @@ class Listener extends AudioPeer {
   };
 
   sendSampleSize = sampleSize => {
-    this.displayUpdate('Listener - sendSampleSize');
     this.connectionManager.send({
       name: 'SoundCalibration',
       payload: {
@@ -77,7 +75,6 @@ class Listener extends AudioPeer {
   };
 
   sendFlags = flags => {
-    this.displayUpdate('Listener - sendFlags');
     this.connectionManager.send({
       name: 'SoundCalibration',
       payload: {
@@ -142,10 +139,6 @@ class Listener extends AudioPeer {
     console.log(track);
     const capabilities = track.getCapabilities();
 
-    this.displayUpdate(
-      `Listener Track Capabilities - ${JSON.stringify(capabilities, undefined, 2)}`
-    );
-
     const constraints = track.getConstraints();
 
     if (capabilities.echoCancellation) {
@@ -164,8 +157,6 @@ class Listener extends AudioPeer {
       constraints.channelCount = 1;
     }
 
-    this.displayUpdate(`Listener Track Constraints - ${JSON.stringify(constraints, undefined, 2)}`);
-
     // await the promise
     try {
       await track.applyConstraints(constraints);
@@ -261,13 +252,6 @@ class Listener extends AudioPeer {
         //audio: {echoCancellation: false, noiseSuppression: false, autoGainControl: false, deviceId: {exact: await this.getDeviceIdByLabel(this.microphoneDeviceId) }},
       })
       .then(stream => {
-        this.displayUpdate(
-          `Listener Track settings before applied constraints - ${JSON.stringify(
-            stream.getAudioTracks()[0].getSettings(),
-            undefined,
-            2
-          )}`
-        );
         this.applyHQTrackConstraints(stream)
           .then(settings => {
             console.log(settings);

package/src/peer-connection/speaker.js

@@ -163,6 +163,7 @@ class Speaker extends AudioPeer {
 
     await speaker.connectionManager.waitForPeerConnection();
     await speaker.connectionManager.resolveWhenHandshakeReceived();
+    speaker.connectionManager.sendPageTitle('EasyEyes Microphone');
 
     // Send connection parameters to the listener
     speaker.connectionManager.send(speaker.prepareConnectionParams());

package/src/tasks/combination/combination.js

@@ -439,14 +439,8 @@ class Combination extends AudioCalibrator {
           })
           .then(result => {
             console.log(result);
-            this.systemConvolution = this.upsampleSignal(
-              result['convolution'],
-              this._calibrateSoundBurstDownsample
-            );
-            this.systemConvolutionNoBandpass = this.upsampleSignal(
-              result['convolution_no_bandpass'],
-              this._calibrateSoundBurstDownsample
-            );
+            this.systemConvolution = result['convolution'];
+            this.systemConvolutionNoBandpass = result['convolution_no_bandpass'];
           });
 
         // attenuate the system convolution if the amplitude is greater than this.calibrateSoundLimit
@@ -679,7 +673,10 @@ class Combination extends AudioCalibrator {
       'Obtaining last all hz unfiltered recording from #allHzUnfilteredRecordings to send to server for processing'
     );
     const numSignals = allSignals.length;
-    const mls = this.#mlsBufferView[this.icapture];
+    const mls = this.downsampleSignal(
+      this.#mlsBufferView[this.icapture],
+      this._calibrateSoundBurstDownsample
+    );
     const payload =
       signalCsv && signalCsv.length > 0 ? csvToArray(signalCsv) : allSignals[numSignals - 1];
     console.log('sending rec');
@@ -691,9 +688,10 @@ class Combination extends AudioCalibrator {
     this.emit('update', {message: this.status});
     if (this.isCalibrating) return null;
     const fMLS = this.sourceSamplingRate / this._calibrateSoundBurstDownsample;
+    const payload_downsampled = this.downsampleSignal(payload, this._calibrateSoundBurstDownsample);
     await this.pyServerAPI
       .allHzPowerCheck({
-        payload,
+        payload: payload_downsampled,
         sampleRate: fMLS,
         binDesiredSec: this._calibrateSoundPowerBinDesiredSec,
         burstSec: this.desired_time_per_mls,
@@ -1103,6 +1101,10 @@ class Combination extends AudioCalibrator {
   bothSoundCheck = async stream => {
     let iir_ir_and_plots;
     this.#currentConvolution = this.componentConvolution;
+    this.#currentConvolution = this.upsampleSignal(
+      this.#currentConvolution,
+      this._calibrateSoundBurstDownsample
+    );
     this.filteredMLSRange.component.Min = findMinValue(this.#currentConvolution);
     this.filteredMLSRange.component.Max = findMaxValue(this.#currentConvolution);
     const pre = this._calibrateSoundBurstPreSec;
@@ -1130,6 +1132,10 @@ class Combination extends AudioCalibrator {
 
     this.numSuccessfulCaptured = 0;
     this.#currentConvolution = this.systemConvolution;
+    this.#currentConvolution = this.upsampleSignal(
+      this.#currentConvolution,
+      this._calibrateSoundBurstDownsample
+    );
     this.filteredMLSRange.system.Min = findMinValue(this.#currentConvolution);
     this.filteredMLSRange.system.Max = findMaxValue(this.#currentConvolution);
     this.soundCheck = 'system';
@@ -1516,6 +1522,10 @@ class Combination extends AudioCalibrator {
     const total_dur = pre + repeats * burst + post;
     if (this._calibrateSoundCheck != 'system') {
       this.#currentConvolution = this.componentConvolution;
+      this.#currentConvolution = this.upsampleSignal(
+        this.#currentConvolution,
+        this._calibrateSoundBurstDownsample
+      );
       this.filteredMLSRange.component.Min = findMinValue(this.#currentConvolution);
       this.filteredMLSRange.component.Max = findMaxValue(this.#currentConvolution);
       this.soundCheck = 'component';
@@ -1526,6 +1536,10 @@ class Combination extends AudioCalibrator {
       this.stopCalibrationAudio();
     } else {
       this.#currentConvolution = this.systemConvolution;
+      this.#currentConvolution = this.upsampleSignal(
+        this.#currentConvolution,
+        this._calibrateSoundBurstDownsample
+      );
       this.filteredMLSRange.system.Min = findMinValue(this.#currentConvolution);
       this.filteredMLSRange.system.Max = findMaxValue(this.#currentConvolution);
       this.soundCheck = 'system';