Fix WAVE metadata

Add support for sfpk in RMIDIs
spessasus · Aug 8, 2024 · 2fc472a · 2fc472a
1 parent c9a066c
commit 2fc472a
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 77 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "SpessaSynth",
-  "version": "3.15.0",
+  "version": "3.15.1",
   "type": "module",
   "scripts": {
     "start": "node src/website/server/server.js",

diff --git a/src/spessasynth_lib/midi_parser/midi_loader.js b/src/spessasynth_lib/midi_parser/midi_loader.js
@@ -88,7 +88,7 @@ class MIDI{
                 if(currentChunk.header === "RIFF")
                 {
                     const type = readBytesAsString(currentChunk.chunkData, 4);
-                    if(type === "sfbk")
+                    if(type === "sfbk" || type === "sfpk")
                     {
                         SpessaSynthInfo("%cFound embedded soundfont!", consoleColors.recognized);
                         this.embeddedSoundFont = binaryData.slice(startIndex, startIndex + currentChunk.size).buffer;

diff --git a/src/spessasynth_lib/synthetizer/worklet_processor.min.js b/src/spessasynth_lib/synthetizer/worklet_processor.min.js
diff --git a/src/spessasynth_lib/utils/buffer_to_wav.js b/src/spessasynth_lib/utils/buffer_to_wav.js
@@ -6,7 +6,7 @@
  * @property {string|undefined} genre - the song's genre
  */
 
-import { combineArrays } from './indexed_array.js'
+import { combineArrays, IndexedByteArray } from './indexed_array.js'
 import { getStringBytes } from './byte_functions/string.js'
 import { writeRIFFOddSize } from '../soundfont/read/riff_chunk.js'
 
@@ -20,17 +20,54 @@ import { writeRIFFOddSize } from '../soundfont/read/riff_chunk.js'
  */
 export function audioBufferToWav(audioBuffer, normalizeAudio = true, channelOffset = 0, metadata = {})
 {
-    // this code currently doesn't add any metadata
     const channel1Data = audioBuffer.getChannelData(channelOffset);
     const channel2Data = audioBuffer.getChannelData(channelOffset + 1);
     const length = channel1Data.length;
 
     const bytesPerSample = 2; // 16-bit PCM
 
+    // prepare INFO chunk
+    let infoChunk = new IndexedByteArray(0);
+    const infoOn = Object.keys(metadata).length > 0;
+    // INFO chunk
+    if(infoOn)
+    {
+        const encoder = new TextEncoder();
+        const infoChunks = [
+            getStringBytes("INFO"),
+            writeRIFFOddSize("ICMT", encoder.encode("Created with SpessaSynth"))
+        ];
+        if(metadata.artist)
+        {
+            infoChunks.push(
+                writeRIFFOddSize("IART", encoder.encode(metadata.artist))
+            );
+        }
+        if(metadata.album)
+        {
+            infoChunks.push(
+                writeRIFFOddSize("IPRD", encoder.encode(metadata.album))
+            );
+        }
+        if(metadata.genre)
+        {
+            infoChunks.push(
+                writeRIFFOddSize("IGNR", encoder.encode(metadata.genre))
+            );
+        }
+        if(metadata.title)
+        {
+            infoChunks.push(
+                writeRIFFOddSize("INAM", encoder.encode(metadata.title))
+            );
+        }
+        infoChunk = writeRIFFOddSize("LIST", combineArrays(infoChunks));
+    }
+
     // Prepare the header
     const headerSize = 44;
     const dataSize = length * 2 * bytesPerSample; // 2 channels, 16-bit per channel
-    const fileSize = headerSize + dataSize - 8; // total file size minus the first 8 bytes
+    const fileSize = headerSize + dataSize + infoChunk.length - 8; // total file size minus the first 8 bytes
     const header = new Uint8Array(headerSize);
 
     // 'RIFF'
@@ -65,46 +102,13 @@ export function audioBufferToWav(audioBuffer, normalizeAudio = true, channelOffs
 
     let wavData;
     let offset = headerSize;
-    let infoChunk = undefined;
-    // INFO chunk
-    if(Object.keys(metadata).length > 0)
+    if(infoOn)
     {
-        const encoder = new TextEncoder();
-        const infoChunks = [
-            getStringBytes("INFO"),
-            writeRIFFOddSize("ICMT", encoder.encode("Created with SpessaSynth"))
-        ];
-        if(metadata.artist)
-        {
-            infoChunks.push(
-                writeRIFFOddSize("IART", encoder.encode(metadata.artist))
-            );
-        }
-        if(metadata.album)
-        {
-            infoChunks.push(
-                writeRIFFOddSize("IPRD", encoder.encode(metadata.album))
-            );
-        }
-        if(metadata.genre)
-        {
-            infoChunks.push(
-                writeRIFFOddSize("IGNR", encoder.encode(metadata.genre))
-            );
-        }
-        if(metadata.title)
-        {
-            infoChunks.push(
-                writeRIFFOddSize("INAM", encoder.encode(metadata.title))
-            );
-        }
-        infoChunk = writeRIFFOddSize("LIST", combineArrays(infoChunks));
         wavData = new Uint8Array(headerSize + dataSize + infoChunk.length);
     }
     else
     {
         wavData = new Uint8Array(headerSize + dataSize);
-
     }
     wavData.set(header, 0);
 
@@ -150,7 +154,7 @@ export function audioBufferToWav(audioBuffer, normalizeAudio = true, channelOffs
         wavData[offset++] = (sample2 >> 8) & 0xff;
     }
 
-    if(infoChunk)
+    if(infoOn)
     {
         wavData.set(infoChunk, offset);
     }

diff --git a/src/website/minified/demo_main.min.js b/src/website/minified/demo_main.min.js
diff --git a/src/website/minified/local_main.min.js b/src/website/minified/local_main.min.js