spessasynth_lib 3.14.5 → 3.15.0

package/@types/soundfont/read/presets.d.ts

@@ -31,7 +31,7 @@ export class Preset {
         instrumentGenerators: Generator[];
         presetGenerators: Generator[];
         modulators: Modulator[];
-        sample: Sample;
+        sample: LoadedSample;
         sampleID: number;
     }[][][];
     library: number;
@@ -63,7 +63,7 @@ export class Preset {
      *  instrumentGenerators: Generator[],
      *  presetGenerators: Generator[],
      *  modulators: Modulator[],
-     *  sample: Sample,
+     *  sample: LoadedSample,
      *  sampleID: number,
      * }} SampleAndGenerators
      */
@@ -77,11 +77,11 @@ export class Preset {
         instrumentGenerators: Generator[];
         presetGenerators: Generator[];
         modulators: Modulator[];
-        sample: Sample;
+        sample: LoadedSample;
         sampleID: number;
     }[];
 }
 import { RiffChunk } from "./riff_chunk.js";
 import { PresetZone } from "./zones.js";
 import { Generator } from './generators.js';
-import { Sample } from "./samples.js";
+import { LoadedSample } from "./samples.js";

package/@types/soundfont/read/samples.d.ts

@@ -1,10 +1,11 @@
 /**
  * Reads the generatorTranslator from the shdr read
  * @param sampleHeadersChunk {RiffChunk}
- * @param smplChunkData {IndexedByteArray}
- * @returns {Sample[]}
+ * @param smplChunkData {IndexedByteArray|Float32Array}
+ * @param isSmplDataRaw {boolean}
+ * @returns {LoadedSample[]}
  */
-export function readSamples(sampleHeadersChunk: RiffChunk, smplChunkData: IndexedByteArray): Sample[];
+export function readSamples(sampleHeadersChunk: RiffChunk, smplChunkData: IndexedByteArray | Float32Array, isSmplDataRaw?: boolean): LoadedSample[];
 /**
  * samples.js
  * purpose: parses soundfont samples, resamples if needed.
@@ -87,7 +88,7 @@ export class BasicSample {
      */
     getAudioData(): Float32Array;
 }
-export class Sample extends BasicSample {
+export class LoadedSample extends BasicSample {
     /**
      * Creates a sample
      * @param sampleName {string}
@@ -100,18 +101,21 @@ export class Sample extends BasicSample {
      * @param samplePitchCorrection {number}
      * @param sampleLink {number}
      * @param sampleType {number}
-     * @param smplArr {IndexedByteArray}
+     * @param smplArr {IndexedByteArray|Float32Array}
      * @param sampleIndex {number} initial sample index when loading the sfont
+     * @param isDataRaw {boolean} if false, the data is decoded as float32.
+     * Used for SF2Pack support
      */
-    constructor(sampleName: string, sampleStartIndex: number, sampleEndIndex: number, sampleLoopStartIndex: number, sampleLoopEndIndex: number, sampleRate: number, samplePitch: number, samplePitchCorrection: number, sampleLink: number, sampleType: number, smplArr: IndexedByteArray, sampleIndex: number);
+    constructor(sampleName: string, sampleStartIndex: number, sampleEndIndex: number, sampleLoopStartIndex: number, sampleLoopEndIndex: number, sampleRate: number, samplePitch: number, samplePitchCorrection: number, sampleLink: number, sampleType: number, smplArr: IndexedByteArray | Float32Array, sampleIndex: number, isDataRaw: boolean);
     sampleStartIndex: number;
     sampleEndIndex: number;
     isSampleLoaded: boolean;
     sampleID: number;
     useCount: number;
     sampleLength: number;
-    sampleDataArray: IndexedByteArray;
+    sampleDataArray: Float32Array | IndexedByteArray;
     sampleData: Float32Array;
+    isDataRaw: boolean;
     /**
      * Get raw data, whether it's compressed or not as we simply write it to the file
      * @return {Uint8Array}
@@ -128,7 +132,7 @@ export class Sample extends BasicSample {
     /**
      * @returns {Float32Array}
      */
-    loadBufferData(): Float32Array;
+    getUncompressedReadyData(): Float32Array;
 }
 import { RiffChunk } from "./riff_chunk.js";
 import { IndexedByteArray } from "../../utils/indexed_array.js";

package/@types/soundfont/read/zones.d.ts

@@ -3,10 +3,10 @@
  * @param zonesChunk {RiffChunk}
  * @param instrumentGenerators {Generator[]}
  * @param instrumentModulators {Modulator[]}
- * @param instrumentSamples {Sample[]}
+ * @param instrumentSamples {LoadedSample[]}
  * @returns {InstrumentZone[]}
  */
-export function readInstrumentZones(zonesChunk: RiffChunk, instrumentGenerators: Generator[], instrumentModulators: Modulator[], instrumentSamples: Sample[]): InstrumentZone[];
+export function readInstrumentZones(zonesChunk: RiffChunk, instrumentGenerators: Generator[], instrumentModulators: Modulator[], instrumentSamples: LoadedSample[]): InstrumentZone[];
 /**
  * Reads the given preset zone read
  * @param zonesChunk {RiffChunk}
@@ -64,10 +64,10 @@ export class InstrumentZone {
     getModulators(modulators: Modulator[]): void;
     /**
      * Loads the zone's sample
-     * @param samples {Sample[]}
+     * @param samples {LoadedSample[]}
      */
-    getSample(samples: Sample[]): void;
-    sample: Sample;
+    getSample(samples: LoadedSample[]): void;
+    sample: LoadedSample;
     /**
      * Reads the keyRange of the zone
      */
@@ -136,6 +136,6 @@ export class PresetZone {
 import { RiffChunk } from "./riff_chunk.js";
 import { Generator } from "./generators.js";
 import { Modulator } from "./modulators.js";
-import { Sample } from "./samples.js";
+import { LoadedSample } from "./samples.js";
 import { Instrument } from "./instruments.js";
 import { IndexedByteArray } from "../../utils/indexed_array.js";

package/@types/soundfont/soundfont.d.ts

@@ -25,7 +25,7 @@ export class SoundFont2 {
     };
     dataArray: IndexedByteArray;
     sampleDataStartIndex: number;
-    samples: import("./read/samples.js").Sample[];
+    samples: import("./read/samples.js").LoadedSample[];
     /**
      * read all the instruments
      * @type {Instrument[]}
@@ -37,9 +37,9 @@ export class SoundFont2 {
      */
     deleteInstrument(instrument: Instrument): void;
     /**
-     * @param sample {Sample}
+     * @param sample {LoadedSample}
      */
-    deleteSample(sample: Sample): void;
+    deleteSample(sample: LoadedSample): void;
     /**
      * @param preset {Preset}
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spessasynth_lib",
-  "version": "3.14.5",
+  "version": "3.15.0",
   "description": "No compromise MIDI and SoundFont2 Synthesizer library",
   "browser": "index.js",
   "types": "@types/index.d.ts",

package/soundfont/read/presets.js

@@ -1,7 +1,7 @@
 import {RiffChunk} from "./riff_chunk.js";
 import {PresetZone} from "./zones.js";
 import {readBytesAsUintLittleEndian} from "../../utils/byte_functions/little_endian.js";
-import {Sample} from "./samples.js";
+import {LoadedSample} from "./samples.js";
 import { Generator, generatorTypes } from './generators.js'
 import { defaultModulators } from './modulators.js'
 import { readBytesAsString } from '../../utils/byte_functions/string.js'
@@ -114,7 +114,7 @@ export class Preset {
      *  instrumentGenerators: Generator[],
      *  presetGenerators: Generator[],
      *  modulators: Modulator[],
-     *  sample: Sample,
+     *  sample: LoadedSample,
      *  sampleID: number,
      * }} SampleAndGenerators
      */

package/soundfont/read/samples.js

@@ -111,7 +111,8 @@ export class BasicSample
             return;
         }
         // compress, always mono!
-        try {
+        try
+        {
             this.compressedData = encodeVorbis([this.getAudioData()], 1, this.sampleRate, quality);
             // flag as compressed
             this.sampleType |= 0x10;
@@ -138,7 +139,7 @@ export class BasicSample
     }
 }
 
-export class Sample extends BasicSample
+export class LoadedSample extends BasicSample
 {
     /**
      * Creates a sample
@@ -152,8 +153,10 @@ export class Sample extends BasicSample
      * @param samplePitchCorrection {number}
      * @param sampleLink {number}
      * @param sampleType {number}
-     * @param smplArr {IndexedByteArray}
+     * @param smplArr {IndexedByteArray|Float32Array}
      * @param sampleIndex {number} initial sample index when loading the sfont
+     * @param isDataRaw {boolean} if false, the data is decoded as float32.
+     * Used for SF2Pack support
      */
     constructor(sampleName,
                 sampleStartIndex,
@@ -166,7 +169,8 @@ export class Sample extends BasicSample
                 sampleLink,
                 sampleType,
                 smplArr,
-                sampleIndex
+                sampleIndex,
+                isDataRaw,
                 )
     {
         super(
@@ -197,7 +201,7 @@ export class Sample extends BasicSample
             this.sampleLoopEndIndex += this.sampleStartIndex;
             this.sampleLength = 99999999; // set to 999999 before we decode it
         }
-
+        this.isDataRaw = isDataRaw;
     }
 
     /**
@@ -218,6 +222,10 @@ export class Sample extends BasicSample
         }
         else
         {
+            if(!this.isDataRaw)
+            {
+                throw new Error("Writing SF2Pack samples is not supported.");
+            }
             const dataStartIndex = smplArr.currentIndex;
             return smplArr.slice(dataStartIndex + this.sampleStartIndex, dataStartIndex + this.sampleEndIndex)
         }
@@ -255,7 +263,24 @@ export class Sample extends BasicSample
         if (!this.isSampleLoaded)
         {
             // start loading data if not loaded
-            return this.loadBufferData();
+            if (this.sampleLength < 1)
+            {
+                // eos, do not do anything
+                return new Float32Array(1);
+            }
+
+            if(this.isCompressed)
+            {
+                // if compressed, decode
+                this.decodeVorbis();
+                this.isSampleLoaded = true;
+                return this.sampleData;
+            }
+            else if(!this.isDataRaw)
+            {
+                return this.getUncompressedReadyData();
+            }
+            return this.loadUncompressedData();
         }
         return this.sampleData;
     }
@@ -293,40 +318,36 @@ export class Sample extends BasicSample
     /**
      * @returns {Float32Array}
      */
-    loadBufferData()
+    getUncompressedReadyData()
     {
-        if (this.sampleLength < 1)
-        {
-            // eos, do not do anything
-            return new Float32Array(1);
-        }
-
-        if(this.isCompressed)
-        {
-            this.decodeVorbis();
-            this.isSampleLoaded = true;
-            return this.sampleData;
-        }
-        return this.loadUncompressedData();
+        /**
+         * read the sample data
+         * @type {Float32Array}
+         */
+        let audioData = this.sampleDataArray.slice(this.sampleStartIndex / 2, this.sampleEndIndex / 2);
+        this.sampleData = audioData;
+        this.isSampleLoaded = true;
+        return audioData;
     }
 }
 
 /**
  * Reads the generatorTranslator from the shdr read
  * @param sampleHeadersChunk {RiffChunk}
- * @param smplChunkData {IndexedByteArray}
- * @returns {Sample[]}
+ * @param smplChunkData {IndexedByteArray|Float32Array}
+ * @param isSmplDataRaw {boolean}
+ * @returns {LoadedSample[]}
  */
-export function readSamples(sampleHeadersChunk, smplChunkData)
+export function readSamples(sampleHeadersChunk, smplChunkData, isSmplDataRaw = true)
 {
     /**
-     * @type {Sample[]}
+     * @type {LoadedSample[]}
      */
     let samples = [];
     let index = 0;
     while(sampleHeadersChunk.chunkData.length > sampleHeadersChunk.chunkData.currentIndex)
     {
-        const sample = readSample(index, sampleHeadersChunk.chunkData, smplChunkData);
+        const sample = readSample(index, sampleHeadersChunk.chunkData, smplChunkData, isSmplDataRaw);
         samples.push(sample);
         index++;
     }
@@ -342,10 +363,11 @@ export function readSamples(sampleHeadersChunk, smplChunkData)
  * Reads it into a sample
  * @param index {number}
  * @param sampleHeaderData {IndexedByteArray}
- * @param smplArrayData {IndexedByteArray}
- * @returns {Sample}
+ * @param smplArrayData {IndexedByteArray|Float32Array}
+ * @param isDataRaw {boolean} true means binary 16 bit data, false means float32
+ * @returns {LoadedSample}
  */
-function readSample(index, sampleHeaderData, smplArrayData) {
+function readSample(index, sampleHeaderData, smplArrayData, isDataRaw) {
 
     // read the sample name
     let sampleName = readBytesAsString(sampleHeaderData, 20);
@@ -383,7 +405,7 @@ function readSample(index, sampleHeaderData, smplArrayData) {
 
 
 
-    return new Sample(sampleName,
+    return new LoadedSample(sampleName,
         sampleStartIndex,
         sampleEndIndex,
         sampleLoopStartIndex,
@@ -394,5 +416,6 @@ function readSample(index, sampleHeaderData, smplArrayData) {
         sampleLink,
         sampleType,
         smplArrayData,
-        index);
+        index,
+        isDataRaw);
 }

package/soundfont/read/zones.js

@@ -2,7 +2,7 @@ import {readBytesAsUintLittleEndian} from "../../utils/byte_functions/little_end
 import {IndexedByteArray} from "../../utils/indexed_array.js";
 import {RiffChunk} from "./riff_chunk.js";
 import {Generator, generatorTypes} from "./generators.js";
-import {Sample} from "./samples.js";
+import {LoadedSample} from "./samples.js";
 import {Instrument} from "./instruments.js";
 import {Modulator} from "./modulators.js";
 
@@ -81,7 +81,7 @@ export class InstrumentZone {
 
     /**
      * Loads the zone's sample
-     * @param samples {Sample[]}
+     * @param samples {LoadedSample[]}
      */
     getSample(samples)
     {
@@ -126,7 +126,7 @@ export class InstrumentZone {
  * @param zonesChunk {RiffChunk}
  * @param instrumentGenerators {Generator[]}
  * @param instrumentModulators {Modulator[]}
- * @param instrumentSamples {Sample[]}
+ * @param instrumentSamples {LoadedSample[]}
  * @returns {InstrumentZone[]}
  */
 export function readInstrumentZones(zonesChunk, instrumentGenerators, instrumentModulators, instrumentSamples)

package/soundfont/soundfont.js

@@ -11,6 +11,7 @@ import { consoleColors } from '../utils/other.js'
 import { SpessaSynthGroup, SpessaSynthGroupEnd, SpessaSynthInfo, SpessaSynthWarn } from '../utils/loggin.js'
 import { readBytesAsString } from '../utils/byte_functions/string.js'
 import { write } from './write/write.js'
+import { stbvorbis } from "../externals/stbvorbis_sync/stbvorbis_sync.min.js";
 
 /**
  * soundfont.js
@@ -42,7 +43,13 @@ class SoundFont2
         let firstChunk = readRIFFChunk(this.dataArray, false);
         this.verifyHeader(firstChunk, "riff");
 
-        this.verifyText(readBytesAsString(this.dataArray,4), "sfbk");
+        const type = readBytesAsString(this.dataArray,4).toLowerCase();
+        if(type !== "sfbk" && type !== "sfpk")
+        {
+            SpessaSynthGroupEnd();
+            throw new SyntaxError(`Invalid soundFont! Expected "sfbk" or "sfpk" got "${type}"`);
+        }
+        const isSF2Pack = type === "sfpk";
 
         // INFO
         let infoChunk = readRIFFChunk(this.dataArray);
@@ -88,7 +95,39 @@ class SoundFont2
         SpessaSynthInfo("%cVerifying smpl chunk...", consoleColors.warn)
         let sampleDataChunk = readRIFFChunk(this.dataArray, false);
         this.verifyHeader(sampleDataChunk, "smpl");
-        this.sampleDataStartIndex = this.dataArray.currentIndex;
+        /**
+         * @type {IndexedByteArray|Float32Array}
+         */
+        let sampleData;
+        // SF2Pack: the entire data is compressed
+        if(isSF2Pack)
+        {
+            SpessaSynthInfo("%cSF2Pack detected, attempting to decode the smpl chunk...",
+                consoleColors.info);
+            try
+            {
+                /**
+                 * @type {Float32Array}
+                 */
+                sampleData = stbvorbis.decode(this.dataArray.buffer.slice(this.dataArray.currentIndex, this.dataArray.currentIndex + sdtaChunk.size - 12)).data[0];
+            }
+            catch (e)
+            {
+                SpessaSynthGroupEnd();
+                throw new Error(`SF2Pack Ogg Vorbis decode error: ${e}`);
+            }
+            SpessaSynthInfo(`%cDecoded the smpl chunk! Length: %c${sampleData.length}`,
+                consoleColors.info,
+                consoleColors.value);
+        }
+        else
+        {
+            /**
+             * @type {IndexedByteArray}
+             */
+            sampleData = this.dataArray;
+            this.sampleDataStartIndex = this.dataArray.currentIndex;
+        }
 
         SpessaSynthInfo(`%cSkipping sample chunk, length: %c${sdtaChunk.size - 12}`,
             consoleColors.info,
@@ -133,8 +172,8 @@ class SoundFont2
          * read all the samples
          * (the current index points to start of the smpl read)
          */
-        this.dataArray.currentIndex = this.sampleDataStartIndex
-        this.samples = readSamples(presetSamplesChunk, this.dataArray);
+        this.dataArray.currentIndex = this.sampleDataStartIndex;
+        this.samples = readSamples(presetSamplesChunk, sampleData, !isSF2Pack);
 
         /**
          * read all the instrument generators
@@ -195,6 +234,11 @@ class SoundFont2
             consoleColors.recognized,
             consoleColors.info);
         SpessaSynthGroupEnd();
+
+        if(isSF2Pack)
+        {
+            delete this.dataArray;
+        }
     }
 
     removeUnusedElements()
@@ -224,7 +268,7 @@ class SoundFont2
     }
 
     /**
-     * @param sample {Sample}
+     * @param sample {LoadedSample}
      */
     deleteSample(sample)
     {