spessasynth_lib 3.23.11 → 3.23.13

package/sequencer/worklet_sequencer/sequencer_message.js

@@ -35,7 +35,7 @@ export const WorkletSequencerMessageType = {
 export const WorkletSequencerReturnMessageType = {
     midiEvent: 0,               // [...midiEventBytes<number>]
     songChange: 1,              // [midiData<MidiData>, songIndex<number>, isAutoPlayed<boolean>]
-    textEvent: 2,               // [messageData<number[]>, statusByte<number]
+    textEvent: 2,               // [messageData<number[]>, statusByte<number>, lyricsIndex<number>]
     timeChange: 3,              // newAbsoluteTime<number>
     pause: 4,                   // no data
     getMIDI: 5,                 // midiData<MIDI>

package/sequencer/worklet_sequencer/worklet_sequencer.js

@@ -219,7 +219,6 @@ class WorkletSequencer
             for (let c = 0; c < MIDI_CHANNEL_COUNT; c++)
             {
                 this.sendMIDICC(c, midiControllers.allNotesOff, 0);
-                this.sendMIDICC(c, midiControllers.allSoundOff, 0);
             }
         }
     }

package/soundfont/basic_soundfont/basic_sample.js

@@ -5,18 +5,21 @@
  */
 import { SpessaSynthWarn } from "../../utils/loggin.js";
 
+// should be reasonable for most cases
+const RESAMPLE_RATE = 48000;
+
 export class BasicSample
 {
     /**
      * The basic representation of a soundfont sample
-     * @param sampleName {string}
-     * @param sampleRate {number}
-     * @param samplePitch {number}
-     * @param samplePitchCorrection {number}
-     * @param sampleLink {number}
-     * @param sampleType {number}
-     * @param loopStart {number} relative to sample start
-     * @param loopEnd {number} relative to sample start
+     * @param sampleName {string} The sample's name
+     * @param sampleRate {number} The sample's rate in Hz
+     * @param samplePitch {number} The sample's pitch as a MIDI note number
+     * @param samplePitchCorrection {number} The sample's pitch correction in cents
+     * @param sampleLink {number} The sample's link, currently unused
+     * @param sampleType {number} The sample's type, an enum
+     * @param loopStart {number} The sample's loop start relative to the sample start in sample points
+     * @param loopEnd {number} The sample's loop end relative to the sample start in sample points
      */
     constructor(
         sampleName,
@@ -110,6 +113,23 @@ export class BasicSample
         return uint8;
     }
     
+    resampleData(newSampleRate)
+    {
+        let audioData = this.getAudioData();
+        const ratio = newSampleRate / this.sampleRate;
+        const resampled = new Float32Array(Math.floor(audioData.length * ratio));
+        for (let i = 0; i < resampled.length; i++)
+        {
+            resampled[i] = audioData[Math.floor(i * (1 / ratio))];
+        }
+        audioData = resampled;
+        this.sampleRate = newSampleRate;
+        // adjust loop points
+        this.sampleLoopStartIndex = Math.floor(this.sampleLoopStartIndex * ratio);
+        this.sampleLoopEndIndex = Math.floor(this.sampleLoopEndIndex * ratio);
+        this.sampleData = audioData;
+    }
+    
     /**
      * @param quality {number}
      * @param encodeVorbis {EncodeVorbisFunction}
@@ -124,7 +144,14 @@ export class BasicSample
         // compress, always mono!
         try
         {
-            this.compressedData = encodeVorbis([this.getAudioData()], 1, this.sampleRate, quality);
+            // if the sample rate is too low or too high, resample
+            let audioData = this.getAudioData();
+            if (this.sampleRate < 8000 || this.sampleRate > 96000)
+            {
+                this.resampleData(RESAMPLE_RATE);
+                audioData = this.getAudioData();
+            }
+            this.compressedData = encodeVorbis([audioData], 1, this.sampleRate, quality);
             // flag as compressed
             this.sampleType |= 0x10;
             this.isCompressed = true;
@@ -134,7 +161,8 @@ export class BasicSample
             SpessaSynthWarn(`Failed to compress ${this.sampleName}. Leaving as uncompressed!`);
             this.isCompressed = false;
             this.compressedData = undefined;
-            this.sampleType &= -17;
+            // flag as uncompressed
+            this.sampleType &= 0xEF;
         }
         
     }

package/soundfont/basic_soundfont/write_sf2/sdta.js

@@ -24,11 +24,14 @@ export function getSDTA(smplStartOffsets, smplEndOffsets, compress, quality, vor
         }
         const r = s.getRawData();
         SpessaSynthInfo(
-            `%cEncoded sample %c${i}. ${s.sampleName}%c of %c${this.samples.length}`,
+            `%cEncoded sample %c${i}. ${s.sampleName}%c of %c${this.samples.length}%c. Compressed: %c${s.isCompressed}%c.`,
             consoleColors.info,
             consoleColors.recognized,
             consoleColors.info,
-            consoleColors.recognized
+            consoleColors.recognized,
+            consoleColors.info,
+            s.isCompressed ? consoleColors.recognized : consoleColors.unrecognized,
+            consoleColors.info
         );
         return r;
     });

package/soundfont/read_sf2/samples.js

@@ -72,7 +72,7 @@ export class LoadedSample extends BasicSample
     
     /**
      * Get raw data, whether it's compressed or not as we simply write it to the file
-     * @return {Uint8Array}
+     * @return {Uint8Array} either s16 or vorbis data
      */
     getRawData()
     {
@@ -90,7 +90,8 @@ export class LoadedSample extends BasicSample
         {
             if (!this.isDataRaw)
             {
-                throw new Error("Writing SF2Pack samples is not supported.");
+                // encode the f32 into s16 manually
+                super.getRawData();
             }
             const dataStartIndex = smplArr.currentIndex;
             return smplArr.slice(dataStartIndex + this.sampleStartIndex, dataStartIndex + this.sampleEndIndex);
@@ -123,7 +124,9 @@ export class LoadedSample extends BasicSample
         }
         catch (e)
         {
-            throw new Error(`Ogg Vorbis decode error: ${e}`);
+            // do not error out, fill with silence
+            SpessaSynthWarn(`Error decoding sample ${this.sampleName}: ${e}`);
+            this.sampleData = new Float32Array(this.sampleLoopEndIndex + 1);
         }
     }