1 files changed, 7 insertions, 4 deletions
diff --git a/tools/mq_editor/mq_extract.js b/tools/mq_editor/mq_extract.js
index d29cfbc..c03e869 100644
--- a/tools/mq_editor/mq_extract.js
+++ b/tools/mq_editor/mq_extract.js
@@ -3,14 +3,14 @@
 
 // Extract partials from audio buffer
 function extractPartials(params, stftCache) {
-  const {fftSize, threshold, sampleRate} = params;
+  const {fftSize, threshold, sampleRate, freqWeight} = params;
   const numFrames = stftCache.getNumFrames();
 
   const frames = [];
   for (let i = 0; i < numFrames; ++i) {
     const cachedFrame = stftCache.getFrameAtIndex(i);
     const squaredAmp = stftCache.getSquaredAmplitude(cachedFrame.time);
-    const peaks = detectPeaks(squaredAmp, fftSize, sampleRate, threshold);
+    const peaks = detectPeaks(squaredAmp, fftSize, sampleRate, threshold, freqWeight);
     frames.push({time: cachedFrame.time, peaks});
   }
 
@@ -29,10 +29,13 @@ function extractPartials(params, stftCache) {
 
 // Detect spectral peaks via local maxima + parabolic interpolation
 // squaredAmp: pre-computed re*re+im*im per bin
-function detectPeaks(squaredAmp, fftSize, sampleRate, thresholdDB) {
+// freqWeight: if true, weight by f before peak detection (f * Power(f))
+function detectPeaks(squaredAmp, fftSize, sampleRate, thresholdDB, freqWeight) {
   const mag = new Float32Array(fftSize / 2);
+  const binHz = sampleRate / fftSize;
   for (let i = 0; i < fftSize / 2; ++i) {
-    mag[i] = 10 * Math.log10(Math.max(squaredAmp[i], 1e-20));
+    const w = freqWeight ? (i * binHz) : 1.0;
+    mag[i] = 10 * Math.log10(Math.max(squaredAmp[i] * w, 1e-20));
   }
 
   const peaks = [];