@onjmin/koe 1.0.5 → 1.0.7

package/dist/koe-convert.js

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-#!/usr/bin/env node
 
 // src/converter/cli.ts
 import { mkdir, readdir, readFile, writeFile } from "fs/promises";
@@ -17,14 +16,48 @@ function packKoe(manifest, pcmParts) {
 }
 
 // src/converter/frq.ts
-function parseFrqAverageF0(buffer) {
-  if (buffer.byteLength < 20) return null;
+var HEADER_SIZE = 40;
+function parseFrq(buffer) {
+  if (buffer.byteLength < HEADER_SIZE) return null;
   const view = new DataView(buffer);
   let header = "";
   for (let i = 0; i < 8; i++) header += String.fromCharCode(view.getUint8(i));
   if (header !== "FREQ0003") return null;
-  const avg = view.getFloat64(12, true);
-  return Number.isFinite(avg) && avg > 0 ? avg : null;
+  const hopSize = view.getInt32(8, true);
+  const averageF0 = view.getFloat64(12, true);
+  const declared = view.getInt32(36, true);
+  const available = Math.floor((buffer.byteLength - HEADER_SIZE) / 16);
+  const length = Math.max(0, Math.min(declared, available));
+  const f0 = new Float64Array(length);
+  const amp = new Float64Array(length);
+  for (let i = 0; i < length; i++) {
+    const p = HEADER_SIZE + i * 16;
+    f0[i] = view.getFloat64(p, true);
+    amp[i] = view.getFloat64(p + 8, true);
+  }
+  return {
+    hopSize: hopSize > 0 ? hopSize : 256,
+    averageF0: Number.isFinite(averageF0) && averageF0 > 0 ? averageF0 : 0,
+    f0,
+    amp
+  };
+}
+function frqAverageF0InRange(frq, startMs, endMs, sourceRate) {
+  if (!(sourceRate > 0) || frq.f0.length === 0) return 0;
+  const perFrameMs = frq.hopSize / sourceRate * 1e3;
+  if (!(perFrameMs > 0)) return 0;
+  const first = Math.max(0, Math.floor(startMs / perFrameMs));
+  const last = Math.min(frq.f0.length - 1, Math.ceil(endMs / perFrameMs));
+  let num = 0;
+  let den = 0;
+  for (let i = first; i <= last; i++) {
+    const hz = frq.f0[i];
+    if (!(hz > 0)) continue;
+    const w = frq.amp[i] > 0 ? frq.amp[i] : 1;
+    num += hz * w;
+    den += w;
+  }
+  return den > 0 ? num / den : 0;
 }
 function frqFileName(wavName) {
   const dot = wavName.lastIndexOf(".");
@@ -112,11 +145,25 @@ function msToSamples(ms) {
   return Math.round(ms / 1e3 * TARGET_RATE);
 }
 var clamp = (v, lo, hi) => Math.max(lo, Math.min(hi, v));
+function otoRegion(pcmLength, oto) {
+  const start = clamp(msToSamples(oto.offset), 0, pcmLength);
+  const end = oto.cutoff < 0 ? clamp(start + msToSamples(-oto.cutoff), start, pcmLength) : clamp(pcmLength - msToSamples(oto.cutoff), start, pcmLength);
+  return { start, end };
+}
+function centerSlice(slice) {
+  const out = new Int16Array(slice.length);
+  if (slice.length === 0) return out;
+  let sum = 0;
+  for (let i = 0; i < slice.length; i++) sum += slice[i];
+  const dc = Math.round(sum / slice.length);
+  for (let i = 0; i < slice.length; i++) {
+    out[i] = clamp(slice[i] - dc, -32768, 32767);
+  }
+  return out;
+}
 function trimToOto(pcm, oto, recordedPitch = 0) {
-  const full = pcm.length;
-  const start = clamp(msToSamples(oto.offset), 0, full);
-  const end = oto.cutoff < 0 ? clamp(start + msToSamples(-oto.cutoff), start, full) : clamp(full - msToSamples(oto.cutoff), start, full);
-  const slice = pcm.subarray(start, end);
+  const { start, end } = otoRegion(pcm.length, oto);
+  const slice = centerSlice(pcm.subarray(start, end));
   const length = slice.length;
   const pre = clamp(msToSamples(oto.pre), 0, length);
   const overlap = clamp(msToSamples(oto.overlap), 0, length);
@@ -280,11 +327,11 @@ function toInt16(samples) {
   }
   return out;
 }
-function normalizePcm(buf) {
+function readWavPcm48k(buf) {
   const wav = parseWav(buf);
   const mono = toMono(wav);
   const resampled = resample(mono, 48e3);
-  return toInt16(resampled.samples);
+  return { pcm: toInt16(resampled.samples), sourceRate: wav.sampleRate };
 }
 function readFourCC(view, pos) {
   return String.fromCharCode(
@@ -346,14 +393,24 @@ async function main() {
       try {
         const wavPath = resolveInside(otoDir, oto.wav);
         const wavBytes = await readFile(wavPath);
-        const pcm = normalizePcm(toArrayBuffer(wavBytes));
+        const { pcm, sourceRate } = readWavPcm48k(toArrayBuffer(wavBytes));
         let recordedPitch = pitchFromAliasSuffix(oto.alias) ?? 0;
         try {
           const frqBytes = await readFile(
             resolveInside(otoDir, frqFileName(oto.wav))
           );
-          const avg = parseFrqAverageF0(toArrayBuffer(frqBytes));
-          if (avg) recordedPitch = avg;
+          const frq = parseFrq(toArrayBuffer(frqBytes));
+          if (frq) {
+            const { start, end } = otoRegion(pcm.length, oto);
+            const toMs = (samples) => samples / 48e3 * 1e3;
+            const local = frqAverageF0InRange(
+              frq,
+              toMs(start) + oto.pre,
+              toMs(end),
+              sourceRate
+            ) || frqAverageF0InRange(frq, toMs(start), toMs(end), sourceRate) || frq.averageF0;
+            if (local > 0) recordedPitch = local;
+          }
         } catch {
         }
         inputs.push({ oto, pcm, recordedPitch });