spessasynth_lib 3.20.11 → 3.20.15

package/synthetizer/worklet_system/main_processor.js

@@ -1,3 +1,5 @@
+// noinspection JSUnresolvedReference
+
 import { DEFAULT_PERCUSSION, DEFAULT_SYNTH_MODE, VOICE_CAP } from '../synthetizer.js'
 import { WorkletSequencer } from '../../sequencer/worklet_sequencer/worklet_sequencer.js'
 import { SpessaSynthInfo } from '../../utils/loggin.js'
@@ -32,13 +34,14 @@ import {
     clearSoundFont,
     getPreset,
     programChange,
-    reloadSoundFont, sampleDump, sendPresetList,
-    setDrums,
+    reloadSoundFont, sendPresetList,
+    setDrums, setEmbeddedSoundFont,
     setPreset,
 } from './worklet_methods/program_control.js'
 import { applySynthesizerSnapshot, sendSynthesizerSnapshot } from './worklet_methods/snapshot.js'
 import { WorkletSoundfontManager } from './worklet_methods/worklet_soundfont_manager/worklet_soundfont_manager.js'
 import { interpolationTypes } from './worklet_utilities/wavetable_oscillator.js'
+import { getWorkletVoices } from './worklet_utilities/worklet_voice.js'
 
 
 /**
@@ -50,6 +53,7 @@ export const MIN_NOTE_LENGTH = 0.07; // if the note is released faster than that
 
 export const SYNTHESIZER_GAIN = 1.0;
 
+
 class SpessaSynthProcessor extends AudioWorkletProcessor
 {
     /**
@@ -169,10 +173,6 @@ class SpessaSynthProcessor extends AudioWorkletProcessor
         this.defaultPreset = this.getPreset(0, 0);
         this.drumPreset = this.getPreset(128, 0);
 
-        /**
-         * @type {Float32Array[]}
-         */
-        this.workletDumpedSamplesList = [];
         /**
          * contains all the channels with their voices on the processor size
          * @type {WorkletProcessorChannel[]}
@@ -186,9 +186,6 @@ class SpessaSynthProcessor extends AudioWorkletProcessor
         this.workletProcessorChannels[DEFAULT_PERCUSSION].preset = this.drumPreset;
         this.workletProcessorChannels[DEFAULT_PERCUSSION].drumChannel = true;
 
-        // in seconds, time between two samples (very, very short)
-        this.sampleTime = 1 / sampleRate;
-
         // these smoothing factors were tested on 44100Hz, adjust them here
         this.volumeEnvelopeSmoothingFactor = VOLUME_ENVELOPE_SMOOTHING_FACTOR * (sampleRate / 44100);
         this.panSmoothingFactor = PAN_SMOOTHING_FACTOR * (sampleRate / 44100);
@@ -204,14 +201,21 @@ class SpessaSynthProcessor extends AudioWorkletProcessor
 
         this.totalVoicesAmount = 0;
 
+        /**
+         * The snapshot that synth was restored from
+         * @type {SynthesizerSnapshot|undefined}
+         * @private
+         */
+        this._snapshot = options.processorOptions?.startRenderingData?.snapshot;
+
         this.port.onmessage = e => this.handleMessage(e.data);
 
         // if sent, start rendering
         if(options.processorOptions.startRenderingData)
         {
-            if (options.processorOptions.startRenderingData.snapshot)
+            if (this._snapshot !== undefined)
             {
-                this.applySynthesizerSnapshot(options.processorOptions.startRenderingData.snapshot);
+                this.applySynthesizerSnapshot(this._snapshot);
                 this.resetAllControllers();
             }
 
@@ -271,6 +275,7 @@ class SpessaSynthProcessor extends AudioWorkletProcessor
         });
     }
 
+    // noinspection JSUnusedGlobalSymbols
     /**
      * Syntesizes the voice to buffers
      * @param inputs {Float32Array[][]} required by WebAudioAPI
@@ -355,6 +360,7 @@ class SpessaSynthProcessor extends AudioWorkletProcessor
 SpessaSynthProcessor.prototype.renderVoice = renderVoice;
 SpessaSynthProcessor.prototype.releaseVoice = releaseVoice;
 SpessaSynthProcessor.prototype.voiceKilling = voiceKilling;
+SpessaSynthProcessor.prototype.getWorkletVoices = getWorkletVoices;
 
 // message port related
 SpessaSynthProcessor.prototype.handleMessage = handleMessage;
@@ -411,7 +417,7 @@ SpessaSynthProcessor.prototype.setPreset = setPreset;
 SpessaSynthProcessor.prototype.setDrums = setDrums;
 SpessaSynthProcessor.prototype.reloadSoundFont = reloadSoundFont;
 SpessaSynthProcessor.prototype.clearSoundFont = clearSoundFont;
-SpessaSynthProcessor.prototype.sampleDump = sampleDump;
+SpessaSynthProcessor.prototype.setEmbeddedSoundFont = setEmbeddedSoundFont;
 SpessaSynthProcessor.prototype.sendPresetList = sendPresetList;
 
 // snapshot related

package/synthetizer/worklet_system/worklet_methods/note_on.js

@@ -1,4 +1,3 @@
-import { getWorkletVoices } from '../worklet_utilities/worklet_voice.js'
 import { generatorTypes } from '../../../soundfont/read_sf2/generators.js'
 import { computeModulators } from '../worklet_utilities/worklet_modulator.js'
 import { WorkletVolumeEnvelope } from '../worklet_utilities/volume_envelope.js'
@@ -45,19 +44,12 @@ export function noteOn(channel, midiNote, velocity, enableDebugging = false, sen
     }
 
     // get voices
-    const voices = getWorkletVoices(
+    const voices = this.getWorkletVoices(
         channel,
         sentMidiNote,
         velocity,
-        channelObject.preset,
+        channelObject,
         startTime,
-        sampleRate,
-        data => this.sampleDump(
-            data.channel,
-            data.sampleID,
-            data.sampleData
-        ),
-        channelObject.cachedVoices,
         enableDebugging
     );
 

package/synthetizer/worklet_system/worklet_methods/program_control.js

@@ -1,6 +1,4 @@
 import { midiControllers } from '../../../midi_parser/midi_message.js'
-import { clearSamplesList } from '../worklet_utilities/worklet_voice.js'
-import { generatorTypes } from '../../../soundfont/read_sf2/generators.js'
 import { returnMessageType } from '../message_protocol/worklet_message.js'
 import { SpessaSynthInfo, SpessaSynthWarn } from '../../../utils/loggin.js'
 import { consoleColors } from '../../../utils/other.js'
@@ -183,13 +181,10 @@ export function sendPresetList()
 export function clearSoundFont(sendPresets = true, clearOverride = true)
 {
     this.stopAllChannels(true);
-    clearSamplesList();
     if(clearOverride)
     {
         delete this.overrideSoundfont;
     }
-    delete this.workletDumpedSamplesList;
-    this.workletDumpedSamplesList = [];
     this.defaultPreset = this.getPreset(0, 0);
     this.drumPreset = this.getPreset(128, 0);
 
@@ -253,44 +248,23 @@ export function reloadSoundFont(buffer, isOverride = false)
 }
 
 /**
- * saves a sample
- * @param channel {number}
- * @param sampleID {number}
- * @param sampleData {Float32Array}
+ * Sets the embedded (RMI soundfont)
+ * @param font {ArrayBuffer}
+ * @param offset {number}
  * @this {SpessaSynthProcessor}
  */
-export function sampleDump(channel, sampleID, sampleData)
+export function setEmbeddedSoundFont(font, offset)
 {
-    this.workletDumpedSamplesList[sampleID] = sampleData;
-    // the sample maybe was loaded after the voice was sent... adjust the end position!
-
-    // not for all channels because the system tells us for what channel this voice was dumped! yay!
-    this.workletProcessorChannels[channel].voices.forEach(v => {
-        if(v.sample.sampleID !== sampleID)
-        {
-            return;
-        }
-        v.sample.end = sampleData.length - 1 + v.generators[generatorTypes.endAddrOffset] + (v.generators[generatorTypes.endAddrsCoarseOffset] * 32768);
-        // calculate for how long the sample has been playing and move the cursor there
-        v.sample.cursor = (v.sample.playbackStep * sampleRate) * (currentTime - v.startTime);
-        if(v.sample.loopingMode === 0) // no loop
-        {
-            if (v.sample.cursor >= v.sample.end)
-            {
-                v.finished = true;
-                return;
-            }
-        }
-        else
-        {
-            // go through modulo (adjust cursor if the sample has looped
-            if(v.sample.cursor > v.sample.loopEnd)
-            {
-                v.sample.cursor = v.sample.cursor % (v.sample.loopEnd - v.sample.loopStart) + v.sample.loopStart - 1;
-            }
-        }
-        // set start time to current!
-        v.startTime = currentTime;
-    })
+    // set offet
+    this.soundfontBankOffset = offset;
+    this.reloadSoundFont(font, true);
+    // preload all samples
+    this.overrideSoundfont.samples.forEach(s => s.getAudioData());
 
+    // apply snapshot again if applicable
+    if(this._snapshot !== undefined)
+    {
+        this.applySynthesizerSnapshot(this._snapshot);
+        this.resetAllControllers();
+    }
 }

package/synthetizer/worklet_system/worklet_methods/voice_control.js

@@ -5,7 +5,7 @@ import { customControllers } from '../worklet_utilities/worklet_processor_channe
 import { WorkletModulationEnvelope } from '../worklet_utilities/modulation_envelope.js'
 import { getSampleLinear, getSampleNearest, interpolationTypes } from '../worklet_utilities/wavetable_oscillator.js'
 import { panVoice } from '../worklet_utilities/stereo_panner.js'
-import { applyLowpassFilter } from '../worklet_utilities/lowpass_filter.js'
+import { WorkletLowpassFilter } from '../worklet_utilities/lowpass_filter.js'
 import { MIN_NOTE_LENGTH } from '../main_processor.js'
 import { WorkletVolumeEnvelope } from '../worklet_utilities/volume_envelope.js'
 
@@ -150,15 +150,15 @@ export function renderVoice(
     // wavetable oscillator
     if(this.interpolationType === interpolationTypes.linear)
     {
-        getSampleLinear(voice, this.workletDumpedSamplesList[voice.sample.sampleID], bufferOut);
+        getSampleLinear(voice, bufferOut);
     }
     else
     {
-        getSampleNearest(voice, this.workletDumpedSamplesList[voice.sample.sampleID], bufferOut);
+        getSampleNearest(voice, bufferOut);
     }
 
     // lowpass filter
-    applyLowpassFilter(voice, bufferOut, lowpassCents);
+    WorkletLowpassFilter.apply(voice, bufferOut, lowpassCents);
 
     // volenv
     WorkletVolumeEnvelope.apply(voice, bufferOut, modLfoCentibels, this.volumeEnvelopeSmoothingFactor);

package/synthetizer/worklet_system/worklet_utilities/lowpass_filter.js

@@ -9,122 +9,166 @@ import { absCentsToHz, decibelAttenuationToGain } from './unit_converter.js'
  * Shoutout to them!
  */
 
-
-/**
- * @typedef {Object} WorkletLowpassFilter
- * @property {number} a0 - filter coefficient 1
- * @property {number} a1 - filter coefficient 2
- * @property {number} a2 - filter coefficient 3
- * @property {number} a3 - filter coefficient 4
- * @property {number} a4 - filter coefficient 5
- * @property {number} x1 - input history 1
- * @property {number} x2 - input history 2
- * @property {number} y1 - output history 1
- * @property {number} y2 - output history 2
- * @property {number} reasonanceCb - reasonance in centibels
- * @property {number} reasonanceGain - resonance gain
- * @property {number} cutoffCents - cutoff frequency in cents
- * @property {number} cutoffHz - cutoff frequency in Hz
- */
-
-/**
- * @type {WorkletLowpassFilter}
- */
-export const DEFAULT_WORKLET_LOWPASS_FILTER = {
-    a0: 0,
-    a1: 0,
-    a2: 0,
-    a3: 0,
-    a4: 0,
-
-    x1: 0,
-    x2: 0,
-    y1: 0,
-    y2: 0,
-
-    reasonanceCb: 0,
-    reasonanceGain: 1,
-    cutoffCents: 13500,
-    cutoffHz: 20000
-}
-
-/**
- * Applies a low-pass filter to the given buffer
- * @param voice {WorkletVoice} the voice we're working on
- * @param outputBuffer {Float32Array} the buffer to apply the filter to
- * @param cutoffCents {number} cutoff frequency in cents
- */
-export function applyLowpassFilter(voice, outputBuffer, cutoffCents)
+export class WorkletLowpassFilter
 {
-    if(cutoffCents > 13499)
-    {
-        return; // filter is open
-    }
-
-    // check if the frequency has changed. if so, calculate new coefficients
-    if(voice.filter.cutoffCents !== cutoffCents || voice.filter.reasonanceCb !== voice.modulatedGenerators[generatorTypes.initialFilterQ])
+    /**
+     * Filter coefficient 1
+     * @type {number}
+     */
+    a0 = 0;
+
+    /**
+     * Filter coefficient 2
+     * @type {number}
+     */
+    a1 = 0;
+
+    /**
+     * Filter coefficient 3
+     * @type {number}
+     */
+    a2 = 0;
+
+    /**
+     * Filter coefficient 4
+     * @type {number}
+     */
+    a3 = 0;
+
+    /**
+     * Filter coefficient 5
+     * @type {number}
+     */
+    a4 = 0;
+
+    /**
+     * Input history 1
+     * @type {number}
+     */
+    x1 = 0;
+
+    /**
+     * Input history 2
+     * @type {number}
+     */
+    x2 = 0;
+
+    /**
+     * Output history 1
+     * @type {number}
+     */
+    y1 = 0;
+
+    /**
+     * Output history 2
+     * @type {number}
+     */
+    y2 = 0;
+
+    /**
+     * Resonance in centibels
+     * @type {number}
+     */
+    reasonanceCb = 0;
+
+    /**
+     * Resonance gain
+     * @type {number}
+     */
+    reasonanceGain = 1;
+
+    /**
+     * Cutoff frequency in cents
+     * @type {number}
+     */
+    cutoffCents = 13500;
+
+    /**
+     * Cutoff frequency in Hz
+     * @type {number}
+     */
+    cutoffHz = 20000;
+
+    /**
+     * Applies a low-pass filter to the given buffer
+     * @param voice {WorkletVoice} the voice we're working on
+     * @param outputBuffer {Float32Array} the buffer to apply the filter to
+     * @param cutoffCents {number} cutoff frequency in cents
+     */
+    static apply(voice, outputBuffer, cutoffCents)
     {
-        voice.filter.cutoffCents = cutoffCents;
-        voice.filter.reasonanceCb = voice.modulatedGenerators[generatorTypes.initialFilterQ];
-        calculateCoefficients(voice);
+        if(cutoffCents > 13499)
+        {
+            return; // filter is open
+        }
+
+        // check if the frequency has changed. if so, calculate new coefficients
+        if(voice.filter.cutoffCents !== cutoffCents || voice.filter.reasonanceCb !== voice.modulatedGenerators[generatorTypes.initialFilterQ])
+        {
+            voice.filter.cutoffCents = cutoffCents;
+            voice.filter.reasonanceCb = voice.modulatedGenerators[generatorTypes.initialFilterQ];
+            WorkletLowpassFilter.calculateCoefficients(voice);
+        }
+
+        // filter the input
+        for (let i = 0; i < outputBuffer.length; i++)
+        {
+            let input = outputBuffer[i];
+            let filtered = voice.filter.a0 * input
+                + voice.filter.a1 * voice.filter.x1
+                + voice.filter.a2 * voice.filter.x2
+                - voice.filter.a3 * voice.filter.y1
+                - voice.filter.a4 * voice.filter.y2;
+
+            // set buffer
+            voice.filter.x2 = voice.filter.x1;
+            voice.filter.x1 = input;
+            voice.filter.y2 = voice.filter.y1;
+            voice.filter.y1 = filtered;
+
+            outputBuffer[i] = filtered;
+        }
     }
 
-    // filter the input
-    for (let i = 0; i < outputBuffer.length; i++) {
-        let input = outputBuffer[i];
-        let filtered = voice.filter.a0 * input
-            + voice.filter.a1 * voice.filter.x1
-            + voice.filter.a2 * voice.filter.x2
-            - voice.filter.a3 * voice.filter.y1
-            - voice.filter.a4 * voice.filter.y2;
-
-        // set buffer
-        voice.filter.x2 = voice.filter.x1;
-        voice.filter.x1 = input;
-        voice.filter.y2 = voice.filter.y1;
-        voice.filter.y1 = filtered;
-
-        outputBuffer[i] = filtered;
-    }
-}
-
-/**
- * @param voice {WorkletVoice}
- */
-function calculateCoefficients(voice)
-{
-    voice.filter.cutoffHz = absCentsToHz(voice.filter.cutoffCents);
-
-    // fix cutoff on low frequencies (fluid_iir_filter.c line 392)
-    if(voice.filter.cutoffHz > 0.45 * sampleRate)
+    /**
+     * @param voice {WorkletVoice}
+     */
+    static calculateCoefficients(voice)
     {
-        voice.filter.cutoffHz = 0.45 * sampleRate;
+        voice.filter.cutoffHz = absCentsToHz(voice.filter.cutoffCents);
+
+        // fix cutoff on low frequencies (fluid_iir_filter.c line 392)
+        if(voice.filter.cutoffHz > 0.45 * sampleRate)
+        {
+            voice.filter.cutoffHz = 0.45 * sampleRate;
+        }
+
+        // adjust the filterQ (fluid_iir_filter.c line 204)
+        const qDb = (voice.filter.reasonanceCb / 10) - 3.01;
+        voice.filter.reasonanceGain = decibelAttenuationToGain(-1 * qDb); // -1 because it's attenuation and we don't want attenuation
+
+        // reduce the gain by the Q factor (fluid_iir_filter.c line 250)
+        const qGain = 1 / Math.sqrt(voice.filter.reasonanceGain);
+
+
+        // code is ported from https://github.com/sinshu/meltysynth/ to work with js.
+        // I'm too dumb to understand the math behind this...
+        let w = 2 * Math.PI * voice.filter.cutoffHz / sampleRate; // we're in the audioworkletglobalscope so we can use sampleRate
+        let cosw = Math.cos(w);
+        let alpha = Math.sin(w) / (2 * voice.filter.reasonanceGain);
+
+        let b1 = (1 - cosw) * qGain;
+        let b0 = b1 / 2;
+        let b2 = b0;
+        let a0 = 1 + alpha;
+        let a1 = -2 * cosw;
+        let a2 = 1 - alpha;
+
+        // set coefficients
+        voice.filter.a0 = b0 / a0;
+        voice.filter.a1 = b1 / a0;
+        voice.filter.a2 = b2 / a0;
+        voice.filter.a3 = a1 / a0;
+        voice.filter.a4 = a2 / a0;
     }
-
-    // adjust the filterQ (fluid_iir_filter.c line 204)
-    const qDb = (voice.filter.reasonanceCb / 10) - 3.01;
-    voice.filter.reasonanceGain = decibelAttenuationToGain(-1 * qDb); // -1 because it's attenuation and we don't want attenuation
-
-    // reduce the gain by the Q factor (fluid_iir_filter.c line 250)
-    const qGain = 1 / Math.sqrt(voice.filter.reasonanceGain);
-
-
-    // code is ported from https://github.com/sinshu/meltysynth/ to work with js. I'm too dumb to understand the math behind this...
-    let w = 2 * Math.PI * voice.filter.cutoffHz / sampleRate; // we're in the audioworkletglobalscope so we can use sampleRate
-    let cosw = Math.cos(w);
-    let alpha = Math.sin(w) / (2 * voice.filter.reasonanceGain);
-
-    let b1 = (1 - cosw) * qGain;
-    let b0 = b1 / 2;
-    let b2 = b0;
-    let a0 = 1 + alpha;
-    let a1 = -2 * cosw;
-    let a2 = 1 - alpha;
-
-    // set coefficients
-    voice.filter.a0 = b0 / a0;
-    voice.filter.a1 = b1 / a0;
-    voice.filter.a2 = b2 / a0;
-    voice.filter.a3 = a1 / a0;
-    voice.filter.a4 = a2 / a0;
 }

package/synthetizer/worklet_system/worklet_utilities/wavetable_oscillator.js

@@ -16,17 +16,17 @@ export const interpolationTypes = {
 /**
  * Fills the output buffer with raw sample data using linear interpolation
  * @param voice {WorkletVoice} the voice we're working on
- * @param sampleData {Float32Array} the sample data to write with
  * @param outputBuffer {Float32Array} the output buffer to write to
  */
-export function getSampleLinear(voice, sampleData, outputBuffer)
+export function getSampleLinear(voice, outputBuffer)
 {
     let cur = voice.sample.cursor;
     const loop = (voice.sample.loopingMode === 1) || (voice.sample.loopingMode === 3 && !voice.isInRelease);
-    const loopLength = voice.sample.loopEnd - voice.sample.loopStart;
+    const sampleData = voice.sample.sampleData;
 
     if(loop)
     {
+        const loopLength = voice.sample.loopEnd - voice.sample.loopStart;
         for (let i = 0; i < outputBuffer.length; i++)
         {
             // check for loop
@@ -44,11 +44,6 @@ export function getSampleLinear(voice, sampleData, outputBuffer)
                 ceil -= loopLength;
             }
 
-            // nearest neighbor (uncomment to use)
-            // outputBuffer[i] = sampleData[ceil];
-            // cur += voice.sample.playbackStep * voice.currentTuningCalculated;
-            // continue;
-
             const fraction = cur - floor;
 
             // grab the samples and interpolate
@@ -73,7 +68,8 @@ export function getSampleLinear(voice, sampleData, outputBuffer)
         {
             voice.sample.end = sampleData.length - 1;
         }
-        for (let i = 0; i < outputBuffer.length; i++) {
+        for (let i = 0; i < outputBuffer.length; i++)
+        {
 
             // linear interpolation
             const floor = ~~cur;
@@ -86,11 +82,6 @@ export function getSampleLinear(voice, sampleData, outputBuffer)
                 return;
             }
 
-            // nearest neighbor (uncomment to use)
-            // outputBuffer[i] = sampleData[ceil];
-            // cur += voice.sample.playbackStep * voice.currentTuningCalculated;
-            // continue;
-
             const fraction = cur - floor;
 
             // grab the samples and interpolate
@@ -107,15 +98,14 @@ export function getSampleLinear(voice, sampleData, outputBuffer)
 /**
  * Fills the output buffer with raw sample data using no interpolation (nearest neighbor)
  * @param voice {WorkletVoice} the voice we're working on
- * @param sampleData {Float32Array} the sample data to write with
  * @param outputBuffer {Float32Array} the output buffer to write to
  */
-export function getSampleNearest(voice, sampleData, outputBuffer)
+export function getSampleNearest(voice, outputBuffer)
 {
     let cur = voice.sample.cursor;
     const loop = (voice.sample.loopingMode === 1) || (voice.sample.loopingMode === 3 && !voice.isInRelease);
     const loopLength = voice.sample.loopEnd - voice.sample.loopStart;
-
+    const sampleData = voice.sample.sampleData;
     if(loop)
     {
         for (let i = 0; i < outputBuffer.length; i++)