speaker-calibration 2.1.6 → 2.1.8

package/dist/package.json

@@ -1,18 +1,18 @@
-{
-  "name": "easy-eyes-listener",
-  "version": "1.0.0",
-  "description": "",
-  "main": "example/server.js",
-  "directories": {
-    "example": "example"
-  },
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "express": "^4.18.2"
-  }
-}
+{
+  "name": "easy-eyes-listener",
+  "version": "1.0.0",
+  "description": "",
+  "main": "example/server.js",
+  "directories": {
+    "example": "example"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "express": "^4.18.2"
+  }
+}

package/package.json

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

package/src/server/PythonServerAPI.js

@@ -20,7 +20,7 @@ class PythonServerAPI {
    * @returns
    * @example
    */
-  getImpulseResponse = async ({payload, sampleRate, P}) => {
+  getImpulseResponse = async ({mls, payload, sampleRate, P}) => {
     const task = 'impulse-response';
     let res = null;
 
@@ -30,6 +30,7 @@ class PythonServerAPI {
       task,
       payload,
       'sample-rate': sampleRate,
+      mls,
       P,
     });
 
@@ -48,7 +49,6 @@ class PythonServerAPI {
       .catch(error => {
         throw error;
       });
-
     return res.data[task];
   };
 

package/src/tasks/impulse-response/impulseResponse.js

@@ -16,11 +16,12 @@ class ImpulseResponse extends AudioCalibrator {
    * @param {number} [calibratorParams.numCaptures = 5] - number of captures to perform
    * @param {number} [calibratorParams.numMLSPerCapture = 4] - number of bursts of MLS per capture
    */
-  constructor({download = false, mlsOrder = 18, numCaptures = 3, numMLSPerCapture = 3}) {
+  constructor({download = false, mlsOrder = 18, numCaptures = 3, numMLSPerCapture = 4}) {
     super(numCaptures, numMLSPerCapture);
     this.#mlsOrder = parseInt(mlsOrder, 10);
     this.#P = 2 ** mlsOrder - 1;
     this.#download = download;
+    this.#mls = [];
   }
 
   /** @private */
@@ -41,6 +42,9 @@ class ImpulseResponse extends AudioCalibrator {
   /** @private */
   #mlsOrder;
 
+  /** @private */
+  #mls;
+
   /** @private */
   #P;
 
@@ -86,6 +90,7 @@ class ImpulseResponse extends AudioCalibrator {
   sendRecordingToServerForProcessing = signalCsv => {
     const allSignals = this.getAllRecordedSignals();
     const numSignals = allSignals.length;
+    const mls = this.#mls;
     const payload =
       signalCsv && signalCsv.length > 0 ? csvToArray(signalCsv) : allSignals[numSignals - 1];
 
@@ -95,6 +100,7 @@ class ImpulseResponse extends AudioCalibrator {
         .getImpulseResponse({
           sampleRate: this.sourceSamplingRate || 96000,
           payload,
+          mls,
           P: this.#P,
         })
         .then(res => {
@@ -337,6 +343,7 @@ class ImpulseResponse extends AudioCalibrator {
    */
   #playCalibrationAudio = () => {
     this.calibrationNodes[0].start(0);
+    this.#mls = this.calibrationNodes[0].buffer.getChannelData(0);
     this.emit('update', {message: 'playing the calibration tone...'});
   };
 

package/src/tasks/volume/volume.js

@@ -29,6 +29,9 @@ class Volume extends AudioCalibrator {
   THD = null;
   outDBSPL1000 = null;
 
+  /** @private */
+  TAPER_SECS = 0.010; // seconds
+
   handleIncomingData = data => {
     console.log('Received data: ', data);
     if (data.type === 'soundGainDBSPL') {
@@ -38,6 +41,21 @@ class Volume extends AudioCalibrator {
     }
   };
 
+  createSCurveBuffer = (onSetBool=true) => {
+
+    const curve = new Float32Array(this.TAPER_SECS*this.sourceSamplingRate+1);
+    const frequency = 1 / (4 * this.TAPER_SECS);
+    let j = 0;
+    for (let i = 0; i < this.TAPER_SECS*this.sourceSamplingRate+1; i += 1) {
+      const phase = 2 * Math.PI * frequency * j;
+      const onsetTaper = Math.pow(Math.sin(phase) , 2);
+      const offsetTaper = Math.pow(Math.cos(phase) , 2);
+      curve[i] = onSetBool? onsetTaper : offsetTaper;
+      j += (1 / this.sourceSamplingRate);
+    } 
+    return curve;
+  };
+
   #getTruncatedSignal = (left = 3.5, right = 4.5) => {
     const start = Math.floor(left * this.sourceSamplingRate);
     const end = Math.floor(right * this.sourceSamplingRate);
@@ -73,13 +91,22 @@ class Volume extends AudioCalibrator {
     const audioContext = this.makeNewSourceAudioContext();
     const oscilator = audioContext.createOscillator();
     const gainNode = audioContext.createGain();
+    const taperGainNode = audioContext.createGain();
+    const offsetGainNode = audioContext.createGain();
+    const totalDuration = this.#CALIBRATION_TONE_DURATION * 1.2;
 
     oscilator.frequency.value = this.#CALIBRATION_TONE_FREQUENCY;
     oscilator.type = this.#CALIBRATION_TONE_TYPE;
     gainNode.gain.value = gainValue;
 
     oscilator.connect(gainNode);
-    gainNode.connect(audioContext.destination);
+    gainNode.connect(taperGainNode);
+    const onsetCurve = this.createSCurveBuffer();
+    taperGainNode.gain.setValueCurveAtTime(onsetCurve, 0, this.TAPER_SECS);
+    taperGainNode.connect(offsetGainNode);
+    const offsetCurve = this.createSCurveBuffer(false);
+    offsetGainNode.gain.setValueCurveAtTime(offsetCurve, (totalDuration-this.TAPER_SECS), this.TAPER_SECS);
+    offsetGainNode.connect(audioContext.destination);
 
     this.addCalibrationNode(oscilator);
   };

package/dist/node_modules/.bin/mime

@@ -1,12 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../mime/cli.js" "$@"
-else 
-  exec node  "$basedir/../mime/cli.js" "$@"
-fi

package/dist/node_modules/.bin/mime.cmd

@@ -1,17 +0,0 @@
-@ECHO off
-GOTO start
-:find_dp0
-SET dp0=%~dp0
-EXIT /b
-:start
-SETLOCAL
-CALL :find_dp0
-
-IF EXIST "%dp0%\node.exe" (
-  SET "_prog=%dp0%\node.exe"
-) ELSE (
-  SET "_prog=node"
-  SET PATHEXT=%PATHEXT:;.JS;=;%
-)
-
-endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%"  "%dp0%\..\mime\cli.js" %*

package/dist/node_modules/.bin/mime.ps1

@@ -1,28 +0,0 @@
-#!/usr/bin/env pwsh
-$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
-
-$exe=""
-if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
-  # Fix case when both the Windows and Linux builds of Node
-  # are installed in the same directory
-  $exe=".exe"
-}
-$ret=0
-if (Test-Path "$basedir/node$exe") {
-  # Support pipeline input
-  if ($MyInvocation.ExpectingInput) {
-    $input | & "$basedir/node$exe"  "$basedir/../mime/cli.js" $args
-  } else {
-    & "$basedir/node$exe"  "$basedir/../mime/cli.js" $args
-  }
-  $ret=$LASTEXITCODE
-} else {
-  # Support pipeline input
-  if ($MyInvocation.ExpectingInput) {
-    $input | & "node$exe"  "$basedir/../mime/cli.js" $args
-  } else {
-    & "node$exe"  "$basedir/../mime/cli.js" $args
-  }
-  $ret=$LASTEXITCODE
-}
-exit $ret