@onjmin/dtm 0.1.83 → 0.1.84

package/dist/voice-worker.js

@@ -1,6 +1,135 @@
 "use strict";
 (() => {
-  // node_modules/.pnpm/@onjmin+koe@1.0.4/node_modules/@onjmin/koe/dist/index.js
+  // node_modules/.pnpm/@onjmin+koe@1.0.5/node_modules/@onjmin/koe/dist/index.js
+  var u8 = Uint8Array;
+  var u16 = Uint16Array;
+  var i32 = Int32Array;
+  var fleb = new u8([
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    1,
+    1,
+    1,
+    1,
+    2,
+    2,
+    2,
+    2,
+    3,
+    3,
+    3,
+    3,
+    4,
+    4,
+    4,
+    4,
+    5,
+    5,
+    5,
+    5,
+    0,
+    /* unused */
+    0,
+    0,
+    /* impossible */
+    0
+  ]);
+  var fdeb = new u8([
+    0,
+    0,
+    0,
+    0,
+    1,
+    1,
+    2,
+    2,
+    3,
+    3,
+    4,
+    4,
+    5,
+    5,
+    6,
+    6,
+    7,
+    7,
+    8,
+    8,
+    9,
+    9,
+    10,
+    10,
+    11,
+    11,
+    12,
+    12,
+    13,
+    13,
+    /* unused */
+    0,
+    0
+  ]);
+  var clim = new u8([16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15]);
+  var freb = function(eb, start) {
+    var b = new u16(31);
+    for (var i2 = 0; i2 < 31; ++i2) {
+      b[i2] = start += 1 << eb[i2 - 1];
+    }
+    var r = new i32(b[30]);
+    for (var i2 = 1; i2 < 30; ++i2) {
+      for (var j = b[i2]; j < b[i2 + 1]; ++j) {
+        r[j] = j - b[i2] << 5 | i2;
+      }
+    }
+    return { b, r };
+  };
+  var _a = freb(fleb, 2);
+  var fl = _a.b;
+  var revfl = _a.r;
+  fl[28] = 258, revfl[258] = 28;
+  var _b = freb(fdeb, 0);
+  var fd = _b.b;
+  var revfd = _b.r;
+  var rev = new u16(32768);
+  for (i = 0; i < 32768; ++i) {
+    x = (i & 43690) >> 1 | (i & 21845) << 1;
+    x = (x & 52428) >> 2 | (x & 13107) << 2;
+    x = (x & 61680) >> 4 | (x & 3855) << 4;
+    rev[i] = ((x & 65280) >> 8 | (x & 255) << 8) >> 1;
+  }
+  var x;
+  var i;
+  var flt = new u8(288);
+  for (i = 0; i < 144; ++i)
+    flt[i] = 8;
+  var i;
+  for (i = 144; i < 256; ++i)
+    flt[i] = 9;
+  var i;
+  for (i = 256; i < 280; ++i)
+    flt[i] = 7;
+  var i;
+  for (i = 280; i < 288; ++i)
+    flt[i] = 8;
+  var i;
+  var fdt = new u8(32);
+  for (i = 0; i < 32; ++i)
+    fdt[i] = 5;
+  var i;
+  var et = /* @__PURE__ */ new u8(0);
+  var td = typeof TextDecoder != "undefined" && /* @__PURE__ */ new TextDecoder();
+  var tds = 0;
+  try {
+    td.decode(et, { stream: true });
+    tds = 1;
+  } catch (e) {
+  }
   var MAGIC = 1263486208;
   function parseKoeHeader(headerBytes) {
     const view = new DataView(headerBytes);
@@ -166,7 +295,7 @@
       if (!buf) return null;
       const int16 = new Int16Array(buf, 0, Math.floor(buf.byteLength / 2));
       const f64 = new Float64Array(int16.length);
-      for (let i = 0; i < int16.length; i++) f64[i] = int16[i] / 32768;
+      for (let i2 = 0; i2 < int16.length; i2++) f64[i2] = int16[i2] / 32768;
       return f64;
     }
   };
@@ -174,6 +303,7 @@
   var MIN_WORLDLINE_SAMPLES = 4096;
   var SYNTH_REQ_SIZE = 120;
   var WL_FRAME_MS = 10;
+  var sampleCurve = (input, curve, totalMs) => typeof curve === "function" ? curve(input, totalMs) : curve;
   var samplesToMs = (samples) => samples / WORLDLINE_SAMPLE_RATE * 1e3;
   function leadInFromEntry(entry) {
     return {
@@ -259,11 +389,23 @@
      *          {@link MIN_WORLDLINE_SAMPLES} (too short for stable F0 analysis).
      */
     renderNote(params) {
-      const { pcm, pitch, durationMs, preMs, consonantMs, tempo = 120 } = params;
+      const {
+        pcm,
+        pitch,
+        durationMs,
+        preMs,
+        consonantMs,
+        tempo = 120,
+        gender = 0.5,
+        tension = 0.5,
+        breathiness = 0.5,
+        voicing = 1
+      } = params;
       if (!pcm || pcm.length < MIN_WORLDLINE_SAMPLES) return null;
       const WL = this.wasm;
       const FS = WORLDLINE_SAMPLE_RATE;
-      const midiNote = Math.round(69 + 12 * Math.log2(pitch / 440));
+      const basePitch = sampleCurve(preMs + durationMs / 2, pitch, preMs + durationMs);
+      const midiNote = Math.round(69 + 12 * Math.log2(basePitch / 440));
       const posMs = 0;
       const reqLen = preMs + durationMs;
       const cutMs = WL_FRAME_MS * 2;
@@ -309,11 +451,19 @@
       WL._free(reqPtr);
       const totalMs = posMs + reqLen + WL_FRAME_MS * 2;
       const nFrames = Math.ceil(totalMs / WL_FRAME_MS) + 4;
-      const f0Arr = new Float64Array(nFrames).fill(pitch);
-      const gArr = new Float64Array(nFrames).fill(0.5);
-      const tArr = new Float64Array(nFrames).fill(0.5);
-      const bArr = new Float64Array(nFrames).fill(0.5);
-      const vArr = new Float64Array(nFrames).fill(1);
+      const f0Arr = new Float64Array(nFrames);
+      const gArr = new Float64Array(nFrames);
+      const tArr = new Float64Array(nFrames);
+      const bArr = new Float64Array(nFrames);
+      const vArr = new Float64Array(nFrames);
+      for (let i2 = 0; i2 < nFrames; i2++) {
+        const tMs = i2 * WL_FRAME_MS;
+        f0Arr[i2] = sampleCurve(tMs, pitch, totalMs);
+        gArr[i2] = sampleCurve(tMs, gender, totalMs);
+        tArr[i2] = sampleCurve(tMs, tension, totalMs);
+        bArr[i2] = sampleCurve(tMs, breathiness, totalMs);
+        vArr[i2] = sampleCurve(tMs, voicing, totalMs);
+      }
       const f0Ptr = WL._malloc(nFrames * 8);
       const gPtr = WL._malloc(nFrames * 8);
       const tPtr = WL._malloc(nFrames * 8);
@@ -363,6 +513,18 @@
     }
   };
 
+  // src/vibrato.ts
+  var VIBRATO_RATE_HZ = 5.5;
+  var VIBRATO_DEPTH_CENTS = 35;
+  var VIBRATO_FADE_MS = 150;
+  var vibratoPitchCurve = (baseHz, preMs) => (tMs) => {
+    const sinceOnset = tMs - preMs;
+    if (sinceOnset <= 0) return baseHz;
+    const depth = VIBRATO_DEPTH_CENTS * Math.min(1, sinceOnset / VIBRATO_FADE_MS);
+    const cents = depth * Math.sin(2 * Math.PI * VIBRATO_RATE_HZ * sinceOnset / 1e3);
+    return baseHz * 2 ** (cents / 1200);
+  };
+
   // src/voice-worker.ts
   var KOE_SAMPLE_RATE = 48e3;
   var midiToFreq = (m) => 440 * 2 ** ((m - 69) / 12);
@@ -378,7 +540,7 @@
     }
     return p;
   };
-  var renderAlias = async (alias, pitch, durationMs) => {
+  var renderAlias = async (alias, pitch, durationMs, vibrato) => {
     if (!bank) return null;
     const pcm = await getPcm(alias);
     if (!pcm || pcm.length === 0) return null;
@@ -388,7 +550,7 @@
     if (worldline) {
       const audio = worldline.renderNote({
         pcm,
-        pitch: targetHz,
+        pitch: vibrato ? vibratoPitchCurve(targetHz, lead.preMs) : targetHz,
         durationMs,
         ...lead
       });
@@ -422,9 +584,9 @@
       return;
     }
     if (msg.type === "render") {
-      const { id, alias, pitch, durationMs } = msg;
+      const { id, alias, pitch, durationMs, vibrato } = msg;
       try {
-        const out = await renderAlias(alias, pitch, durationMs);
+        const out = await renderAlias(alias, pitch, durationMs, vibrato);
         if (out) {
           wself.postMessage(
             {

package/package.json

@@ -2,7 +2,7 @@
   "author": "onjmin",
   "license": "MIT",
   "name": "@onjmin/dtm",
-  "version": "0.1.83",
+  "version": "0.1.84",
   "description": "MMLを中間言語に用いた、モバイルファーストなDAW / ピアノロール打ち込みコンポーネント",
   "homepage": "https://onjmin.github.io/dtm",
   "repository": {
@@ -55,7 +55,7 @@
   },
   "dependencies": {
     "@onjmin/chord-parser": "1.0.4",
-    "@onjmin/koe": "1.0.4",
+    "@onjmin/koe": "1.0.5",
     "midi-json-parser": "8.1.74"
   },
   "scripts": {