@marmooo/midy 0.2.4 → 0.2.5

package/esm/midy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"midy.d.ts","sourceRoot":"","sources":["../src/midy.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"midy.d.ts","sourceRoot":"","sources":["../src/midy.js"],"names":[],"mappings":"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"}

package/esm/midy.js

@@ -1,5 +1,57 @@
 import { parseMidi } from "midi-file";
 import { parse, SoundFont } from "@marmooo/soundfont-parser";
+// 2-3 times faster than Map
+class SparseMap {
+    constructor(size) {
+        this.data = new Array(size);
+        this.activeIndices = [];
+    }
+    set(key, value) {
+        if (this.data[key] === undefined) {
+            this.activeIndices.push(key);
+        }
+        this.data[key] = value;
+    }
+    get(key) {
+        return this.data[key];
+    }
+    delete(key) {
+        if (this.data[key] !== undefined) {
+            this.data[key] = undefined;
+            const index = this.activeIndices.indexOf(key);
+            if (index !== -1) {
+                this.activeIndices.splice(index, 1);
+            }
+            return true;
+        }
+        return false;
+    }
+    has(key) {
+        return this.data[key] !== undefined;
+    }
+    get size() {
+        return this.activeIndices.length;
+    }
+    clear() {
+        for (let i = 0; i < this.activeIndices.length; i++) {
+            const key = this.activeIndices[i];
+            this.data[key] = undefined;
+        }
+        this.activeIndices = [];
+    }
+    *[Symbol.iterator]() {
+        for (let i = 0; i < this.activeIndices.length; i++) {
+            const key = this.activeIndices[i];
+            yield [key, this.data[key]];
+        }
+    }
+    forEach(callback) {
+        for (let i = 0; i < this.activeIndices.length; i++) {
+            const key = this.activeIndices[i];
+            callback(this.data[key], key, this);
+        }
+    }
+}
 class Note {
     constructor(noteNumber, velocity, startTime, voice, voiceParams) {
         Object.defineProperty(this, "bufferSource", {
@@ -287,6 +339,18 @@ export class Midy {
             writable: true,
             value: this.initSoundFontTable()
         });
+        Object.defineProperty(this, "audioBufferCounter", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Map()
+        });
+        Object.defineProperty(this, "audioBufferCache", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Map()
+        });
         Object.defineProperty(this, "isPlaying", {
             enumerable: true,
             configurable: true,
@@ -339,7 +403,7 @@ export class Midy {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: new Map()
+            value: new SparseMap(128)
         });
         Object.defineProperty(this, "defaultOptions", {
             enumerable: true,
@@ -379,7 +443,7 @@ export class Midy {
     initSoundFontTable() {
         const table = new Array(128);
         for (let i = 0; i < 128; i++) {
-            table[i] = new Map();
+            table[i] = new SparseMap(128);
         }
         return table;
     }
@@ -433,8 +497,8 @@ export class Midy {
                 state: new ControllerState(),
                 controlTable: this.initControlTable(),
                 ...this.setChannelAudioNodes(audioContext),
-                scheduledNotes: new Map(),
-                sostenutoNotes: new Map(),
+                scheduledNotes: new SparseMap(128),
+                sostenutoNotes: new SparseMap(128),
             };
         });
         return channels;
@@ -468,9 +532,8 @@ export class Midy {
             return audioBuffer;
         }
     }
-    async createNoteBufferNode(voiceParams, isSF3) {
+    createNoteBufferNode(audioBuffer, voiceParams) {
         const bufferSource = new AudioBufferSourceNode(this.audioContext);
-        const audioBuffer = await this.createNoteBuffer(voiceParams, isSF3);
         bufferSource.buffer = audioBuffer;
         bufferSource.loop = voiceParams.sampleModes % 2 !== 0;
         if (bufferSource.loop) {
@@ -562,6 +625,7 @@ export class Midy {
                     await Promise.all(this.notePromises);
                     this.notePromises = [];
                     this.exclusiveClassMap.clear();
+                    this.audioBufferCache.clear();
                     resolve();
                     return;
                 }
@@ -577,8 +641,9 @@ export class Midy {
                 }
                 else if (this.isStopping) {
                     await this.stopNotes(0, true);
-                    this.exclusiveClassMap.clear();
                     this.notePromises = [];
+                    this.exclusiveClassMap.clear();
+                    this.audioBufferCache.clear();
                     resolve();
                     this.isStopping = false;
                     this.isPaused = false;
@@ -609,6 +674,9 @@ export class Midy {
     secondToTicks(second, secondsPerBeat) {
         return second * this.ticksPerBeat / secondsPerBeat;
     }
+    getAudioBufferId(programNumber, noteNumber, velocity) {
+        return `${programNumber}:${noteNumber}:${velocity}`;
+    }
     extractMidiData(midi) {
         const instruments = new Set();
         const timeline = [];
@@ -630,6 +698,8 @@ export class Midy {
                 switch (event.type) {
                     case "noteOn": {
                         const channel = tmpChannels[event.channel];
+                        const audioBufferId = this.getAudioBufferId(channel.programNumber, event.noteNumber, event.velocity);
+                        this.audioBufferCounter.set(audioBufferId, (this.audioBufferCounter.get(audioBufferId) ?? 0) + 1);
                         if (channel.programNumber < 0) {
                             channel.programNumber = event.programNumber;
                             switch (channel.bankMSB) {
@@ -679,6 +749,10 @@ export class Midy {
                 timeline.push(event);
             }
         }
+        for (const [audioBufferId, count] of this.audioBufferCounter) {
+            if (count === 1)
+                this.audioBufferCounter.delete(audioBufferId);
+        }
         const priority = {
             controller: 0,
             sysEx: 1,
@@ -772,7 +846,7 @@ export class Midy {
         return this.resumeTime + now - this.startTime - this.startDelay;
     }
     getActiveNotes(channel, time) {
-        const activeNotes = new Map();
+        const activeNotes = new SparseMap(128);
         channel.scheduledNotes.forEach((noteList) => {
             const activeNote = this.getActiveNote(noteList, time);
             if (activeNote) {
@@ -1110,12 +1184,31 @@ export class Midy {
         note.vibratoLFO.connect(note.vibratoDepth);
         note.vibratoDepth.connect(note.bufferSource.detune);
     }
+    async getAudioBuffer(program, noteNumber, velocity, voiceParams, isSF3) {
+        const audioBufferId = this.getAudioBufferId(program, noteNumber, velocity);
+        const cache = this.audioBufferCache.get(audioBufferId);
+        if (cache) {
+            cache.counter += 1;
+            if (cache.maxCount <= cache.counter) {
+                this.audioBufferCache.delete(audioBufferId);
+            }
+            return cache.audioBuffer;
+        }
+        else {
+            const maxCount = this.audioBufferCounter.get(audioBufferId) ?? 0;
+            const audioBuffer = await this.createNoteBuffer(voiceParams, isSF3);
+            const cache = { audioBuffer, maxCount, counter: 1 };
+            this.audioBufferCache.set(audioBufferId, cache);
+            return audioBuffer;
+        }
+    }
     async createNote(channel, voice, noteNumber, velocity, startTime, portamento, isSF3) {
         const state = channel.state;
         const controllerState = this.getControllerState(channel, noteNumber, velocity);
         const voiceParams = voice.getAllParams(controllerState);
         const note = new Note(noteNumber, velocity, startTime, voice, voiceParams);
-        note.bufferSource = await this.createNoteBufferNode(voiceParams, isSF3);
+        const audioBuffer = await this.getAudioBuffer(channel.program, noteNumber, velocity, voiceParams, isSF3);
+        note.bufferSource = this.createNoteBufferNode(audioBuffer, voiceParams);
         note.volumeNode = new GainNode(this.audioContext);
         note.gainL = new GainNode(this.audioContext);
         note.gainR = new GainNode(this.audioContext);
@@ -1175,10 +1268,10 @@ export class Midy {
         if (soundFontIndex === undefined)
             return;
         const soundFont = this.soundFonts[soundFontIndex];
-        const isSF3 = soundFont.parsed.info.version.major === 3;
         const voice = soundFont.getVoice(bankNumber, channel.program, noteNumber, velocity);
         if (!voice)
             return;
+        const isSF3 = soundFont.parsed.info.version.major === 3;
         const note = await this.createNote(channel, voice, noteNumber, velocity, startTime, portamento, isSF3);
         note.gainL.connect(channel.gainL);
         note.gainR.connect(channel.gainR);
@@ -1362,6 +1455,7 @@ export class Midy {
         channel.program = program;
     }
     handleChannelPressure(channelNumber, value) {
+        const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         const prev = channel.state.channelPressure;
         const next = value / 127;
@@ -1371,13 +1465,8 @@ export class Midy {
             channel.detune += pressureDepth * (next - prev);
         }
         const table = channel.channelPressureTable;
-        channel.scheduledNotes.forEach((noteList) => {
-            for (let i = 0; i < noteList.length; i++) {
-                const note = noteList[i];
-                if (!note)
-                    continue;
-                this.applyDestinationSettings(channel, note, table);
-            }
+        this.getActiveNotes(channel, now).forEach((note) => {
+            this.applyDestinationSettings(channel, note, table);
         });
         // this.applyVoiceParams(channel, 13);
     }
@@ -1788,8 +1877,7 @@ export class Midy {
         channel.state.sostenutoPedal = value / 127;
         if (64 <= value) {
             const now = this.audioContext.currentTime;
-            const activeNotes = this.getActiveNotes(channel, now);
-            channel.sostenutoNotes = new Map(activeNotes);
+            channel.sostenutoNotes = this.getActiveNotes(channel, now);
         }
         else {
             this.releaseSostenutoPedal(channelNumber, value);
@@ -2170,7 +2258,10 @@ export class Midy {
                 switch (data[3]) {
                     case 8:
                         // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/ca21.pdf
-                        return this.handleScaleOctaveTuning1ByteFormatSysEx(data);
+                        return this.handleScaleOctaveTuning1ByteFormatSysEx(data, false);
+                    case 9:
+                        // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/ca21.pdf
+                        return this.handleScaleOctaveTuning2ByteFormatSysEx(data, false);
                     default:
                         console.warn(`Unsupported Exclusive Message: ${data}`);
                 }
@@ -2232,8 +2323,10 @@ export class Midy {
             case 8:
                 switch (data[3]) {
                     case 8: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/ca21.pdf
-                        // TODO: realtime
-                        return this.handleScaleOctaveTuning1ByteFormatSysEx(data);
+                        return this.handleScaleOctaveTuning1ByteFormatSysEx(data, true);
+                    case 9:
+                        // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/ca21.pdf
+                        return this.handleScaleOctaveTuning2ByteFormatSysEx(data, true);
                     default:
                         console.warn(`Unsupported Exclusive Message: ${data}`);
                 }
@@ -2503,8 +2596,26 @@ export class Midy {
         }
         return bitmap;
     }
-    handleScaleOctaveTuning1ByteFormatSysEx(data) {
-        if (data.length < 18) {
+    handleScaleOctaveTuning1ByteFormatSysEx(data, realtime) {
+        if (data.length < 19) {
+            console.error("Data length is too short");
+            return;
+        }
+        const channelBitmap = this.getChannelBitmap(data);
+        for (let i = 0; i < channelBitmap.length; i++) {
+            if (!channelBitmap[i])
+                continue;
+            const channel = this.channels[i];
+            for (let j = 0; j < 12; j++) {
+                const centValue = data[j + 7] - 64;
+                channel.scaleOctaveTuningTable[j] = centValue;
+            }
+            if (realtime)
+                this.updateChannelDetune(channel);
+        }
+    }
+    handleScaleOctaveTuning2ByteFormatSysEx(data, realtime) {
+        if (data.length < 31) {
             console.error("Data length is too short");
             return;
         }
@@ -2512,10 +2623,17 @@ export class Midy {
         for (let i = 0; i < channelBitmap.length; i++) {
             if (!channelBitmap[i])
                 continue;
+            const channel = this.channels[i];
             for (let j = 0; j < 12; j++) {
-                const value = data[j + 7] - 64; // cent
-                this.channels[i].scaleOctaveTuningTable[j] = value;
+                const index = 7 + j * 2;
+                const msb = data[index] & 0x7F;
+                const lsb = data[index + 1] & 0x7F;
+                const value14bit = msb * 128 + lsb;
+                const centValue = (value14bit - 8192) / 8.192;
+                channel.scaleOctaveTuningTable[j] = centValue;
             }
+            if (realtime)
+                this.updateChannelDetune(channel);
         }
     }
     applyDestinationSettings(channel, note, table) {
@@ -2666,7 +2784,7 @@ Object.defineProperty(Midy, "channelSettings", {
     value: {
         currentBufferSource: null,
         detune: 0,
-        scaleOctaveTuningTable: new Array(12).fill(0), // cent
+        scaleOctaveTuningTable: new Float32Array(12), // [-100, 100] cent
         channelPressureTable: new Uint8Array([64, 64, 64, 0, 0, 0]),
         polyphonicKeyPressureTable: new Uint8Array([64, 64, 64, 0, 0, 0]),
         keyBasedInstrumentControlTable: new Int8Array(128 * 128), // [-64, 63]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marmooo/midy",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "A MIDI player/synthesizer written in JavaScript that supports GM-Lite/GM1 and SF2/SF3.",
   "repository": {
     "type": "git",

package/script/midy-GM1.d.ts

@@ -22,6 +22,8 @@ export class MidyGM1 {
     resumeTime: number;
     soundFonts: any[];
     soundFontTable: any[];
+    audioBufferCounter: Map<any, any>;
+    audioBufferCache: Map<any, any>;
     isPlaying: boolean;
     isPausing: boolean;
     isPaused: boolean;
@@ -30,7 +32,7 @@ export class MidyGM1 {
     timeline: any[];
     instruments: any[];
     notePromises: any[];
-    exclusiveClassMap: Map<any, any>;
+    exclusiveClassMap: SparseMap;
     audioContext: any;
     masterVolume: any;
     voiceParamsHandlers: {
@@ -71,12 +73,13 @@ export class MidyGM1 {
     };
     createChannels(audioContext: any): any[];
     createNoteBuffer(voiceParams: any, isSF3: any): Promise<any>;
-    createNoteBufferNode(voiceParams: any, isSF3: any): Promise<any>;
+    createNoteBufferNode(audioBuffer: any, voiceParams: any): any;
     scheduleTimelineEvents(t: any, offset: any, queueIndex: any): Promise<any>;
     getQueueIndex(second: any): number;
     playNotes(): Promise<any>;
     ticksToSecond(ticks: any, secondsPerBeat: any): number;
     secondToTicks(second: any, secondsPerBeat: any): number;
+    getAudioBufferId(programNumber: any, noteNumber: any, velocity: any): string;
     extractMidiData(midi: any): {
         instruments: Set<any>;
         timeline: any[];
@@ -90,7 +93,7 @@ export class MidyGM1 {
     seekTo(second: any): void;
     calcTotalTime(): number;
     currentTime(): number;
-    getActiveNotes(channel: any, time: any): Map<any, any>;
+    getActiveNotes(channel: any, time: any): SparseMap;
     getActiveNote(noteList: any, time: any): any;
     cbToRatio(cb: any): number;
     rateToCent(rate: any): number;
@@ -104,6 +107,7 @@ export class MidyGM1 {
     clampCutoffFrequency(frequency: any): number;
     setFilterEnvelope(note: any): void;
     startModulation(channel: any, note: any, startTime: any): void;
+    getAudioBuffer(program: any, noteNumber: any, velocity: any, voiceParams: any, isSF3: any): Promise<any>;
     createNote(channel: any, voice: any, noteNumber: any, velocity: any, startTime: any, isSF3: any): Promise<Note>;
     scheduleNoteOn(channelNumber: any, noteNumber: any, velocity: any, startTime: any): Promise<void>;
     noteOn(channelNumber: any, noteNumber: any, velocity: any): Promise<void>;
@@ -186,6 +190,19 @@ export class MidyGM1 {
     handleSysEx(data: any): void;
     scheduleTask(callback: any, startTime: any): Promise<any>;
 }
+declare class SparseMap {
+    constructor(size: any);
+    data: any[];
+    activeIndices: any[];
+    set(key: any, value: any): void;
+    get(key: any): any;
+    delete(key: any): boolean;
+    has(key: any): boolean;
+    get size(): number;
+    clear(): void;
+    forEach(callback: any): void;
+    [Symbol.iterator](): Generator<any[], void, unknown>;
+}
 declare class Note {
     constructor(noteNumber: any, velocity: any, startTime: any, voice: any, voiceParams: any);
     bufferSource: any;

package/script/midy-GM1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AAqFA;IAoBE;;;;;;;;;;;;MAYE;IAEF,+BAQC;IAzCD,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IAClB,iCAA8B;IAiB5B,kBAAgC;IAChC,kBAA8C;IAC9C;;;;;;;;;;;MAA2D;IAC3D;;;;;;;;;;;;;MAA+D;IAC/D,gBAAiD;IAKnD,4BAMC;IAED,mCAWC;IAED,gDAMC;IAED,sCASC;IAED;;;;MAeC;IAED,yCAUC;IAED,6DA2BC;IAED,iEAUC;IAED,2EA+CC;IAED,mCAOC;IAED,0BAkDC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAgEC;IAED,+EAmBC;IAED,qDAKC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED,2BAEC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,qCAMC;IAED,wCAQC;IAED,4CAKC;IAED,mCAgBC;IAED,kCAqBC;IAED,6CAIC;IAED,mCAuBC;IAED,+DAoBC;IAED,gHA2BC;IAED,kGAgDC;IAED,0EAGC;IAED,qFA4BC;IAED,6HAuBC;IAED,0FAGC;IAED,kEAeC;IAED,gFAiBC;IAED,4DAGC;IAED,qEAGC;IAED,mDASC;IAED,gDASC;IAED,gDASC;IAED,qCAMC;IAED,mCAQC;IAED,gCAOC;IAED,+BAMC;IAED;;;;;;;;;;;MA4CC;IAED,oFAMC;IAED,0DA6CC;IAED;;;;;;;;;;;;;MAeC;IAED,+EAWC;IAED,qCAeC;IAED,8DAIC;IACD,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,mDAGC;IAED,wCAWC;IAED,sDAKC;IAED,kFAeC;IAED,2DAMC;IAED,oCAkBC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,kDAKC;IAED,wDASC;IAED,8CAKC;IAED,oDAOC;IAED,gDAKC;IAED,sDAOC;IAED,+CAEC;IAED,8CAqBC;IAED,+CAEC;IAED,4DAgBC;IAED,oBAMC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AArzCD;IAUE,0FAMC;IAfD,kBAAa;IACb,gBAAW;IACX,wBAAmB;IACnB,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAChB,gBAAW;IACX,kBAAa;IAGX,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,WAAkB;IAClB,iBAA8B;CAEjC"}
+{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AAkJA;IAsBE;;;;;;;;;;;;MAYE;IAEF,+BAQC;IA3CD,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,kCAA+B;IAC/B,gCAA6B;IAC7B,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IAClB,6BAAuC;IAiBrC,kBAAgC;IAChC,kBAA8C;IAC9C;;;;;;;;;;;MAA2D;IAC3D;;;;;;;;;;;;;MAA+D;IAC/D,gBAAiD;IAKnD,4BAMC;IAED,mCAWC;IAED,gDAMC;IAED,sCASC;IAED;;;;MAeC;IAED,yCAUC;IAED,6DA2BC;IAED,8DASC;IAED,2EA+CC;IAED,mCAOC;IAED,0BAoDC;IAED,uDAEC;IAED,wDAEC;IAED,6EAEC;IAED;;;MA4EC;IAED,+EAmBC;IAED,qDAKC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,mDASC;IAED,6CAQC;IAED,2BAEC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,qCAMC;IAED,wCAQC;IAED,4CAKC;IAED,mCAgBC;IAED,kCAqBC;IAED,6CAIC;IAED,mCAuBC;IAED,+DAoBC;IAED,yGAgBC;IAED,gHAuCC;IAED,kGAgDC;IAED,0EAGC;IAED,qFA4BC;IAED,6HAuBC;IAED,0FAGC;IAED,kEAeC;IAED,gFAiBC;IAED,4DAGC;IAED,qEAGC;IAED,mDASC;IAED,gDASC;IAED,gDASC;IAED,qCAMC;IAED,mCAQC;IAED,gCAOC;IAED,+BAMC;IAED;;;;;;;;;;;MA4CC;IAED,oFAMC;IAED,0DA6CC;IAED;;;;;;;;;;;;;MAeC;IAED,+EAWC;IAED,qCAeC;IAED,8DAIC;IACD,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,mDAGC;IAED,wCAWC;IAED,sDAKC;IAED,kFAeC;IAED,2DAMC;IAED,oCAkBC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,kDAKC;IAED,wDASC;IAED,8CAKC;IAED,oDAOC;IAED,gDAKC;IAED,sDAOC;IAED,+CAEC;IAED,8CAqBC;IAED,+CAEC;IAED,4DAgBC;IAED,oBAMC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAl6CD;IACE,uBAGC;IAFC,YAA2B;IAC3B,qBAAuB;IAGzB,gCAKC;IAED,mBAEC;IAED,0BAUC;IAED,uBAEC;IAED,mBAEC;IAED,cAMC;IASD,6BAKC;IAZD,qDAKC;CAQF;AAED;IAUE,0FAMC;IAfD,kBAAa;IACb,gBAAW;IACX,wBAAmB;IACnB,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAChB,gBAAW;IACX,kBAAa;IAGX,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,WAAkB;IAClB,iBAA8B;CAEjC"}

package/script/midy-GM1.js

@@ -3,6 +3,58 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MidyGM1 = void 0;
 const midi_file_1 = require("midi-file");
 const soundfont_parser_1 = require("@marmooo/soundfont-parser");
+// 2-3 times faster than Map
+class SparseMap {
+    constructor(size) {
+        this.data = new Array(size);
+        this.activeIndices = [];
+    }
+    set(key, value) {
+        if (this.data[key] === undefined) {
+            this.activeIndices.push(key);
+        }
+        this.data[key] = value;
+    }
+    get(key) {
+        return this.data[key];
+    }
+    delete(key) {
+        if (this.data[key] !== undefined) {
+            this.data[key] = undefined;
+            const index = this.activeIndices.indexOf(key);
+            if (index !== -1) {
+                this.activeIndices.splice(index, 1);
+            }
+            return true;
+        }
+        return false;
+    }
+    has(key) {
+        return this.data[key] !== undefined;
+    }
+    get size() {
+        return this.activeIndices.length;
+    }
+    clear() {
+        for (let i = 0; i < this.activeIndices.length; i++) {
+            const key = this.activeIndices[i];
+            this.data[key] = undefined;
+        }
+        this.activeIndices = [];
+    }
+    *[Symbol.iterator]() {
+        for (let i = 0; i < this.activeIndices.length; i++) {
+            const key = this.activeIndices[i];
+            yield [key, this.data[key]];
+        }
+    }
+    forEach(callback) {
+        for (let i = 0; i < this.activeIndices.length; i++) {
+            const key = this.activeIndices[i];
+            callback(this.data[key], key, this);
+        }
+    }
+}
 class Note {
     constructor(noteNumber, velocity, startTime, voice, voiceParams) {
         Object.defineProperty(this, "bufferSource", {
@@ -181,6 +233,18 @@ class MidyGM1 {
             writable: true,
             value: this.initSoundFontTable()
         });
+        Object.defineProperty(this, "audioBufferCounter", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Map()
+        });
+        Object.defineProperty(this, "audioBufferCache", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Map()
+        });
         Object.defineProperty(this, "isPlaying", {
             enumerable: true,
             configurable: true,
@@ -233,7 +297,7 @@ class MidyGM1 {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: new Map()
+            value: new SparseMap(128)
         });
         this.audioContext = audioContext;
         this.masterVolume = new GainNode(audioContext);
@@ -246,7 +310,7 @@ class MidyGM1 {
     initSoundFontTable() {
         const table = new Array(128);
         for (let i = 0; i < 128; i++) {
-            table[i] = new Map();
+            table[i] = new SparseMap(128);
         }
         return table;
     }
@@ -299,7 +363,7 @@ class MidyGM1 {
                 ...this.constructor.channelSettings,
                 state: new ControllerState(),
                 ...this.setChannelAudioNodes(audioContext),
-                scheduledNotes: new Map(),
+                scheduledNotes: new SparseMap(128),
             };
         });
         return channels;
@@ -333,9 +397,8 @@ class MidyGM1 {
             return audioBuffer;
         }
     }
-    async createNoteBufferNode(voiceParams, isSF3) {
+    createNoteBufferNode(audioBuffer, voiceParams) {
         const bufferSource = new AudioBufferSourceNode(this.audioContext);
-        const audioBuffer = await this.createNoteBuffer(voiceParams, isSF3);
         bufferSource.buffer = audioBuffer;
         bufferSource.loop = voiceParams.sampleModes % 2 !== 0;
         if (bufferSource.loop) {
@@ -400,6 +463,7 @@ class MidyGM1 {
                     await Promise.all(this.notePromises);
                     this.notePromises = [];
                     this.exclusiveClassMap.clear();
+                    this.audioBufferCache.clear();
                     resolve();
                     return;
                 }
@@ -415,8 +479,9 @@ class MidyGM1 {
                 }
                 else if (this.isStopping) {
                     await this.stopNotes(0, true);
-                    this.exclusiveClassMap.clear();
                     this.notePromises = [];
+                    this.exclusiveClassMap.clear();
+                    this.audioBufferCache.clear();
                     resolve();
                     this.isStopping = false;
                     this.isPaused = false;
@@ -447,6 +512,9 @@ class MidyGM1 {
     secondToTicks(second, secondsPerBeat) {
         return second * this.ticksPerBeat / secondsPerBeat;
     }
+    getAudioBufferId(programNumber, noteNumber, velocity) {
+        return `${programNumber}:${noteNumber}:${velocity}`;
+    }
     extractMidiData(midi) {
         const instruments = new Set();
         const timeline = [];
@@ -467,6 +535,8 @@ class MidyGM1 {
                 switch (event.type) {
                     case "noteOn": {
                         const channel = tmpChannels[event.channel];
+                        const audioBufferId = this.getAudioBufferId(channel.programNumber, event.noteNumber, event.velocity);
+                        this.audioBufferCounter.set(audioBufferId, (this.audioBufferCounter.get(audioBufferId) ?? 0) + 1);
                         if (channel.programNumber < 0) {
                             instruments.add(`${channel.bank}:0`);
                             channel.programNumber = 0;
@@ -483,6 +553,10 @@ class MidyGM1 {
                 timeline.push(event);
             }
         }
+        for (const [audioBufferId, count] of this.audioBufferCounter) {
+            if (count === 1)
+                this.audioBufferCounter.delete(audioBufferId);
+        }
         const priority = {
             controller: 0,
             sysEx: 1,
@@ -573,7 +647,7 @@ class MidyGM1 {
         return this.resumeTime + now - this.startTime - this.startDelay;
     }
     getActiveNotes(channel, time) {
-        const activeNotes = new Map();
+        const activeNotes = new SparseMap(128);
         channel.scheduledNotes.forEach((noteList) => {
             const activeNote = this.getActiveNote(noteList, time);
             if (activeNote) {
@@ -715,11 +789,31 @@ class MidyGM1 {
         note.modulationLFO.connect(note.volumeDepth);
         note.volumeDepth.connect(note.volumeEnvelopeNode.gain);
     }
+    async getAudioBuffer(program, noteNumber, velocity, voiceParams, isSF3) {
+        const audioBufferId = this.getAudioBufferId(program, noteNumber, velocity);
+        const cache = this.audioBufferCache.get(audioBufferId);
+        if (cache) {
+            cache.counter += 1;
+            if (cache.maxCount <= cache.counter) {
+                this.audioBufferCache.delete(audioBufferId);
+            }
+            return cache.audioBuffer;
+        }
+        else {
+            const maxCount = this.audioBufferCounter.get(audioBufferId) ?? 0;
+            const audioBuffer = await this.createNoteBuffer(voiceParams, isSF3);
+            const cache = { audioBuffer, maxCount, counter: 1 };
+            this.audioBufferCache.set(audioBufferId, cache);
+            return audioBuffer;
+        }
+    }
     async createNote(channel, voice, noteNumber, velocity, startTime, isSF3) {
         const state = channel.state;
-        const voiceParams = voice.getAllParams(state.array);
+        const controllerState = this.getControllerState(channel, noteNumber, velocity);
+        const voiceParams = voice.getAllParams(controllerState);
         const note = new Note(noteNumber, velocity, startTime, voice, voiceParams);
-        note.bufferSource = await this.createNoteBufferNode(voiceParams, isSF3);
+        const audioBuffer = await this.getAudioBuffer(channel.program, noteNumber, velocity, voiceParams, isSF3);
+        note.bufferSource = this.createNoteBufferNode(audioBuffer, voiceParams);
         note.volumeEnvelopeNode = new GainNode(this.audioContext);
         note.filterNode = new BiquadFilterNode(this.audioContext, {
             type: "lowpass",
@@ -743,10 +837,10 @@ class MidyGM1 {
         if (soundFontIndex === undefined)
             return;
         const soundFont = this.soundFonts[soundFontIndex];
-        const isSF3 = soundFont.parsed.info.version.major === 3;
         const voice = soundFont.getVoice(bankNumber, channel.program, noteNumber, velocity);
         if (!voice)
             return;
+        const isSF3 = soundFont.parsed.info.version.major === 3;
         const note = await this.createNote(channel, voice, noteNumber, velocity, startTime, isSF3);
         note.volumeEnvelopeNode.connect(channel.gainL);
         note.volumeEnvelopeNode.connect(channel.gainR);