speaker-calibration 2.2.23 → 2.2.25

package/package.json

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

package/src/tasks/audioRecorder.js

@@ -32,7 +32,7 @@ class AudioRecorder extends MyEventEmitter {
    * @private
    * @example
    */
-  #saveRecording = async (checkRec) => {
+  #saveRecording = async checkRec => {
     const arrayBuffer = await this.#audioBlob.arrayBuffer();
     const audioBuffer = await this.#audioContext.decodeAudioData(arrayBuffer);
     const data = audioBuffer.getChannelData(0);
@@ -40,22 +40,36 @@ class AudioRecorder extends MyEventEmitter {
 
     console.log(`Decoded audio buffer with ${data.length} samples`);
     console.log(`Unfiltered recording should be of length: ${data.length}`);
-    if (checkRec == 'loudest'){
+    if (checkRec == 'loudest') {
       const uniqueSet = new Set(dataArray);
       const numberOfUniqueValues = uniqueSet.size;
       const squaredValues = dataArray.map(value => value * value);
       const sum_of_squares = squaredValues.reduce((total, value) => total + value, 0);
       const squared_mean = sum_of_squares / dataArray.length;
       const dbLevel = 20 * Math.log10(Math.sqrt(squared_mean));
-      console.log("Loudest 1000-Hz recording: " + dbLevel + " with " + numberOfUniqueValues + " unique values.")
-    }else if (checkRec == 'allhz'){
+      const roundedDbLevel = Math.round(dbLevel * 10) / 10;
+      console.log(
+        'Loudest 1000-Hz recording: ' +
+          roundedDbLevel +
+          ' dB with ' +
+          numberOfUniqueValues +
+          ' unique values.'
+      );
+    } else if (checkRec == 'allhz') {
       const uniqueSet = new Set(dataArray);
       const numberOfUniqueValues = uniqueSet.size;
       const squaredValues = dataArray.map(value => value * value);
       const sum_of_squares = squaredValues.reduce((total, value) => total + value, 0);
       const squared_mean = sum_of_squares / dataArray.length;
       const dbLevel = 20 * Math.log10(Math.sqrt(squared_mean));
-      console.log("All Hz Recording: " + dbLevel + " with " + numberOfUniqueValues + " unique values.")
+      const roundedDbLevel = Math.round(dbLevel * 10) / 10;
+      console.log(
+        'All Hz Recording: ' +
+          roundedDbLevel +
+          ' dB with ' +
+          numberOfUniqueValues +
+          ' unique values.'
+      );
     }
     this.#recordedSignals.push(dataArray);
   };
@@ -128,7 +142,7 @@ class AudioRecorder extends MyEventEmitter {
    * @public
    * @example
    */
-  stopRecording = async (mode,checkRec) => {
+  stopRecording = async (mode, checkRec) => {
     // Stop the media recorder, and wait for the data to be available
     await new Promise(resolve => {
       this.#mediaRecorder.onstop = () => {
@@ -142,9 +156,9 @@ class AudioRecorder extends MyEventEmitter {
       this.#mediaRecorder.stop();
     });
     // Now that we have data, save it
-    if (mode === 'filtered'){
+    if (mode === 'filtered') {
       await this.#saveFilteredRecording();
-    }else{
+    } else {
       await this.#saveRecording(checkRec);
     }
   };
@@ -169,7 +183,7 @@ class AudioRecorder extends MyEventEmitter {
    */
   getAllRecordedSignals = () => this.#recordedSignals;
 
-    /** .
+  /** .
    * .
    * .
    * Public method to get all the recorded audio signals

package/src/tasks/combination/combination.js

@@ -1079,6 +1079,15 @@ class Combination extends AudioCalibrator {
     return false;
   };
 
+  addMicrophoneInfo = async (speakerID, OEM, micInfo) => {
+    // add to database if /info does not exist
+    const dbRef = ref(database);
+    const snapshot = await get(child(dbRef, `Microphone2/${OEM}/${speakerID}/info`));
+    if (!snapshot.exists()) {
+      await set(ref(database, `Microphone2/${OEM}/${speakerID}/info`), micInfo);
+    }
+  };
+
   convertToDB = gain => {
     return Math.log10(gain) * 20;
   };
@@ -1152,6 +1161,17 @@ class Combination extends AudioCalibrator {
     //based on zeroing of 1000hz, search for "*1000Hz"
     const ID = isSmartPhone ? micModelNumber : micSerialNumber;
     const OEM = isSmartPhone ? this.deviceInfo.OEM : micManufacturer;
+    const micInfo = {
+      OEM: OEM,
+      ID: ID,
+      HardwareName: isSmartPhone ? this.deviceInfo.hardwarename : micModelName,
+      hardwareFamily: isSmartPhone ? this.deviceInfo.hardwarefamily : micModelName,
+      HardwareModel: isSmartPhone ? this.deviceInfo.hardwaremodel : micModelName,
+      PlatformName: isSmartPhone ? this.deviceInfo.platformname : 'N/A',
+      PlatformVersion: isSmartPhone ? this.deviceInfo.platformversion : 'N/A',
+      DeviceType: isSmartPhone ? this.deviceInfo.devicetype : 'N/A',
+    };
+    this.addMicrophoneInfo(ID, OEM, micInfo);
     if (componentIR == null) {
       //mode 'ir'
       //global variable this.componentIR must be set
@@ -1208,7 +1228,7 @@ class Combination extends AudioCalibrator {
       micModelName: micModelName,
       ID: ID,
       OEM: OEM,
-      micInfo: this.deviceInfo,
+      micInfo: micInfo,
     };
     console.log('total results');
     console.log(total_results);