sf2-json 1.0.3 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sf2-json",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "SF2 to JSON Converter for WebAudioFonts",
   "keywords": [
     "sf2",

package/src/sf2-json.js

@@ -17,6 +17,7 @@ const require = createRequire(import.meta.url);
 const ffmpegPath = require('ffmpeg-static');
 
 
+const MAX_NORMALIZE_FACTOR = 1.5;
 const RESAMPLE_RATE = 48000;
 
 const GM_CATEGORIES = [
@@ -62,7 +63,7 @@ const GM_INSTRUMENTS = [
 ];
 
 
-function encodeOpus(wavBuffer, bitrate = 128, sampleRate = 32000) {
+function encodeOpus(wavBuffer, bitrate = 96, sampleRate = 32000) {
 	const result = spawnSync(ffmpegPath, [
 		'-hide_banner',
 		'-loglevel', 'error',
@@ -128,7 +129,7 @@ function normalizeBuffer(buffer, targetPeak = 0.9) {
     }
     if (peak === 0) return buffer;
     const targetPeakInt = targetPeak * 32767;
-    const factor = Math.min(targetPeakInt / peak, 3.0);
+    const factor = Math.min(targetPeakInt / peak, MAX_NORMALIZE_FACTOR);
     if (factor <= 1.0) return buffer;
     for (let i = 0; i < samples.length; i++) {
         samples[i] = Math.round(samples[i] * factor);
@@ -221,44 +222,30 @@ function extractZones(soundFont, parsed, presetHeaderIndex) {
 
 
 async function buildZone(generators, sampleHeader, sample) {
-	const { sampleRate, originalPitch, pitchCorrection, loopStart, loopEnd, start } = sampleHeader;
-	const fineTune = (generators.fineTune ?? 0) + (pitchCorrection ?? 0);
-
-	const SF2_DEFAULT_ATTACK = -12000;
-	const SF2_DEFAULT_HOLD = -12000;
-	const SF2_DEFAULT_DECAY = -12000;
-	const SF2_DEFAULT_SUSTAIN = 0;
-	const SF2_DEFAULT_RELEASE = -12000;
-
-	const ahdsr =
-		(generators.attackVolEnv ?? SF2_DEFAULT_ATTACK) !== SF2_DEFAULT_ATTACK ||
-		(generators.holdVolEnv ?? SF2_DEFAULT_HOLD) !== SF2_DEFAULT_HOLD ||
-		(generators.decayVolEnv ?? SF2_DEFAULT_DECAY) !== SF2_DEFAULT_DECAY ||
-		(generators.sustainVolEnv ?? SF2_DEFAULT_SUSTAIN) !== SF2_DEFAULT_SUSTAIN ||
-		(generators.releaseVolEnv ?? SF2_DEFAULT_RELEASE) !== SF2_DEFAULT_RELEASE;
-
-	const midi = (generators.overridingRootKey !== undefined &&
-		generators.overridingRootKey !== 255 &&
-		generators.overridingRootKey >= 0)
-		? generators.overridingRootKey
-		: originalPitch;
-
-	const wavBuffer = buildWavBuffer(sample);
-	const mp3Buffer = encodeOpus(wavBuffer, 96, RESAMPLE_RATE, true);
-	const audioBase64 = mp3Buffer.toString('base64');
-
-	return {
-		originalPitch: midi * 100,
-		keyRangeLow: generators.keyRange?.lo ?? 0,
-		keyRangeHigh: generators.keyRange?.hi ?? 127,
-		loopStart,
-		loopEnd,
-		coarseTune: generators.coarseTune ?? 0,
-		fineTune,
-		sampleRate,
-		ahdsr: ahdsr,
-		file: audioBase64,
-	};
+    const { originalPitch, pitchCorrection, loopStart, loopEnd } = sampleHeader;
+    
+    const rootKey = (generators.overridingRootKey !== undefined && generators.overridingRootKey !== 255)
+        ? generators.overridingRootKey
+        : originalPitch;
+
+    const coarseTuneCents = (generators.coarseTune ?? 0) * 100;
+    const fineTuneCents = (generators.fineTune ?? 0) + (pitchCorrection ?? 0);
+    const totalPitchOffset = coarseTuneCents + fineTuneCents;
+    const calculatedPitch = (rootKey * 100) + totalPitchOffset;
+
+    const wavBuffer = buildWavBuffer(sample);
+    const mp3Buffer = encodeOpus(wavBuffer, 96, RESAMPLE_RATE);
+
+    return {
+        originalPitch: calculatedPitch,
+        keyRangeLow: generators.keyRange?.lo ?? 0,
+        keyRangeHigh: generators.keyRange?.hi ?? 127,
+        loopStart,
+        loopEnd,
+        sampleRate: sampleHeader.sampleRate,
+        ahdsr: true,
+        file: mp3Buffer.toString('base64'),
+    };
 }