Update audio-buffer

Author: dy

package-lock.json

@@ -31,7 +31,7 @@
     "dsp"
   ],
   "dependencies": {
-    "audio-buffer": "^6.0.1",
+    "audio-buffer": "^7.3.0",
     "audio-decode": "^3.1.2",
     "audio-speaker": "^2.0.5",
     "automation-events": "^7.1.15",

package.json

@@ -1,6 +1,7 @@
 import { BLOCK_SIZE } from './constants.js'
 import AudioNode from './AudioNode.js'
 import AudioBuffer from 'audio-buffer'
+import { from, concat, slice } from 'audio-buffer/util'
 
 
 class ScriptProcessorNode extends AudioNode {
@@ -34,24 +35,22 @@ class ScriptProcessorNode extends AudioNode {
 
       let inBlock = this._inputs[0]._tick()
       // Clone the input block since AudioInput reuses its internal mix buffer
-      let cloned = new AudioBuffer(inBlock.numberOfChannels, inBlock.length, this.context.sampleRate)
-      for (let c = 0; c < inBlock.numberOfChannels; c++)
-        cloned.getChannelData(c).set(inBlock.getChannelData(c))
-      inputBuffer = inputBuffer ? inputBuffer.concat(cloned) : cloned
+      let cloned = from(inBlock)
+      inputBuffer = inputBuffer ? concat(inputBuffer, cloned) : cloned
 
       if (inputBuffer.length === this.bufferSize) {
         let event = this._processingEvent(inputBuffer)
         onaudioprocess(event)
         inputBuffer = null
-        outputBuffer = outputBuffer ? outputBuffer.concat(event.outputBuffer) : event.outputBuffer
+        outputBuffer = outputBuffer ? concat(outputBuffer, event.outputBuffer) : event.outputBuffer
       } else if (inputBuffer.length >= this.bufferSize) throw new Error('this shouldnt happen')
 
       frameCount += BLOCK_SIZE
 
       // Enforce 2*bufferSize latency: don't emit output until enough frames have passed
       if (frameCount > latency && outputBuffer && outputBuffer.length >= BLOCK_SIZE) {
-        let returned = outputBuffer.slice(0, BLOCK_SIZE)
-        outputBuffer = outputBuffer.length > BLOCK_SIZE ? outputBuffer.slice(BLOCK_SIZE) : null
+        let returned = slice(outputBuffer, 0, BLOCK_SIZE)
+        outputBuffer = outputBuffer.length > BLOCK_SIZE ? slice(outputBuffer, BLOCK_SIZE) : null
         return returned
       }
       return new AudioBuffer(this.numberOfOutputChannels, BLOCK_SIZE, this.context.sampleRate)

src/ScriptProcessorNode.js

@@ -1,5 +1,5 @@
-import AudioBuffer from 'audio-buffer'
 import decode from 'audio-decode'
+import { from as audioBufferFrom } from 'audio-buffer/util'
 
 // polyfill Symbol.dispose
 Symbol.dispose ||= Symbol('dispose')
@@ -9,7 +9,7 @@ Symbol.dispose ||= Symbol('dispose')
 export async function decodeAudioData(buffer, done) {
   try {
     let { channelData, sampleRate } = await decode(buffer)
-    let audioBuffer = AudioBuffer.fromArray(channelData, sampleRate)
+    let audioBuffer = audioBufferFrom(channelData, { sampleRate })
     if (done) done(null, audioBuffer)
     return audioBuffer
   } catch (err) {

src/utils.js

@@ -2,6 +2,7 @@ import test from 'tst'
 import { is, ok, throws, almost } from 'tst'
 import AudioNode from '../src/AudioNode.js'
 import AudioBuffer from 'audio-buffer'
+import { fill } from 'audio-buffer/util'
 import AnalyserNode from '../src/AnalyserNode.js'
 import { BLOCK_SIZE } from '../src/constants.js'
 
@@ -24,7 +25,7 @@ test('AnalyserNode > fftSize validation', () => {
 test.mute('AnalyserNode > passthrough', () => {
   let c = { sampleRate: SR, currentTime: 0 }
   let node = new AnalyserNode(c)
-  wire(c, node, AudioBuffer.filledWithVal(0.5, 1, BLOCK_SIZE, SR))
+  wire(c, node, fill(new AudioBuffer(1, BLOCK_SIZE, SR), 0.5))
   c.currentTime = 1; almost(node._tick().getChannelData(0)[0], 0.5, 1e-6, 'passthrough')
 })
 

test/AnalyserNode.test.js

@@ -1,6 +1,7 @@
 import test from 'tst'
 import { is, ok, throws, almost } from 'tst'
 import AudioBuffer from 'audio-buffer'
+import { concat, slice, set, fill, from } from 'audio-buffer/util'
 
 test('AudioBuffer > constructor', () => {
   let buf = new AudioBuffer(3, 100, 44100)
@@ -32,7 +33,7 @@ test('AudioBuffer > getChannelData returns view (not copy)', () => {
 })
 
 test.mute('AudioBuffer > filledWithVal', () => {
-  let buf = AudioBuffer.filledWithVal(0.7, 2, 50, 44100)
+  let buf = fill(new AudioBuffer(2, 50, 44100), 0.7)
   is(buf.numberOfChannels, 2)
   is(buf.length, 50)
   for (let i = 0; i < 50; i++) {
@@ -43,7 +44,7 @@ test.mute('AudioBuffer > filledWithVal', () => {
 
 test('AudioBuffer > fromArray', () => {
   let arr = [new Float32Array([1, 2, 3]), new Float32Array([4, 5, 6])]
-  let buf = AudioBuffer.fromArray(arr, 44100)
+  let buf = from(arr, { sampleRate: 44100 })
   is(buf.numberOfChannels, 2)
   is(buf.length, 3)
   is(buf.getChannelData(0)[0], 1)
@@ -52,31 +53,31 @@ test('AudioBuffer > fromArray', () => {
 
 test('AudioBuffer > slice', () => {
   let arr = [new Float32Array([1, 2, 3, 4, 5])]
-  let buf = AudioBuffer.fromArray(arr, 44100)
-  let sliced = buf.slice(1, 3)
+  let buf = from(arr, { sampleRate: 44100 })
+  let sliced = slice(buf, 1, 3)
   is(sliced.length, 2)
   is(sliced.getChannelData(0)[0], 2)
   is(sliced.getChannelData(0)[1], 3)
 })
 
 test('AudioBuffer > concat', () => {
-  let a = AudioBuffer.fromArray([new Float32Array([1, 2])], 44100)
-  let b = AudioBuffer.fromArray([new Float32Array([3, 4])], 44100)
-  let c = a.concat(b)
+  let a = from([new Float32Array([1, 2])], { sampleRate: 44100 })
+  let b = from([new Float32Array([3, 4])], { sampleRate: 44100 })
+  let c = concat(a, b)
   is(c.length, 4)
   is(c.getChannelData(0)[2], 3)
 })
 
 test('AudioBuffer > concat > rejects mismatched sampleRate', () => {
   let a = new AudioBuffer(1, 10, 44100)
   let b = new AudioBuffer(1, 10, 22050)
-  throws(() => a.concat(b))
+  throws(() => concat(a, b))
 })
 
 test('AudioBuffer > set', () => {
   let a = new AudioBuffer(1, 10, 44100)
-  let b = AudioBuffer.fromArray([new Float32Array([0.5, 0.6])], 44100)
-  a.set(b, 3)
+  let b = from([new Float32Array([0.5, 0.6])], { sampleRate: 44100 })
+  set(a, b, 3)
   almost(a.getChannelData(0)[3], 0.5, 1e-6)
   almost(a.getChannelData(0)[4], 0.6, 1e-6)
 })

test/AudioBuffer.test.js

@@ -3,6 +3,7 @@ import { is, ok, almost, throws } from 'tst'
 import AudioContext from '../src/AudioContext.js'
 import { AudioWorkletNode, AudioWorkletProcessor } from '../src/AudioWorklet.js'
 import AudioBuffer from 'audio-buffer'
+import { fill } from 'audio-buffer/util'
 import AudioNode from '../src/AudioNode.js'
 import { BLOCK_SIZE } from '../src/constants.js'
 
@@ -54,7 +55,7 @@ test('AudioWorklet > processes audio', async () => {
   let node = new AudioWorkletNode(ctx, 'half')
   let src = new AudioNode(ctx, 0, 1)
   src.connect(node)
-  src._tick = () => AudioBuffer.filledWithVal(0.8, 1, BLOCK_SIZE, 44100)
+  src._tick = () => fill(new AudioBuffer(1, BLOCK_SIZE, 44100), 0.8)
 
   ctx._state = 'running'
   let buf = node._tick()
@@ -101,7 +102,7 @@ test('AudioWorklet > process returning false kills node, outputs silence', async
   let node = new AudioWorkletNode(ctx, 'oneshot')
   let src = new AudioNode(ctx, 0, 1)
   src.connect(node)
-  src._tick = () => AudioBuffer.filledWithVal(0, 1, BLOCK_SIZE, 44100)
+  src._tick = () => fill(new AudioBuffer(1, BLOCK_SIZE, 44100), 0)
 
   ctx._state = 'running'
   node._tick() // calls=1
@@ -141,7 +142,7 @@ test('AudioWorklet > addModule with data URI', async () => {
   let node = new AudioWorkletNode(ctx, 'data-uri-proc')
   let src = new AudioNode(ctx, 0, 1)
   src.connect(node)
-  src._tick = () => AudioBuffer.filledWithVal(0, 1, BLOCK_SIZE, 44100)
+  src._tick = () => fill(new AudioBuffer(1, BLOCK_SIZE, 44100), 0)
 
   ctx._state = 'running'
   let buf = node._tick()

test/AudioWorklet.test.js

@@ -2,6 +2,7 @@ import test from 'tst'
 import { is, ok, throws, almost } from 'tst'
 import AudioNode from '../src/AudioNode.js'
 import AudioBuffer from 'audio-buffer'
+import { fill } from 'audio-buffer/util'
 import BiquadFilterNode from '../src/BiquadFilterNode.js'
 import { BLOCK_SIZE } from '../src/constants.js'
 
@@ -22,7 +23,7 @@ test('BiquadFilterNode > type validation', () => {
 test.mute('BiquadFilterNode > lowpass passes DC', () => {
   let c = { sampleRate: SR, currentTime: 0 }
   let f = new BiquadFilterNode(c); f.type = 'lowpass'; f.frequency.value = 1000
-  wire(c, f, AudioBuffer.filledWithVal(0.5, 1, BLOCK_SIZE, SR))
+  wire(c, f, fill(new AudioBuffer(1, BLOCK_SIZE, SR), 0.5))
   for (let i = 0; i < 20; i++) { c.currentTime = i; f._tick() }
   c.currentTime = 20; let buf = f._tick()
   almost(buf.getChannelData(0)[BLOCK_SIZE - 1], 0.5, 0.05, 'DC passes')
@@ -31,7 +32,7 @@ test.mute('BiquadFilterNode > lowpass passes DC', () => {
 test.mute('BiquadFilterNode > highpass blocks DC', () => {
   let c = { sampleRate: SR, currentTime: 0 }
   let f = new BiquadFilterNode(c); f.type = 'highpass'; f.frequency.value = 1000
-  wire(c, f, AudioBuffer.filledWithVal(0.5, 1, BLOCK_SIZE, SR))
+  wire(c, f, fill(new AudioBuffer(1, BLOCK_SIZE, SR), 0.5))
   for (let i = 0; i < 20; i++) { c.currentTime = i; f._tick() }
   c.currentTime = 20; let buf = f._tick()
   almost(buf.getChannelData(0)[BLOCK_SIZE - 1], 0, 0.05, 'DC blocked')

test/BiquadFilterNode.test.js

@@ -2,6 +2,7 @@ import test from 'tst'
 import { is, ok, almost } from 'tst'
 import AudioNode from '../src/AudioNode.js'
 import AudioBuffer from 'audio-buffer'
+import { fill } from 'audio-buffer/util'
 import ChannelSplitterNode from '../src/ChannelSplitterNode.js'
 import ChannelMergerNode from '../src/ChannelMergerNode.js'
 import { BLOCK_SIZE } from '../src/constants.js'
@@ -36,8 +37,8 @@ test.mute('ChannelMergerNode > merges mono to stereo', () => {
   let node = new ChannelMergerNode(c, { numberOfInputs: 2 })
   let s0 = new AudioNode(c, 0, 1), s1 = new AudioNode(c, 0, 1)
   s0.connect(node, 0, 0); s1.connect(node, 0, 1)
-  s0._tick = () => AudioBuffer.filledWithVal(0.2, 1, BLOCK_SIZE, SR)
-  s1._tick = () => AudioBuffer.filledWithVal(0.8, 1, BLOCK_SIZE, SR)
+  s0._tick = () => fill(new AudioBuffer(1, BLOCK_SIZE, SR), 0.2)
+  s1._tick = () => fill(new AudioBuffer(1, BLOCK_SIZE, SR), 0.8)
   c.currentTime = 1; let buf = node._tick()
   is(buf.numberOfChannels, 2)
   almost(buf.getChannelData(0)[0], 0.2, 1e-6, 'ch0'); almost(buf.getChannelData(1)[0], 0.8, 1e-6, 'ch1')

test/ChannelNodes.test.js

@@ -2,6 +2,7 @@ import test from 'tst'
 import { ok, almost } from 'tst'
 import AudioNode from '../src/AudioNode.js'
 import AudioBuffer from 'audio-buffer'
+import { fill } from 'audio-buffer/util'
 import ConvolverNode from '../src/ConvolverNode.js'
 import { BLOCK_SIZE } from '../src/constants.js'
 
@@ -11,7 +12,7 @@ let wire = (c, node, buf) => { let s = new AudioNode(c, 0, 1); s.connect(node);
 test('ConvolverNode > passthrough when no buffer', () => {
   let c = { sampleRate: SR, currentTime: 0 }
   let node = new ConvolverNode(c)
-  wire(c, node, AudioBuffer.filledWithVal(0.5, 1, BLOCK_SIZE, SR))
+  wire(c, node, fill(new AudioBuffer(1, BLOCK_SIZE, SR), 0.5))
   c.currentTime = 1; almost(node._tick().getChannelData(0)[0], 0.5, 1e-6)
 })
 
@@ -21,7 +22,7 @@ test.mute('ConvolverNode > unit impulse IR = passthrough', () => {
   node.normalize = false
   let ir = new AudioBuffer(1, 1, SR); ir.getChannelData(0)[0] = 1
   node.buffer = ir
-  wire(c, node, AudioBuffer.filledWithVal(0.7, 1, BLOCK_SIZE, SR))
+  wire(c, node, fill(new AudioBuffer(1, BLOCK_SIZE, SR), 0.7))
   c.currentTime = 1; almost(node._tick().getChannelData(0)[0], 0.7, 0.01, 'passthrough')
 })