speaker-calibration 2.2.251 → 2.2.253

package/package.json

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

package/src/peer-connection/speaker.js

@@ -209,6 +209,10 @@ class Speaker extends AudioPeer {
       params.calibrateSoundSimulateMicrophoneTime,
       params.calibrateSoundSimulateLoudspeaker,
       params.calibrateSoundSimulateLoudspeakerTime,
+      params.calibrateSoundSimulateMicrophoneFrequencies,
+      params.calibrateSoundSimulateLoudspeakerFrequencies,
+      params.calibrateSoundSimulateMicrophoneType,
+      params.calibrateSoundSimulateLoudspeakerType,
       params.isLoudspeakerCalibration
     );
     speaker.#removeUIElems();
@@ -347,6 +351,10 @@ class Speaker extends AudioPeer {
             params.calibrateSoundSimulateMicrophoneTime,
             params.calibrateSoundSimulateLoudspeaker,
             params.calibrateSoundSimulateLoudspeakerTime,
+            params.calibrateSoundSimulateMicrophoneFrequencies,
+            params.calibrateSoundSimulateLoudspeakerFrequencies,
+            params.calibrateSoundSimulateMicrophoneType,
+            params.calibrateSoundSimulateLoudspeakerType,
             params.isLoudspeakerCalibration
           );
           speaker.#removeUIElems();
@@ -939,6 +947,10 @@ class Speaker extends AudioPeer {
             params.calibrateSoundSimulateMicrophoneTime,
             params.calibrateSoundSimulateLoudspeaker,
             params.calibrateSoundSimulateLoudspeakerTime,
+            params.calibrateSoundSimulateMicrophoneFrequencies,
+            params.calibrateSoundSimulateLoudspeakerFrequencies,
+            params.calibrateSoundSimulateMicrophoneType,
+            params.calibrateSoundSimulateLoudspeakerType,
             params.isLoudspeakerCalibration
           );
           clearInterval(permissionCheckInterval);

package/src/server/PythonServerAPI.js

@@ -126,9 +126,50 @@ class PythonServerAPI {
     return res.data[task];
   };
 
+  getImpulseResponseFromFrequencyResponse = async ({
+    frequencies,
+    gains,
+    sample_rate,
+    iir_length,
+    calibrateSoundIIRPhase,
+    totalDuration,
+    totalDuration1000Hz,
+  }) => {
+    const task = 'frequency-response-to-impulse-response';
+    let res = null;
+
+    const data = JSON.stringify({
+      task,
+      frequencies,
+      gains,
+      sample_rate,
+      iir_length,
+      calibrateSoundIIRPhase,
+      total_duration: totalDuration,
+      total_duration_1000hz: totalDuration1000Hz,
+    });
+
+    await axios({
+      method: 'post',
+      baseURL: PythonServerAPI.PYTHON_SERVER_URL,
+      url: `/task/${task}`,
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      data,
+    })
+      .then(response => {
+        res = response;
+      })
+      .catch(error => {
+        throw error;
+      });
+
+    return res.data[task];
+  };
+
   getFrequencyResponseFromImpulseResponse = async ({
-    impulseResponseMicrophone,
-    impulseResponseLoudspeaker,
+    impulseResponse,
     sampleRate,
     timeArray,
     totalDuration,
@@ -139,8 +180,7 @@ class PythonServerAPI {
 
     const data = JSON.stringify({
       task,
-      impulse_response_microphone: impulseResponseMicrophone,
-      impulse_response_loudspeaker: impulseResponseLoudspeaker,
+      impulse_response: impulseResponse,
       sample_rate: sampleRate,
       time_array: timeArray,
       total_duration: totalDuration,

package/src/tasks/combination/combination.js

@@ -3323,6 +3323,10 @@ class Combination extends AudioCalibrator {
     calibrateSoundSimulateMicrophoneTime = null,
     calibrateSoundSimulateLoudspeaker = null,
     calibrateSoundSimulateLoudspeakerTime = null,
+    calibrateSoundSimulateMicrophoneFrequencies = null,
+    calibrateSoundSimulateLoudspeakerFrequencies = null,
+    calibrateSoundSimulateMicrophoneType = 'impulseResponse',
+    calibrateSoundSimulateLoudspeakerType = 'impulseResponse',
     isLoudspeakerCalibration = true
   ) => {
     this._calibrateSoundBurstDownsample = calibrateSoundBurstDownsample;
@@ -3477,48 +3481,103 @@ class Combination extends AudioCalibrator {
       }
     } else {
       //simulation.
-      const frequencyResponse = await this.pyServerAPI.getFrequencyResponseFromImpulseResponse({
-        impulseResponseMicrophone: this.calibrateSoundSimulateMicrophone,
-        impulseResponseLoudspeaker: this.calibrateSoundSimulateLoudspeaker,
-        sampleRate: this.sourceSamplingRate,
-        timeArray: calibrateSoundSimulateMicrophoneTime,
-        totalDuration: allHzDuation,
-        totalDuration1000Hz: this.CALIBRATION_TONE_DURATION,
-      });
-      this.calibrateSoundSimulateMicrophone = frequencyResponse.impulse_response_microphone;
-      this.calibrateSoundSimulateLoudspeaker = frequencyResponse.impulse_response_loudspeaker;
-      this.calibrateSoundSimulateMicrophone1000Hz =
-        frequencyResponse.impulse_response_1000hz_microphone;
-      this.calibrateSoundSimulateLoudspeaker1000Hz =
-        frequencyResponse.impulse_response_1000hz_loudspeaker;
-      this.simulatedLoudspeakerIR = {
-        Freq: frequencyResponse.frequencies_loudspeaker,
-        Gain: frequencyResponse.gains_loudspeaker,
-      };
-      this.simulatedMicrophoneIR = {
-        Freq: frequencyResponse.frequencies_microphone,
-        Gain: frequencyResponse.gains_microphone,
-      };
-      console.log('simulatedMicrophoneIR', this.simulatedMicrophoneIR);
-      console.log('simulatedLoudspeakerIR', this.simulatedLoudspeakerIR);
-
-      if (isLoudspeakerCalibration) {
-        //define this.componentIR, this.componentGainDBSPL
-        this.componentIR = {
-          Freq: frequencyResponse.frequencies_microphone,
-          Gain: frequencyResponse.gains_microphone,
+      if (calibrateSoundSimulateMicrophoneType === 'impulseResponse') {
+        const frequencyResponse = await this.pyServerAPI.getFrequencyResponseFromImpulseResponse({
+          impulseResponse: this.calibrateSoundSimulateMicrophone,
+          sampleRate: this.sourceSamplingRate,
+          timeArray: calibrateSoundSimulateMicrophoneTime,
+          totalDuration: allHzDuation,
+          totalDuration1000Hz: this.CALIBRATION_TONE_DURATION,
+        });
+        this.calibrateSoundSimulateMicrophone = frequencyResponse.impulse_response;
+        this.calibrateSoundSimulateMicrophone1000Hz = frequencyResponse.impulse_response_1000hz;
+        this.simulatedMicrophoneIR = {
+          Freq: frequencyResponse.frequencies,
+          Gain: frequencyResponse.gains,
+        };
+        if (isLoudspeakerCalibration) {
+          this.componentIR = {
+            Freq: frequencyResponse.frequencies,
+            Gain: frequencyResponse.gains,
+          };
+          this.componentGainDBSPL = frequencyResponse.gain_at_1000hz;
+          lCalib = this.componentGainDBSPL;
+        }
+      } else {
+        const impulseResponse = await this.pyServerAPI.getImpulseResponseFromFrequencyResponse({
+          frequencies: calibrateSoundSimulateMicrophoneFrequencies,
+          gains: this.calibrateSoundSimulateMicrophone,
+          sample_rate: this.sourceSamplingRate,
+          iir_length: this.iirLength,
+          calibrateSoundIIRPhase: this.calibrateSoundIIRPhase,
+          totalDuration: allHzDuation,
+          totalDuration1000Hz: this.CALIBRATION_TONE_DURATION,
+        });
+        if (isLoudspeakerCalibration) {
+          this.componentIR = {
+            Freq: impulseResponse.frequencies,
+            Gain: impulseResponse.gains,
+          };
+          this.componentGainDBSPL = impulseResponse.gain_at_1000hz;
+          lCalib = this.componentGainDBSPL;
+        }
+        this.simulatedMicrophoneIR = {
+          Freq: impulseResponse.frequencies,
+          Gain: impulseResponse.gains,
+        };
+        this.calibrateSoundSimulateMicrophone = impulseResponse.impulse_response;
+        this.calibrateSoundSimulateMicrophone1000Hz = impulseResponse.impulse_response_1000hz;
+      }
+
+      if (calibrateSoundSimulateLoudspeakerType === 'impulseResponse') {
+        const frequencyResponse = await this.pyServerAPI.getFrequencyResponseFromImpulseResponse({
+          impulseResponse: this.calibrateSoundSimulateLoudspeaker,
+          sampleRate: this.sourceSamplingRate,
+          timeArray: calibrateSoundSimulateLoudspeakerTime,
+          totalDuration: allHzDuation,
+          totalDuration1000Hz: this.CALIBRATION_TONE_DURATION,
+        });
+
+        if (!isLoudspeakerCalibration) {
+          this.componentIR = {
+            Freq: frequencyResponse.frequencies,
+            Gain: frequencyResponse.gains,
+          };
+          this.componentGainDBSPL = frequencyResponse.gain_at_1000hz;
+          lCalib = this.componentGainDBSPL;
+        }
+
+        this.calibrateSoundSimulateLoudspeaker = frequencyResponse.impulse_response;
+        this.calibrateSoundSimulateLoudspeaker1000Hz = frequencyResponse.impulse_response_1000hz;
+        this.simulatedLoudspeakerIR = {
+          Freq: frequencyResponse.frequencies,
+          Gain: frequencyResponse.gains,
         };
-        console.log('this.componentIR', this.componentIR);
-        this.componentGainDBSPL = frequencyResponse.gain_at_1000hz_microphone;
-        lCalib = this.componentGainDBSPL;
       } else {
-        //define this.componentIR, this.componentGainDBSPL
-        this.componentIR = {
-          Freq: frequencyResponse.frequencies_loudspeaker,
-          Gain: frequencyResponse.gains_loudspeaker,
+        const impulseResponse = await this.pyServerAPI.getImpulseResponseFromFrequencyResponse({
+          frequencies: calibrateSoundSimulateLoudspeakerFrequencies,
+          gains: this.calibrateSoundSimulateLoudspeaker,
+          sample_rate: this.sourceSamplingRate,
+          iir_length: this.iirLength,
+          calibrateSoundIIRPhase: this.calibrateSoundIIRPhase,
+          totalDuration: allHzDuation,
+          totalDuration1000Hz: this.CALIBRATION_TONE_DURATION,
+        });
+
+        this.simulatedLoudspeakerIR = {
+          Freq: impulseResponse.frequencies,
+          Gain: impulseResponse.gains,
         };
-        this.componentGainDBSPL = frequencyResponse.gain_at_1000hz_loudspeaker;
-        lCalib = this.componentGainDBSPL;
+        if (!isLoudspeakerCalibration) {
+          this.componentIR = {
+            Freq: impulseResponse.frequencies,
+            Gain: impulseResponse.gains,
+          };
+          this.componentGainDBSPL = impulseResponse.gain_at_1000hz;
+          lCalib = this.componentGainDBSPL;
+        }
+        this.calibrateSoundSimulateLoudspeaker = impulseResponse.impulse_response;
+        this.calibrateSoundSimulateLoudspeaker1000Hz = impulseResponse.impulse_response_1000hz;
       }
     }
 
@@ -3609,6 +3668,8 @@ class Combination extends AudioCalibrator {
       impulseResponseResults['component']['fMaxHz'] = this.componentFMaxHz;
       impulseResponseResults['L_new_n'] = this.L_new_n;
       impulseResponseResults['fs2'] = this.fs2;
+      impulseResponseResults['fMLS'] =
+        this.sourceSamplingRate / this._calibrateSoundBurstDownsample;
 
       if (componentIR != null) {
         // I corrected microphone/loudpeaker IR scale in easyeyes,