spessasynth_core 3.26.30 → 3.26.32

package/src/soundfont/basic_soundfont/write_dls/wave.js

@@ -1,6 +1,6 @@
-import { combineArrays, IndexedByteArray } from "../../../utils/indexed_array.js";
+import { IndexedByteArray } from "../../../utils/indexed_array.js";
 import { writeDword, writeWord } from "../../../utils/byte_functions/little_endian.js";
-import { writeRIFFOddSize } from "../riff_chunk.js";
+import { writeRIFFChunkParts, writeRIFFChunkRaw } from "../riff_chunk.js";
 import { writeWavesample } from "./wsmp.js";
 import { SpessaSynthInfo } from "../../../utils/loggin.js";
 import { consoleColors } from "../../../utils/other.js";
@@ -19,7 +19,7 @@ export function writeDLSSample(sample)
     writeDword(fmtData, sample.sampleRate * 2); // 16-bit samples
     writeWord(fmtData, 2); // wBlockAlign
     writeWord(fmtData, 16); // wBitsPerSample
-    const fmt = writeRIFFOddSize(
+    const fmt = writeRIFFChunkRaw(
         "fmt ",
         fmtData
     );
@@ -37,38 +37,16 @@ export function writeDLSSample(sample)
         sample.sampleLoopEndIndex,
         loop
     );
-    const audio = sample.getAudioData();
-    let data;
-    // if sample is compressed, getRawData cannot be used
-    if (sample.isCompressed)
-    {
-        const data16 = new Int16Array(audio.length);
-        
-        for (let i = 0; i < audio.length; i++)
-        {
-            // 32,767, as 32,768 may cause overflow (because vorbis can go above 1 sometimes)
-            data16[i] = audio[i] * 32767;
-        }
-        
-        
-        data = writeRIFFOddSize(
-            "data",
-            new IndexedByteArray(data16.buffer)
-        );
-    }
-    else
-    {
-        data = writeRIFFOddSize(
-            "data",
-            sample.getRawData(false) // no vorbis allowed
-        );
-    }
+    let data = writeRIFFChunkRaw(
+        "data",
+        sample.getRawData(false) // no vorbis allowed
+    );
     
-    const inam = writeRIFFOddSize(
+    const inam = writeRIFFChunkRaw(
         "INAM",
         getStringBytes(sample.sampleName, true)
     );
-    const info = writeRIFFOddSize(
+    const info = writeRIFFChunkRaw(
         "INFO",
         inam,
         false,
@@ -80,15 +58,14 @@ export function writeDLSSample(sample)
         consoleColors.value,
         consoleColors.recognized
     );
-    return writeRIFFOddSize(
+    return writeRIFFChunkParts(
         "wave",
-        combineArrays([
+        [
             fmt,
             wsmp,
             data,
             info
-        ]),
-        false,
+        ],
         true
     );
 }

package/src/soundfont/basic_soundfont/write_dls/write_dls.js

@@ -1,8 +1,8 @@
-import { writeRIFFOddSize } from "../riff_chunk.js";
+import { writeRIFFChunkParts, writeRIFFChunkRaw } from "../riff_chunk.js";
 import { writeDword } from "../../../utils/byte_functions/little_endian.js";
-import { combineArrays, IndexedByteArray } from "../../../utils/indexed_array.js";
+import { IndexedByteArray } from "../../../utils/indexed_array.js";
 import { writeLins } from "./lins.js";
-import { getStringBytes, writeStringAsBytes } from "../../../utils/byte_functions/string.js";
+import { getStringBytes } from "../../../utils/byte_functions/string.js";
 import { writeWavePool } from "./wvpl.js";
 import { SpessaSynthGroupCollapsed, SpessaSynthGroupEnd, SpessaSynthInfo } from "../../../utils/loggin.js";
 import { consoleColors } from "../../../utils/other.js";
@@ -21,7 +21,7 @@ export function writeDLS()
     // write colh
     const colhNum = new IndexedByteArray(4);
     writeDword(colhNum, this.presets.length);
-    const colh = writeRIFFOddSize(
+    const colh = writeRIFFChunkRaw(
         "colh",
         colhNum
     );
@@ -54,7 +54,7 @@ export function writeDLS()
     {
         writeDword(ptblData, offset);
     }
-    const ptbl = writeRIFFOddSize(
+    const ptbl = writeRIFFChunkRaw(
         "ptbl",
         ptblData
     );
@@ -78,42 +78,31 @@ export function writeDLS()
             continue;
         }
         infos.push(
-            writeRIFFOddSize(
+            writeRIFFChunkRaw(
                 info,
-                getStringBytes(data, true),
-                true
+                getStringBytes(data, true)
             )
         );
     }
-    const info = writeRIFFOddSize(
+    const info = writeRIFFChunkParts(
         "INFO",
-        combineArrays(infos),
-        false,
+        infos,
         true
     );
-    
-    const out = new IndexedByteArray(
-        colh.length
-        + lins.length
-        + ptbl.length
-        + wvpl.length
-        + info.length
-        + 4);
-    writeStringAsBytes(out, "DLS ");
-    out.set(combineArrays([
-        colh,
-        lins,
-        ptbl,
-        wvpl,
-        info
-    ]), 4);
     SpessaSynthInfo(
         "%cSaved succesfully!",
         consoleColors.recognized
     );
     SpessaSynthGroupEnd();
-    return writeRIFFOddSize(
+    return writeRIFFChunkParts(
         "RIFF",
-        out
+        [
+            getStringBytes("DLS "),
+            colh,
+            lins,
+            ptbl,
+            wvpl,
+            info
+        ]
     );
 }

package/src/soundfont/basic_soundfont/write_dls/wsmp.js

@@ -1,6 +1,6 @@
 import { writeDword, writeWord } from "../../../utils/byte_functions/little_endian.js";
 import { IndexedByteArray } from "../../../utils/indexed_array.js";
-import { writeRIFFOddSize } from "../riff_chunk.js";
+import { writeRIFFChunkRaw } from "../riff_chunk.js";
 
 const WSMP_SIZE = 20;
 
@@ -71,7 +71,7 @@ export function writeWavesample(
         writeDword(wsmpData, loopStart);
         writeDword(wsmpData, loopSize);
     }
-    return writeRIFFOddSize(
+    return writeRIFFChunkRaw(
         "wsmp",
         wsmpData
     );

package/src/soundfont/basic_soundfont/write_dls/wvpl.js

@@ -1,6 +1,5 @@
 import { writeDLSSample } from "./wave.js";
-import { writeRIFFOddSize } from "../riff_chunk.js";
-import { combineArrays } from "../../../utils/indexed_array.js";
+import { writeRIFFChunkParts } from "../riff_chunk.js";
 
 /**
  * @this {BasicSoundBank}
@@ -21,10 +20,9 @@ export function writeWavePool()
         return out;
     });
     return {
-        data: writeRIFFOddSize(
+        data: writeRIFFChunkParts(
             "wvpl",
-            combineArrays(samples),
-            false,
+            samples,
             true
         ),
         indexes: offsets

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

@@ -1,6 +1,6 @@
 import { IndexedByteArray } from "../../../utils/indexed_array.js";
 import { writeWord } from "../../../utils/byte_functions/little_endian.js";
-import { RiffChunk, writeRIFFChunk } from "../riff_chunk.js";
+import { writeRIFFChunkRaw } from "../riff_chunk.js";
 
 const BAG_SIZE = 4;
 
@@ -50,16 +50,8 @@ export function getIBAG()
     writeWord(ibagData, modulatorIndex & 0xFFFF);
     writeWord(xibagData, generatorIndex >> 16);
     writeWord(xibagData, modulatorIndex >> 16);
-    const ibag = writeRIFFChunk(new RiffChunk(
-        "ibag",
-        ibagData.length,
-        ibagData
-    ));
-    const xibag = writeRIFFChunk(new RiffChunk(
-        "ibag",
-        xibagData.length,
-        xibagData
-    ));
+    const ibag = writeRIFFChunkRaw("ibag", ibagData);
+    const xibag = writeRIFFChunkRaw("ibag", xibagData);
     return {
         pdta: ibag,
         xdta: xibag,

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

@@ -1,6 +1,6 @@
 import { writeDword, writeWord } from "../../../utils/byte_functions/little_endian.js";
 import { IndexedByteArray } from "../../../utils/indexed_array.js";
-import { RiffChunk, writeRIFFChunk } from "../riff_chunk.js";
+import { writeRIFFChunkRaw } from "../riff_chunk.js";
 import { GEN_BYTE_SIZE, Generator } from "../generator.js";
 import { generatorTypes } from "../generator_types.js";
 
@@ -81,16 +81,8 @@ export function getIGEN()
     const xigenData = new IndexedByteArray(GEN_BYTE_SIZE);
     writeDword(xigenData, 0);
     
-    const igen = writeRIFFChunk(new RiffChunk(
-        "igen",
-        igenData.length,
-        igenData
-    ));
-    const xigen = writeRIFFChunk(new RiffChunk(
-        "igen",
-        xigenData.length,
-        xigenData
-    ));
+    const igen = writeRIFFChunkRaw("igen", igenData);
+    const xigen = writeRIFFChunkRaw("igen", xigenData);
     return {
         pdta: igen,
         xdta: xigen,

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

@@ -1,6 +1,6 @@
 import { IndexedByteArray } from "../../../utils/indexed_array.js";
 import { writeLittleEndian, writeWord } from "../../../utils/byte_functions/little_endian.js";
-import { RiffChunk, writeRIFFChunk } from "../riff_chunk.js";
+import { writeRIFFChunkRaw } from "../riff_chunk.js";
 import { MOD_BYTE_SIZE } from "../modulator.js";
 
 /**
@@ -52,16 +52,8 @@ export function getIMOD()
     const ximodData = new IndexedByteArray(MOD_BYTE_SIZE);
     writeLittleEndian(ximodData, 0, MOD_BYTE_SIZE);
     
-    const imod = writeRIFFChunk(new RiffChunk(
-        "imod",
-        imodData.length,
-        imodData
-    ));
-    const ximod = writeRIFFChunk(new RiffChunk(
-        "imod",
-        ximodData.length,
-        ximodData
-    ));
+    const imod = writeRIFFChunkRaw("imod", imodData);
+    const ximod = writeRIFFChunkRaw("imod", ximodData);
     return {
         pdta: imod,
         xdta: ximod,

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

@@ -1,7 +1,7 @@
 import { IndexedByteArray } from "../../../utils/indexed_array.js";
 import { writeStringAsBytes } from "../../../utils/byte_functions/string.js";
 import { writeWord } from "../../../utils/byte_functions/little_endian.js";
-import { RiffChunk, writeRIFFChunk } from "../riff_chunk.js";
+import { writeRIFFChunkRaw } from "../riff_chunk.js";
 
 const INST_SIZE = 22;
 
@@ -31,17 +31,8 @@ export function getINST()
     writeWord(instData, instrumentStart & 0xFFFF);
     writeWord(xinstData, instrumentStart >> 16);
     
-    const inst = writeRIFFChunk(new RiffChunk(
-        "inst",
-        instData.length,
-        instData
-    ));
-    
-    const xinst = writeRIFFChunk(new RiffChunk(
-        "inst",
-        xinstData.length,
-        xinstData
-    ));
+    const inst = writeRIFFChunkRaw("inst", instData);
+    const xinst = writeRIFFChunkRaw("inst", xinstData);
     
     return {
         pdta: inst,

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

@@ -1,6 +1,6 @@
 import { IndexedByteArray } from "../../../utils/indexed_array.js";
 import { writeWord } from "../../../utils/byte_functions/little_endian.js";
-import { RiffChunk, writeRIFFChunk } from "../riff_chunk.js";
+import { writeRIFFChunkRaw } from "../riff_chunk.js";
 
 const BAG_SIZE = 4;
 
@@ -47,16 +47,8 @@ export function getPBAG()
     writeWord(pbagData, modulatorIndex);
     writeWord(xpbagData, generatorIndex);
     writeWord(xpbagData, modulatorIndex);
-    const pbag = writeRIFFChunk(new RiffChunk(
-        "pbag",
-        pbagData.length,
-        pbagData
-    ));
-    const xbag = writeRIFFChunk(new RiffChunk(
-        "pbag",
-        xpbagData.length,
-        xpbagData
-    ));
+    const pbag = writeRIFFChunkRaw("pbag", pbagData);
+    const xbag = writeRIFFChunkRaw("pbag", xpbagData);
     return {
         pdta: pbag,
         xdta: xbag,

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

@@ -1,6 +1,6 @@
 import { writeDword, writeWord } from "../../../utils/byte_functions/little_endian.js";
 import { IndexedByteArray } from "../../../utils/indexed_array.js";
-import { RiffChunk, writeRIFFChunk } from "../riff_chunk.js";
+import { writeRIFFChunkRaw } from "../riff_chunk.js";
 
 import { GEN_BYTE_SIZE, Generator } from "../generator.js";
 import { generatorTypes } from "../generator_types.js";
@@ -81,16 +81,9 @@ export function getPGEN()
     const xpgenData = new IndexedByteArray(GEN_BYTE_SIZE);
     writeDword(xpgenData, 0);
     
-    const pgen = writeRIFFChunk(new RiffChunk(
-        "pgen",
-        pgenData.length,
-        pgenData
-    ));
-    const xpgen = writeRIFFChunk(new RiffChunk(
-        "pgen",
-        xpgenData.length,
-        xpgenData
-    ));
+    const pgen = writeRIFFChunkRaw("pgen", pgenData);
+    
+    const xpgen = writeRIFFChunkRaw("pgen", xpgenData);
     return {
         pdta: pgen,
         xdta: xpgen,

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

@@ -1,7 +1,7 @@
 import { IndexedByteArray } from "../../../utils/indexed_array.js";
 import { writeStringAsBytes } from "../../../utils/byte_functions/string.js";
 import { writeDword, writeWord } from "../../../utils/byte_functions/little_endian.js";
-import { RiffChunk, writeRIFFChunk } from "../riff_chunk.js";
+import { writeRIFFChunkRaw } from "../riff_chunk.js";
 
 const PHDR_SIZE = 38;
 
@@ -49,17 +49,9 @@ export function getPHDR()
     writeWord(xphdrData, presetStart >> 16);
     xphdrData.currentIndex += 12;// library, genre, morphology
     
-    const phdr = writeRIFFChunk(new RiffChunk(
-        "phdr",
-        phdrData.length,
-        phdrData
-    ));
+    const phdr = writeRIFFChunkRaw("phdr", phdrData);
     
-    const xphdr = writeRIFFChunk(new RiffChunk(
-        "phdr",
-        xphdrData.length,
-        xphdrData
-    ));
+    const xphdr = writeRIFFChunkRaw("phdr", xphdrData);
     
     return {
         pdta: phdr,

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

@@ -1,6 +1,6 @@
 import { IndexedByteArray } from "../../../utils/indexed_array.js";
 import { writeLittleEndian, writeWord } from "../../../utils/byte_functions/little_endian.js";
-import { RiffChunk, writeRIFFChunk } from "../riff_chunk.js";
+import { writeRIFFChunkRaw } from "../riff_chunk.js";
 import { MOD_BYTE_SIZE } from "../modulator.js";
 
 /**
@@ -52,16 +52,8 @@ export function getPMOD()
     const xpmodData = new IndexedByteArray(MOD_BYTE_SIZE);
     writeLittleEndian(xpmodData, 0, MOD_BYTE_SIZE);
     
-    const pmod = writeRIFFChunk(new RiffChunk(
-        "pmod",
-        pmodData.length,
-        pmodData
-    ));
-    const xpmod = writeRIFFChunk(new RiffChunk(
-        "pmod",
-        xpmodData.length,
-        xpmodData
-    ));
+    const pmod = writeRIFFChunkRaw("pmod", pmodData);
+    const xpmod = writeRIFFChunkRaw("pmod", xpmodData);
     return {
         pdta: pmod,
         xdta: xpmod,

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

@@ -1,7 +1,25 @@
-import { RiffChunk, writeRIFFChunk } from "../riff_chunk.js";
-import { IndexedByteArray } from "../../../utils/indexed_array.js";
 import { SpessaSynthInfo } from "../../../utils/loggin.js";
 import { consoleColors } from "../../../utils/other.js";
+import { IndexedByteArray } from "../../../utils/indexed_array.js";
+import { writeStringAsBytes } from "../../../utils/byte_functions/string.js";
+import { writeLittleEndian } from "../../../utils/byte_functions/little_endian.js";
+
+/*
+Sdta structure:
+
+LIST chunk
+- "sdta" ASCII string
+- smpl chunk
+- - raw data
+ */
+
+// in bytes, from the start of sdta-LIST to the first actual sample
+const SDTA_TO_DATA_OFFSET =
+    4 + // "LIST"
+    4 + // sdta size
+    4 + // "sdta"
+    4 + // "smpl"
+    4;  // smpl size
 
 /**
  * @this {BasicSoundBank}
@@ -10,18 +28,20 @@ import { consoleColors } from "../../../utils/other.js";
  * @param compress {boolean}
  * @param quality {number}
  * @param vorbisFunc {EncodeVorbisFunction}
- * @returns {IndexedByteArray}
+ * @returns {Uint8Array}
  */
 export function getSDTA(smplStartOffsets, smplEndOffsets, compress, quality, vorbisFunc)
 {
     // write smpl: write int16 data of each sample linearly
     // get size (calling getAudioData twice doesn't matter since it gets cached)
+    let smplChunkSize = 0;
     const sampleDatas = this.samples.map((s, i) =>
     {
         if (compress)
         {
             s.compressSample(quality, vorbisFunc);
         }
+        // raw data: either copy s16le or encoded vorbis or encode manually if overridden
         const r = s.getRawData();
         SpessaSynthInfo(
             `%cEncoded sample %c${i}. ${s.sampleName}%c of %c${this.samples.length}%c. Compressed: %c${s.isCompressed}%c.`,
@@ -33,48 +53,58 @@ export function getSDTA(smplStartOffsets, smplEndOffsets, compress, quality, vor
             s.isCompressed ? consoleColors.recognized : consoleColors.unrecognized,
             consoleColors.info
         );
+        /* 6.1 Sample Data Format in the smpl Sub-chunk
+        Each sample is followed by a minimum of forty-six zero
+        valued sample data points. These zero valued data points are necessary to guarantee that any reasonable upward pitch shift
+        using any reasonable interpolator can loop on zero data at the end of the sound.
+        This doesn't apply to sf3 tho
+         */
+        smplChunkSize += r.length + (s.isCompressed ? 0 : 92); // 92 = 46 sample data points
         return r;
     });
-    const smplSize = this.samples.reduce((total, s, i) =>
+    
+    if (smplChunkSize % 2 !== 0)
     {
-        return total + sampleDatas[i].length + 46;
-    }, 0);
-    const smplData = new IndexedByteArray(smplSize);
-    // resample to int16 and write out
+        smplChunkSize++;
+    }
+    
+    const sdta = new IndexedByteArray(smplChunkSize + SDTA_TO_DATA_OFFSET);
+    
+    // avoid using writeRIFFChunk for performance
+    // sdta chunk
+    writeStringAsBytes(sdta, "LIST");
+    // "sdta" + full smpl length
+    writeLittleEndian(sdta, smplChunkSize + SDTA_TO_DATA_OFFSET - 8, 4);
+    writeStringAsBytes(sdta, "sdta");
+    writeStringAsBytes(sdta, "smpl");
+    writeLittleEndian(sdta, smplChunkSize, 4);
+    
+    let offset = 0;
+    // write out
     this.samples.forEach((sample, i) =>
     {
         const data = sampleDatas[i];
+        sdta.set(data, offset + SDTA_TO_DATA_OFFSET);
         let startOffset;
         let endOffset;
-        let jump = data.length;
         if (sample.isCompressed)
         {
             // sf3 offset is in bytes
-            startOffset = smplData.currentIndex;
+            startOffset = offset;
             endOffset = startOffset + data.length;
         }
         else
         {
             // sf2 in sample data points
-            startOffset = smplData.currentIndex / 2;
-            endOffset = startOffset + data.length / 2;
-            jump += 46;
+            startOffset = offset / 2; // inclusive
+            endOffset = startOffset + data.length / 2; // exclusive
+            offset += 92; // 46 sample data points
         }
+        offset += data.length;
         smplStartOffsets.push(startOffset);
-        smplData.set(data, smplData.currentIndex);
-        smplData.currentIndex += jump;
+        
         smplEndOffsets.push(endOffset);
     });
     
-    const smplChunk = writeRIFFChunk(new RiffChunk(
-        "smpl",
-        smplData.length,
-        smplData
-    ), new IndexedByteArray([115, 100, 116, 97])); // `sdta`
-    
-    return writeRIFFChunk(new RiffChunk(
-        "LIST",
-        smplChunk.length,
-        smplChunk
-    ));
+    return sdta;
 }

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

@@ -1,7 +1,7 @@
 import { IndexedByteArray } from "../../../utils/indexed_array.js";
 import { writeStringAsBytes } from "../../../utils/byte_functions/string.js";
 import { writeDword, writeWord } from "../../../utils/byte_functions/little_endian.js";
-import { RiffChunk, writeRIFFChunk } from "../riff_chunk.js";
+import { writeRIFFChunkRaw } from "../riff_chunk.js";
 import { SF3_BIT_FLIT } from "../../read_sf2/samples.js";
 
 /**
@@ -67,16 +67,8 @@ export function getSHDR(smplStartOffsets, smplEndOffsets)
     // write EOS and zero everything else
     writeStringAsBytes(shdrData, "EOS", sampleLength);
     writeStringAsBytes(xshdrData, "EOS", sampleLength);
-    const shdr = writeRIFFChunk(new RiffChunk(
-        "shdr",
-        shdrData.length,
-        shdrData
-    ));
-    const xshdr = writeRIFFChunk(new RiffChunk(
-        "shdr",
-        xshdrData.length,
-        xshdrData
-    ));
+    const shdr = writeRIFFChunkRaw("shdr", shdrData);
+    const xshdr = writeRIFFChunkRaw("shdr", xshdrData);
     return {
         pdta: shdr,
         xdta: xshdr,