speaker-calibration 2.2.0 → 2.2.2

package/package.json

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

package/src/peer-connection/listener.js

@@ -169,7 +169,7 @@ class Listener extends AudioPeer {
     }
 
     if (capabilities.sampleRate) {
-      constraints.sampleRate = 96000;
+      constraints.sampleRate = 48000;
     }
 
     if (capabilities.sampleSize) {
@@ -211,7 +211,7 @@ class Listener extends AudioPeer {
       //   ? {echoCancellation: {exact: false}}
       //   : {}),
       ...(availableConstraints.sampleRate && availableConstraints.sampleRate == true
-        ? {sampleRate: {ideal: 96000}}
+        ? {sampleRate: {ideal: 48000}}
         : {}),
       ...(availableConstraints.sampleSize && availableConstraints.sampleSize == true
         ? {sampleSize: {ideal: 24}}

package/src/peer-connection/speaker.js

@@ -91,7 +91,11 @@ class Speaker extends AudioPeer {
             params.knownIR,
             params.microphoneName,
             params.calibrateSoundCheck,
-            params.isSmartPhone
+            params.isSmartPhone,
+            params.calibrateSoundBurstRepeats,
+            params.calibrateSoundBurstSec,
+            params.calibrateSoundBurstsWarmup,
+            params.calibrateSoundHz
           );
           speaker.#removeUIElems();
           resolve(speaker.result);

package/src/server/PythonServerAPI.js

@@ -24,7 +24,7 @@ class PythonServerAPI {
    * @returns
    * @example
    */
-  getImpulseResponse = async ({mls, payload, sampleRate, P}) => {
+  getImpulseResponse = async ({mls, payload, sampleRate, P, numPeriods}) => {
     const task = 'impulse-response';
     let res = null;
 
@@ -36,6 +36,7 @@ class PythonServerAPI {
       'sample-rate': sampleRate,
       mls,
       P,
+      numPeriods,
     });
 
     await axios({
@@ -56,6 +57,56 @@ class PythonServerAPI {
     return res.data[task];
   };
 
+  getMLS = async(length) => {
+    const task = 'mls';
+    let res = null
+
+    const data = JSON.stringify({
+      task,
+      'length':length,
+    })
+
+    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];
+  }
+  getMLSWithRetry = async (length) => {
+    let retryCount = 0;
+    let response = null;
+
+    while (retryCount < this.MAX_RETRY_COUNT) {
+      try {
+        response = await this.getMLS(length);
+        // If the request is successful, break out of the loop
+        break;
+      } catch (error) {
+        console.error(`Error occurred. Retrying... (${retryCount + 1}/${this.MAX_RETRY_COUNT})`);
+        retryCount++;
+        await new Promise(resolve => setTimeout(resolve, this.RETRY_DELAY_MS));
+      }
+    }
+
+    if (response) {
+      return response;
+    } else {
+      throw new Error(`Failed to get MLS after ${this.MAX_RETRY_COUNT} attempts.`);
+    }
+  };
+
   getPSD = async ({unconv_rec, conv_rec, sampleRate}) => {
     const task = 'psd';
     let res = null;

package/src/tasks/combination/combination.js

@@ -142,6 +142,14 @@ class Combination extends AudioCalibrator {
 
   deviceName = null;
 
+  desired_time_per_mls = 0;
+
+  num_mls_to_skip = 0;
+
+  desired_sampling_rate = 0;
+
+  #currentConvolution = [];
+
   /**generate string template that gets reevaluated as variable increases */
   generateTemplate = () => {
     if (this.percent_complete > 100) {
@@ -298,6 +306,7 @@ class Combination extends AudioCalibrator {
           payload,
           mls,
           P: this.#P,
+          numPeriods: this.numMLSPerCapture,
         })
         .then(res => {
           if (this.numSuccessfulCaptured < this.numCaptures) {
@@ -337,7 +346,23 @@ class Combination extends AudioCalibrator {
     this.emit('update', {
       message: this.status,
     });
-    await sleep((this.#P / this.sourceSamplingRate) * this.numMLSPerCapture);
+    let time_to_wait = (this.#mls.length / this.sourceSamplingRate) * this.numMLSPerCapture;
+    await sleep(time_to_wait);
+  };
+
+  #awaitDesiredMLSLengthConvolved = async () => {
+    // seconds per MLS = P / SR
+    // await N * P / SR
+    this.stepNum += 1;
+    console.log('await desired length ' + this.stepNum);
+    this.status =
+      `All Hz Calibration: sampling the calibration signal...`.toString() + this.generateTemplate();
+    this.emit('update', {
+      message: this.status,
+    });
+    let time_to_wait =
+      (this.#currentConvolution.length / this.sourceSamplingRate) * this.numMLSPerCapture;
+    await sleep(time_to_wait);
   };
 
   /** .
@@ -356,7 +381,25 @@ class Combination extends AudioCalibrator {
     this.emit('update', {
       message: this.status,
     });
-    await sleep(this.TAPER_SECS);
+    let number_of_bursts_to_skip = this.num_mls_to_skip;
+    let time_to_sleep = this.#mls.length / this.sourceSamplingRate;
+    //await sleep(this.TAPER_SECS);
+    await sleep(time_to_sleep);
+  };
+
+  #awaitSignalOnsetConvolved = async () => {
+    this.stepNum += 1;
+    console.log('await signal onset ' + this.stepNum);
+    this.status =
+      `All Hz Calibration: waiting for the signal to stabilize...`.toString() +
+      this.generateTemplate();
+    this.emit('update', {
+      message: this.status,
+    });
+    let number_of_bursts_to_skip = this.num_mls_to_skip;
+    let time_to_sleep = this.#currentConvolution.length / this.sourceSamplingRate;
+    //await sleep(this.TAPER_SECS);
+    await sleep(time_to_sleep);
   };
 
   /**
@@ -463,8 +506,6 @@ class Combination extends AudioCalibrator {
     } catch (error) {
       console.error(error);
     }
-    console.log('mls second, same?');
-    console.log(data);
     const onsetGainNode = audioContext.createGain();
     this.offsetGainNode = audioContext.createGain();
     const source = audioContext.createBufferSource();
@@ -488,8 +529,6 @@ class Combination extends AudioCalibrator {
    */
   #setCalibrationNodesFromBuffer = (dataBufferArray = [this.#mlsBufferView]) => {
     if (dataBufferArray.length === 1) {
-      console.log('data buffer aray');
-      console.log(dataBufferArray);
       this.#createCalibrationNodeFromBuffer(dataBufferArray[0]);
     } else {
       throw new Error('The length of the data buffer array must be 1');
@@ -505,6 +544,7 @@ class Combination extends AudioCalibrator {
 
     //depends on goal
     if (this._calibrateSoundCheck != 'system') {
+      this.#currentConvolution = this.componentConvolution;
       const buffer = audioCtx.createBuffer(
         1, // number of channels
         this.componentConvolution.length,
@@ -529,6 +569,7 @@ class Combination extends AudioCalibrator {
 
       this.addCalibrationNodeConvolved(source);
     } else {
+      this.#currentConvolution = this.systemConvolution;
       const buffer = audioCtx.createBuffer(
         1, // number of channels
         this.systemConvolution.length,
@@ -563,6 +604,10 @@ class Combination extends AudioCalibrator {
    */
   #playCalibrationAudio = () => {
     this.calibrationNodes[0].start(0);
+    console.log('sink sampling rate');
+    console.log(this.sinkSamplingRate);
+    console.log('source sampling rate');
+    console.log(this.sourceSamplingRate);
     this.#mls = this.calibrationNodes[0].buffer.getChannelData(0);
     this.stepNum += 1;
     console.log('play calibration audio ' + this.stepNum);
@@ -574,6 +619,10 @@ class Combination extends AudioCalibrator {
 
   #playCalibrationAudioConvolved = () => {
     this.calibrationNodesConvolved[0].start(0);
+    console.log('sink sampling rate');
+    console.log(this.sinkSamplingRate);
+    console.log('source sampling rate');
+    console.log(this.sourceSamplingRate);
     this.stepNum += 1;
     console.log('play convolved audio ' + this.stepNum);
     this.status =
@@ -635,11 +684,9 @@ class Combination extends AudioCalibrator {
       this.sourceSamplingRate
     ).then(mlsGenInterface => {
       this.#mlsGenInterface = mlsGenInterface;
-      this.#mlsBufferView = this.#mlsGenInterface.getMLS();
+      //this.#mlsBufferView = this.#mlsGenInterface.getMLS();
     });
 
-    console.log('after mls factory'); //works up to here.
-    console.log(this.#mls);
     // after intializating, start the calibration steps with garbage collection
     await this.#mlsGenInterface.withGarbageCollection([
       () =>
@@ -647,9 +694,9 @@ class Combination extends AudioCalibrator {
           stream,
           this.#playCalibrationAudioConvolved, // play audio func (required)
           this.#putInPythonConv, // before play func
-          this.#awaitSignalOnset, // before record
+          this.#awaitSignalOnsetConvolved, // before record
           () => this.numSuccessfulCaptured < 1,
-          this.#awaitDesiredMLSLength, // during record
+          this.#awaitDesiredMLSLengthConvolved, // during record
           this.#afterMLSwIIRRecord, // after record
           'filtered'
         ),
@@ -673,9 +720,24 @@ class Combination extends AudioCalibrator {
       this.sourceSamplingRate
     ).then(mlsGenInterface => {
       this.#mlsGenInterface = mlsGenInterface;
-      this.#mlsBufferView = this.#mlsGenInterface.getMLS();
+      //this.#mlsBufferView = this.#mlsGenInterface.getMLS();
     });
 
+    let desired_time = this.desired_time_per_mls;
+
+    length = this.sourceSamplingRate * desired_time;
+    //get mls here
+    await this.pyServerAPI
+      .getMLSWithRetry(length)
+      .then(res => {
+        console.log(res);
+        this.#mlsBufferView = res['mls'];
+      })
+      .catch(err => {
+        // this.emit('InvertedImpulseResponse', {res: false});
+        console.error(err);
+      });
+
     // after intializating, start the calibration steps with garbage collection
     await this.#mlsGenInterface.withGarbageCollection([
       () =>
@@ -1155,8 +1217,17 @@ class Combination extends AudioCalibrator {
     componentIR = null,
     microphoneName = 'MiniDSP-UMIK1-711-4754-vertical',
     _calibrateSoundCheck = 'goal', //GOAL PASSed in by default
-    isSmartPhone = false
+    isSmartPhone = false,
+    _calibrateSoundBurstRepeats = 4,
+    _calibrateSoundBurstSec = 1,
+    _calibrateSoundBurstsWarmup = 1,
+    _calibrateSoundHz = 48000
   ) => {
+    this.numMLSPerCapture = _calibrateSoundBurstRepeats;
+    this.desired_time_per_mls = _calibrateSoundBurstSec;
+    this.num_mls_to_skip = _calibrateSoundBurstsWarmup;
+    this.desired_sampling_rate = _calibrateSoundHz;
+
     //feed calibration goal here
     this._calibrateSoundCheck = _calibrateSoundCheck;
     //check if a componentIR was given to the system, if it isn't check for the microphone. using dummy data here bc we need to

package/.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "liveServer.settings.port": 5510
-}