sf2-json 1.0.2 → 1.0.4

package/package.json

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

package/src/sf2-json.js

@@ -147,8 +147,6 @@ function buildWavBuffer(audioData) {
 	else throw new Error(`buildWavBuffer: type '${type}' non supporté (SF3 compressé).`);
 	pcm16 = normalizeBuffer(pcm16);
 
-
-
 	const numChannels = 1;
 	const bitsPerSample = 16;
 	const byteRate = sampleRate * numChannels * (bitsPerSample / 8);
@@ -174,110 +172,79 @@ function buildWavBuffer(audioData) {
 }
 
 
-
-
-
-
-
-
-
-
-
 function extractZones(soundFont, parsed, presetHeaderIndex) {
-    const presetGeneratorsList = soundFont.getPresetGenerators(presetHeaderIndex);
-    const zones = [];
-    let globalPresetGen = null;
-
-    for (const rawGenList of presetGeneratorsList) {
-        const presetGen = createPresetGeneratorObject(rawGenList);
-        if (presetGen.instrument === undefined) {
-            globalPresetGen = presetGen;
-            continue;
-        }
-
-        const instrId = presetGen.instrument;
-        const instrGeneratorsList = soundFont.getInstrumentGenerators(instrId);
-        const defaults = convertToInstrumentGeneratorParams(DefaultInstrumentZone);
-        let globalInstrGen = null;
-
-        for (const rawInstrGenList of instrGeneratorsList) {
-            const instrGen = createInstrumentGeneratorObject(rawInstrGenList);
-            
-            if (instrGen.sampleID === undefined) { 
-                globalInstrGen = instrGen; 
-                continue; 
-            }
-
-            const merged = { ...defaults };
-            if (globalInstrGen) Object.assign(merged, globalInstrGen);
-            Object.assign(merged, instrGen);
-
-            const applyPresetOffsets = (gen) => {
-                if (!gen) return;
-                for (const [key, val] of Object.entries(gen)) {
-                    if (key === 'keyRange' || key === 'velRange' || key === 'instrument' || key === 'sampleID') continue;
-                    if (key in merged && typeof val === 'number') merged[key] += val;
-                }
-            };
-            
-            applyPresetOffsets(globalPresetGen);
-            applyPresetOffsets(presetGen);
-
-            const sampleId = merged.sampleID;
-            const sampleHeader = parsed.sampleHeaders[sampleId];
-            
-            if (!sampleHeader || sampleHeader.isEnd) continue;
-            
-            zones.push({ 
-                generators: merged, 
-                sampleHeader, 
-                sample: parsed.samples[sampleId] 
-            });
-        }
-    }
-    return zones;
+	const presetGeneratorsList = soundFont.getPresetGenerators(presetHeaderIndex);
+	const zonesMap = new Map();
+	let globalPresetGen = null;
+
+	for (const rawGenList of presetGeneratorsList) {
+		const presetGen = createPresetGeneratorObject(rawGenList);
+		if (presetGen.instrument === undefined) { globalPresetGen = presetGen; continue; }
+
+		const instrId = presetGen.instrument;
+		const instrGeneratorsList = soundFont.getInstrumentGenerators(instrId);
+		const defaults = convertToInstrumentGeneratorParams(DefaultInstrumentZone);
+		let globalInstrGen = null;
+
+		for (const rawInstrGenList of instrGeneratorsList) {
+			const instrGen = createInstrumentGeneratorObject(rawInstrGenList);
+			if (instrGen.sampleID === undefined) { globalInstrGen = instrGen; continue; }
+
+			const merged = { ...defaults };
+			if (globalInstrGen) Object.assign(merged, globalInstrGen);
+			Object.assign(merged, instrGen);
+
+			const applyPresetOffsets = (gen) => {
+				if (!gen) return;
+				for (const [key, val] of Object.entries(gen)) {
+					if (['keyRange', 'velRange', 'instrument', 'sampleID'].includes(key)) continue;
+					if (key in merged && typeof val === 'number') merged[key] += val;
+				}
+			};
+			applyPresetOffsets(globalPresetGen);
+			applyPresetOffsets(presetGen);
+
+			const lo = merged.keyRange?.lo ?? 0;
+			const hi = merged.keyRange?.hi ?? 127;
+			const keyRangeStr = `${lo}-${hi}`;
+			
+			const sampleHeader = parsed.sampleHeaders[merged.sampleID];
+			if (!sampleHeader || sampleHeader.isEnd) continue;
+
+			if (!zonesMap.has(keyRangeStr)) {
+				zonesMap.set(keyRangeStr, { generators: merged, sampleHeader, sample: parsed.samples[merged.sampleID] });
+			}
+		}
+	}
+	return Array.from(zonesMap.values());
 }
 
 
 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'),
+    };
 }