spessasynth_core 3.26.30 → 3.26.32

package/src/soundfont/basic_soundfont/write_sf2/write.js

@@ -1,6 +1,6 @@
-import { combineArrays, IndexedByteArray } from "../../../utils/indexed_array.js";
-import { RiffChunk, writeRIFFChunk, writeRIFFOddSize } from "../riff_chunk.js";
-import { writeStringAsBytes } from "../../../utils/byte_functions/string.js";
+import { IndexedByteArray } from "../../../utils/indexed_array.js";
+import { writeRIFFChunkParts, writeRIFFChunkRaw } from "../riff_chunk.js";
+import { getStringBytes } from "../../../utils/byte_functions/string.js";
 import { consoleColors } from "../../../utils/other.js";
 import { getIGEN } from "./igen.js";
 import { getSDTA } from "./sdta.js";
@@ -109,11 +109,7 @@ export function write(options = DEFAULT_WRITE_OPTIONS)
             const ckdata = new IndexedByteArray(4);
             writeWord(ckdata, major);
             writeWord(ckdata, minor);
-            infoArrays.push(writeRIFFChunk(new RiffChunk(
-                type,
-                4,
-                ckdata
-            )));
+            infoArrays.push(writeRIFFChunkRaw(type, ckdata));
         }
         else if (type === "DMOD")
         {
@@ -139,22 +135,14 @@ export function write(options = DEFAULT_WRITE_OPTIONS)
             // terminal modulator, is zero
             writeLittleEndian(dmoddata, 0, MOD_BYTE_SIZE);
             
-            infoArrays.push(writeRIFFChunk(new RiffChunk(
-                type,
-                dmoddata.length,
-                dmoddata
-            )));
+            infoArrays.push(writeRIFFChunkRaw(type, dmoddata));
         }
         else
         {
-            // pad with zero
-            const arr = new IndexedByteArray(data.length + 1);
-            writeStringAsBytes(arr, data);
-            infoArrays.push(writeRIFFChunk(new RiffChunk(
+            infoArrays.push(writeRIFFChunkRaw(
                 type,
-                arr.length,
-                arr
-            )));
+                getStringBytes(data, true, true) // pad with zero and ensure even length
+            ));
         }
     }
     
@@ -206,6 +194,10 @@ export function write(options = DEFAULT_WRITE_OPTIONS)
         consoleColors.info
     );
     const instChunk = getINST.call(this);
+    SpessaSynthInfo(
+        "%cWriting PGEN...",
+        consoleColors.info
+    );
     // presets
     const pgenChunk = getPGEN.call(this);
     SpessaSynthInfo(
@@ -228,21 +220,17 @@ export function write(options = DEFAULT_WRITE_OPTIONS)
      */
     const chunks = [phdrChunk, pbagChunk, pmodChunk, pgenChunk, instChunk, ibagChunk, imodChunk, igenChunk, shdrChunk];
     // combine in the sfspec order
-    const pdtaData = combineArrays([
-        new IndexedByteArray([112, 100, 116, 97]), // "pdta"
-        ...chunks.map(c => c.pdta)
-    ]);
-    const pdtaChunk = writeRIFFChunk(new RiffChunk(
-        "LIST",
-        pdtaData.length,
-        pdtaData
-    ));
+    const pdtaChunk = writeRIFFChunkParts(
+        "pdta",
+        chunks.map(c => c.pdta),
+        true
+    );
     const maxIndex = Math.max(
         ...chunks.map(c => c.highestIndex)
     );
     
     const writeXdta = options.writeExtendedLimits && (
-        maxIndex > 0xFFF
+        maxIndex > 0xFFFF
         || this.presets.some(p => p.presetName.length > 20)
         || this.instruments.some(i => i.instrumentName.length > 20)
         || this.samples.some(s => s.sampleName.length > 20)
@@ -256,37 +244,20 @@ export function write(options = DEFAULT_WRITE_OPTIONS)
             consoleColors.value
         );
         // https://github.com/spessasus/soundfont-proposals/blob/main/extended_limits.md
-        const xpdtaData = combineArrays([
-            new IndexedByteArray([120, 100, 116, 97]), // "xdta"
-            ...chunks.map(c => c.xdta)
-        ]);
-        
-        const xpdtaChunk = writeRIFFChunk(new RiffChunk(
-            "LIST",
-            xpdtaData.length,
-            xpdtaData
-        ));
+        const xpdtaChunk = writeRIFFChunkParts("xdta", chunks.map(c => c.xdta), true);
         infoArrays.push(xpdtaChunk);
     }
     
-    const infoChunk = writeRIFFOddSize("INFO", combineArrays(infoArrays), false, true);
+    const infoChunk = writeRIFFChunkParts("INFO", infoArrays, true);
     SpessaSynthInfo(
         "%cWriting the output file...",
         consoleColors.info
     );
     // finally, combine everything
-    const riffdata = combineArrays([
-        new IndexedByteArray([115, 102, 98, 107]), // "sfbk"
-        infoChunk,
-        sdtaChunk,
-        pdtaChunk
-    ]);
-    
-    const main = writeRIFFChunk(new RiffChunk(
+    const main = writeRIFFChunkParts(
         "RIFF",
-        riffdata.length,
-        riffdata
-    ));
+        [getStringBytes("sfbk"), infoChunk, sdtaChunk, pdtaChunk]
+    );
     SpessaSynthInfo(
         `%cSaved succesfully! Final file size: %c${main.length}`,
         consoleColors.info,

package/src/soundfont/dls/dls_soundfont.js

@@ -8,7 +8,6 @@ import { readLittleEndian } from "../../utils/byte_functions/little_endian.js";
 import { readDLSInstrumentList } from "./read_instrument_list.js";
 import { readDLSInstrument } from "./read_instrument.js";
 import { readLart } from "./read_lart.js";
-import { readRegion } from "./read_region.js";
 import { readDLSSamples } from "./read_samples.js";
 
 class DLSSoundFont extends BasicSoundBank
@@ -45,7 +44,7 @@ class DLSSoundFont extends BasicSoundBank
         
         // mandatory
         this.soundFontInfo["ifil"] = "2.1"; // always for dls
-        this.soundFontInfo["isng"] = "EMU8000";
+        this.soundFontInfo["isng"] = "E-mu 10K2";
         
         // set some defaults
         this.soundFontInfo["INAM"] = "Unnamed DLS";
@@ -178,7 +177,6 @@ class DLSSoundFont extends BasicSoundBank
 
 DLSSoundFont.prototype.readDLSInstrumentList = readDLSInstrumentList;
 DLSSoundFont.prototype.readDLSInstrument = readDLSInstrument;
-DLSSoundFont.prototype.readRegion = readRegion;
 DLSSoundFont.prototype.readLart = readLart;
 DLSSoundFont.prototype.readDLSSamples = readDLSSamples;
 

package/src/soundfont/dls/read_instrument.js

@@ -7,6 +7,7 @@ import { consoleColors } from "../../utils/other.js";
 import { Modulator } from "../basic_soundfont/modulator.js";
 import { DEFAULT_DLS_CHORUS, DEFAULT_DLS_REVERB } from "./dls_sources.js";
 import { generatorLimits, generatorTypes } from "../basic_soundfont/generator_types.js";
+import { readRegion } from "./read_region.js";
 
 /**
  * @this {DLSSoundFont}
@@ -40,7 +41,7 @@ export function readDLSInstrument(chunk)
     const preset = new DLSPreset(this, ulBank, ulInstrument);
     
     // read preset name in INFO
-    let presetName = "unnamedPreset";
+    let presetName = ``;
     const infoChunk = findRIFFListType(chunks, "INFO");
     if (infoChunk)
     {
@@ -51,6 +52,10 @@ export function readDLSInstrument(chunk)
         }
         presetName = readBytesAsString(info.chunkData, info.chunkData.length).trim();
     }
+    if (presetName.length < 1)
+    {
+        presetName = `unnamed ${(ulBank >> 8) & 127}:${ulInstrument & 127}`;
+    }
     preset.presetName = presetName;
     preset.dlsInstrument.instrumentName = presetName;
     SpessaSynthGroupCollapsed(
@@ -105,8 +110,7 @@ export function readDLSInstrument(chunk)
         }
         
         
-        const zone = preset.dlsInstrument.createZone();
-        this.readRegion(chunk, zone);
+        readRegion.call(this, chunk, preset.dlsInstrument);
     }
     this.addPresets(preset);
     this.addInstruments(preset.dlsInstrument);

package/src/soundfont/dls/read_region.js

@@ -2,13 +2,14 @@ import { readLittleEndian, signedInt16 } from "../../utils/byte_functions/little
 import { findRIFFListType, readRIFFChunk } from "../basic_soundfont/riff_chunk.js";
 import { Generator } from "../basic_soundfont/generator.js";
 import { generatorTypes } from "../basic_soundfont/generator_types.js";
+import { SpessaSynthWarn } from "../../utils/loggin.js";
 
 /**
  * @this {DLSSoundFont}
  * @param chunk {RiffChunk}
- * @param zone {DLSZone}
+ * @param instrument {DLSInstrument}
  */
-export function readRegion(chunk, zone)
+export function readRegion(chunk, instrument)
 {
     // regions are essentially instrument zones
     
@@ -24,6 +25,12 @@ export function readRegion(chunk, zone)
     
     // region header
     const regionHeader = regionChunks.find(c => c.header === "rgnh");
+    
+    if (!regionHeader)
+    {
+        SpessaSynthWarn("Invalid DLS region: missing 'rgnh' chunk! Discarding...");
+        return;
+    }
     // key range
     let keyMin = readLittleEndian(regionHeader.chunkData, 2);
     let keyMax = readLittleEndian(regionHeader.chunkData, 2);
@@ -38,7 +45,8 @@ export function readRegion(chunk, zone)
         velMin = 0;
     }
     // cannot do the same to key zones sadly
-    
+    // create zone
+    const zone = instrument.createZone();
     // apply ranges
     zone.keyRange = { min: keyMin, max: keyMax };
     zone.velRange = { min: velMin, max: velMax };

package/src/soundfont/read_sf2/samples.js

@@ -2,9 +2,10 @@ import { RiffChunk } from "../basic_soundfont/riff_chunk.js";
 import { IndexedByteArray } from "../../utils/indexed_array.js";
 import { readLittleEndian, signedInt8 } from "../../utils/byte_functions/little_endian.js";
 import { stbvorbis } from "../../externals/stbvorbis_sync/stbvorbis_sync.min.js";
-import { SpessaSynthWarn } from "../../utils/loggin.js";
+import { SpessaSynthInfo, SpessaSynthWarn } from "../../utils/loggin.js";
 import { readBytesAsString } from "../../utils/byte_functions/string.js";
 import { BasicSample, sampleTypes } from "../basic_soundfont/basic_sample.js";
+import { consoleColors } from "../../utils/other.js";
 
 export const SF3_BIT_FLIT = 0x10;
 
@@ -139,7 +140,8 @@ export class SoundFontSample extends BasicSample
         const linkedSample = samplesArray[this.linkedSampleIndex];
         if (!linkedSample)
         {
-            SpessaSynthWarn(`Invalid linked sample for ${this.sampleName}. Setting to mono.`);
+            // log as info because it's common and not really dangerous
+            SpessaSynthInfo(`%cInvalid linked sample for ${this.sampleName}. Setting to mono.`, consoleColors.warn);
             this.setSampleType(sampleTypes.monoSample);
         }
         else
@@ -259,9 +261,13 @@ export class SoundFontSample extends BasicSample
         }
         else
         {
-            if (this.compressedData && allowVorbis)
+            if (this.compressedData)
             {
-                return this.compressedData;
+                if (allowVorbis)
+                {
+                    return this.compressedData;
+                }
+                return this.encodeS16LE();
             }
             return this.sf2FileArrayHandle.slice(this.s16leStart, this.s16leEnd);
         }

package/src/soundfont/read_sf2/soundfont.js

@@ -54,7 +54,7 @@ export class SoundFont2 extends BasicSoundBank
             this.parsingError("No data provided!");
         }
         
-        // read the main read
+        // read the main chunk
         let firstChunk = readRIFFChunk(mainFileArray, false);
         this.verifyHeader(firstChunk, "riff");
         

package/src/utils/buffer_to_wav.js

@@ -6,9 +6,9 @@
  * @property {string|undefined} genre - the song's genre
  */
 
-import { combineArrays, IndexedByteArray } from "./indexed_array.js";
-import { getStringBytes, writeStringAsBytes } from "./byte_functions/string.js";
-import { writeRIFFOddSize } from "../soundfont/basic_soundfont/riff_chunk.js";
+import { IndexedByteArray } from "./indexed_array.js";
+import { writeStringAsBytes } from "./byte_functions/string.js";
+import { writeRIFFChunkParts, writeRIFFChunkRaw } from "../soundfont/basic_soundfont/riff_chunk.js";
 import { writeLittleEndian } from "./byte_functions/little_endian.js";
 
 /**
@@ -35,34 +35,33 @@ export function audioToWav(audioData, sampleRate, normalizeAudio = true, metadat
     {
         const encoder = new TextEncoder();
         const infoChunks = [
-            getStringBytes("INFO"),
-            writeRIFFOddSize("ICMT", encoder.encode("Created with SpessaSynth"), true)
+            writeRIFFChunkRaw("ICMT", encoder.encode("Created with SpessaSynth"), true)
         ];
         if (metadata.artist)
         {
             infoChunks.push(
-                writeRIFFOddSize("IART", encoder.encode(metadata.artist), true)
+                writeRIFFChunkRaw("IART", encoder.encode(metadata.artist), true)
             );
         }
         if (metadata.album)
         {
             infoChunks.push(
-                writeRIFFOddSize("IPRD", encoder.encode(metadata.album), true)
+                writeRIFFChunkRaw("IPRD", encoder.encode(metadata.album), true)
             );
         }
         if (metadata.genre)
         {
             infoChunks.push(
-                writeRIFFOddSize("IGNR", encoder.encode(metadata.genre), true)
+                writeRIFFChunkRaw("IGNR", encoder.encode(metadata.genre), true)
             );
         }
         if (metadata.title)
         {
             infoChunks.push(
-                writeRIFFOddSize("INAM", encoder.encode(metadata.title), true)
+                writeRIFFChunkRaw("INAM", encoder.encode(metadata.title), true)
             );
         }
-        infoChunk = writeRIFFOddSize("LIST", combineArrays(infoChunks));
+        infoChunk = writeRIFFChunkParts("INFO", infoChunks, true);
     }
     
     // prepare CUE chunk
@@ -89,12 +88,10 @@ export function audioToWav(audioData, sampleRate, normalizeAudio = true, metadat
         writeLittleEndian(cueEnd, 0, 4); // BlockStart, always 0
         writeLittleEndian(cueEnd, loopEndSamples, 4); // sampleOffset
         
-        const out = combineArrays([
-            new IndexedByteArray([2, 0, 0, 0]), // cue points count,
+        cueChunk = writeRIFFChunkParts("cue ", [
+            new IndexedByteArray([2, 0, 0, 0]), // cue points count
             cueStart,
-            cueEnd
-        ]);
-        cueChunk = writeRIFFOddSize("cue ", out);
+            cueEnd]);
     }
     
     // Prepare the header

package/src/utils/byte_functions/string.js

@@ -52,14 +52,19 @@ export function readBytesAsString(dataArray, bytes, encoding = undefined, trimEn
 /**
  * @param string {string}
  * @param addZero {boolean} adds a zero terminator at the end
+ * @param ensureEven {boolean} ensures even byte count
  * @returns {IndexedByteArray}
  */
-export function getStringBytes(string, addZero = false)
+export function getStringBytes(string, addZero = false, ensureEven = false)
 {
     let len = string.length;
     if (addZero)
     {
-        len = len + 1;
+        len++;
+    }
+    if (ensureEven && len % 2 !== 0)
+    {
+        len++;
     }
     const arr = new IndexedByteArray(len);
     writeStringAsBytes(arr, string);

package/src/utils/indexed_array.js

@@ -31,22 +31,4 @@ export class IndexedByteArray extends Uint8Array
         a.currentIndex = 0;
         return a;
     }
-}
-
-
-/**
- * @param arrs {(IndexedByteArray|Uint8Array)[]}
- * @returns {IndexedByteArray|Uint8Array}
- */
-export function combineArrays(arrs)
-{
-    const length = arrs.reduce((sum, current) => sum + current.length, 0);
-    const newArr = new IndexedByteArray(length);
-    let offset = 0;
-    for (const arr of arrs)
-    {
-        newArr.set(arr, offset);
-        offset += arr.length;
-    }
-    return newArr;
 }