From bb62616b05401f1d63df74ac1676cc1ae95c5b92 Mon Sep 17 00:00:00 2001
From: Lucas Theis <lucas@theis.io>
Date: Sun, 26 Jan 2025 18:21:47 +0000
Subject: [PATCH] Fix(Spectrogram): alignment between ticks and spectrogram
 (#4011)

---
 cypress/e2e/spectrogram.cy.js |  31 ++++++++++
 examples/audio/1khz.mp3       | Bin 0 -> 80666 bytes
 src/plugins/spectrogram.ts    | 104 ++++++++++++++++++++++------------
 3 files changed, 100 insertions(+), 35 deletions(-)
 create mode 100644 examples/audio/1khz.mp3

diff --git a/cypress/e2e/spectrogram.cy.js b/cypress/e2e/spectrogram.cy.js
index fcaa80f96..89938c72e 100644
--- a/cypress/e2e/spectrogram.cy.js
+++ b/cypress/e2e/spectrogram.cy.js
@@ -1,4 +1,5 @@
 const id = '#waveform'
+const scales = ['linear', 'mel', 'log', 'bark', 'erb']
 
 xdescribe('WaveSurfer Spectrogram plugin tests', () => {
   it('should render a spectrogram', () => {
@@ -81,4 +82,34 @@ xdescribe('WaveSurfer Spectrogram plugin tests', () => {
       })
     })
   })
+
+  scales.forEach(scale => {
+    it(`should display correct frequency labels with 1kHz tone (${scale})`, () => {
+      cy.visit('cypress/e2e/index.html')
+      cy.window().then((win) => {
+        return new Promise((resolve) => {
+          win.wavesurfer = win.WaveSurfer.create({
+            container: id,
+            height: 200,
+            url: '../../examples/audio/1khz.mp3',
+            plugins: [
+              win.Spectrogram.create({
+                height: 200,
+                labels: true,
+                scale: scale,
+                frequencyMin: 0,
+                frequencyMax: 4000,
+                splitChannels: false
+              }),
+            ],
+          })
+
+          win.wavesurfer.once('ready', () => {
+            cy.get(id).matchImageSnapshot(`spectrogram-1khz-${scale}`)
+            resolve()
+          })
+        })
+      })
+    })
+  })
 })
diff --git a/examples/audio/1khz.mp3 b/examples/audio/1khz.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..6269ad50851958606ee6b19be9be3e59f0cdb5c8
GIT binary patch
literal 80666
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
V@oUQva#SMnZS?>B`5!U^{|^C8lT-iz

literal 0
HcmV?d00001

diff --git a/src/plugins/spectrogram.ts b/src/plugins/spectrogram.ts
index 8d234c975..46658fb35 100644
--- a/src/plugins/spectrogram.ts
+++ b/src/plugins/spectrogram.ts
@@ -255,7 +255,7 @@ export type SpectrogramPluginOptions = {
   alpha?: number
   /** Min frequency to scale spectrogram. */
   frequencyMin?: number
-  /** Max frequency to scale spectrogram. Set this to samplerate/4 to draw whole range of spectrogram. */
+  /** Max frequency to scale spectrogram. Set this to samplerate/2 to draw whole range of spectrogram. */
   frequencyMax?: number
   /**
    * Based on: https://manual.audacityteam.org/man/spectrogram_settings.html
@@ -384,10 +384,12 @@ class SpectrogramPlugin extends BasePlugin<SpectrogramPluginEvents, SpectrogramP
     this.gainDB = options.gainDB ?? 20
     this.rangeDB = options.rangeDB ?? 80
     this.scale = options.scale || 'mel'
-    this.numMelFilters = this.fftSamples / 4
-    this.numLogFilters = this.fftSamples / 8
-    this.numBarkFilters = this.fftSamples / 8
-    this.numErbFilters = this.fftSamples / 8
+
+    // Other values will currently cause a misalignment between labels and the spectrogram
+    this.numMelFilters = this.fftSamples / 2
+    this.numLogFilters = this.fftSamples / 2
+    this.numBarkFilters = this.fftSamples / 2
+    this.numErbFilters = this.fftSamples / 2
 
     this.createWrapper()
     this.createCanvas()
@@ -504,7 +506,11 @@ class SpectrogramPlugin extends BasePlugin<SpectrogramPluginEvents, SpectrogramP
     const spectrCc = this.spectrCc
     const height = this.height
     const width = this.getWidth()
+
+    // Maximum frequency represented in `frequenciesData`
     const freqFrom = this.buffer.sampleRate / 2
+
+    // Minimum and maximum frequency we want to draw
     const freqMin = this.frequencyMin
     const freqMax = this.frequencyMax
 
@@ -512,6 +518,13 @@ class SpectrogramPlugin extends BasePlugin<SpectrogramPluginEvents, SpectrogramP
       return
     }
 
+    if (freqMax > freqFrom) {
+      // Draw background since spectrogram will not fill the entire canvas
+      const bgColor = this.colorMap[this.colorMap.length - 1]
+      spectrCc.fillStyle = `rgba(${bgColor[0]}, ${bgColor[1]}, ${bgColor[2]}, ${bgColor[3]})`
+      spectrCc.fillRect(0, 0, width, height * frequenciesData.length)
+    }
+
     for (let c = 0; c < frequenciesData.length; c++) {
       // for each channel
       const pixels = this.resample(frequenciesData[c])
@@ -521,7 +534,7 @@ class SpectrogramPlugin extends BasePlugin<SpectrogramPluginEvents, SpectrogramP
       for (let i = 0; i < pixels.length; i++) {
         for (let j = 0; j < pixels[i].length; j++) {
           const colorMap = this.colorMap[pixels[i][j]]
-          const redIndex = ((bitmapHeight / 2 - j) * width + i) * 4
+          const redIndex = ((bitmapHeight - j - 1) * width + i) * 4
           imageData.data[redIndex] = colorMap[0] * 255
           imageData.data[redIndex + 1] = colorMap[1] * 255
           imageData.data[redIndex + 2] = colorMap[2] * 255
@@ -529,15 +542,28 @@ class SpectrogramPlugin extends BasePlugin<SpectrogramPluginEvents, SpectrogramP
         }
       }
 
-      // scale and stack spectrograms
+      // The relative positions of `freqMin` and `freqMax` in `imageData`
+      const rMin = this.hzToScale(freqMin) / this.hzToScale(freqFrom)
+      const rMax = this.hzToScale(freqMax) / this.hzToScale(freqFrom)
+
+      // Only relevant if `freqMax > freqFrom`
+      const rMax1 = Math.min(1, rMax)
+
+      // Crop, scale and stack spectrograms
       createImageBitmap(
         imageData,
         0,
-        Math.round(bitmapHeight - bitmapHeight * (freqMax / freqFrom)) / 2,
+        Math.round(bitmapHeight * (1 - rMax1)),
         width,
-        Math.round(bitmapHeight * ((freqMax - freqMin) / freqFrom)),
+        Math.round(bitmapHeight * (rMax1 - rMin)),
       ).then((bitmap) => {
-        spectrCc.drawImage(bitmap, 0, height * c, width, height * 2)
+        spectrCc.drawImage(
+            bitmap,
+            0,
+            height * (c + 1 - rMax1 / rMax),
+            width,
+            height * rMax1 / rMax,
+        )
       })
     }
 
@@ -637,6 +663,34 @@ class SpectrogramPlugin extends BasePlugin<SpectrogramPluginEvents, SpectrogramP
     return this.createFilterBank(numErbFilters, sampleRate, this.hzToErb, this.erbToHz)
   }
 
+  private hzToScale(hz: number) {
+    switch (this.scale) {
+      case 'mel':
+        return this.hzToMel(hz)
+      case 'logarithmic':
+        return this.hzToLog(hz)
+      case 'bark':
+        return this.hzToBark(hz)
+      case 'erb':
+        return this.hzToErb(hz)
+    }
+    return hz
+  }
+
+  private scaleToHz(scale: number) {
+    switch (this.scale) {
+      case 'mel':
+        return this.melToHz(scale)
+      case 'logarithmic':
+        return this.logToHz(scale)
+      case 'bark':
+        return this.barkToHz(scale)
+      case 'erb':
+        return this.erbToHz(scale)
+    }
+    return scale
+  }
+
   private applyFilterBank(fftPoints: Float32Array, filterBank: number[][]): Float32Array {
     const numFilters = filterBank.length
     const logSpectrum = Float32Array.from({ length: numFilters }, () => 0)
@@ -656,7 +710,7 @@ class SpectrogramPlugin extends BasePlugin<SpectrogramPluginEvents, SpectrogramP
     const fftSamples = this.fftSamples
     const channels = this.options.splitChannels ?? this.wavesurfer?.options.splitChannels ? buffer.numberOfChannels : 1
 
-    this.frequencyMax = this.frequencyMax || buffer.sampleRate / 4
+    this.frequencyMax = this.frequencyMax || buffer.sampleRate / 2
 
     if (!buffer) return
 
@@ -738,12 +792,10 @@ class SpectrogramPlugin extends BasePlugin<SpectrogramPluginEvents, SpectrogramP
   private getLabelFrequency(
     index: number,
     labelIndex: number,
-    hzToScale: (hz: number) => number,
-    scaleToHz: (scale: number) => number,
   ) {
-    const scaleMin = hzToScale(0)
-    const scaleMax = hzToScale(this.frequencyMax)
-    return scaleToHz(scaleMin + (index / labelIndex) * (scaleMax - scaleMin))
+    const scaleMin = this.hzToScale(this.frequencyMin)
+    const scaleMax = this.hzToScale(this.frequencyMax)
+    return this.scaleToHz(scaleMin + (index / labelIndex) * (scaleMax - scaleMin))
   }
 
   private loadLabels(
@@ -796,25 +848,7 @@ class SpectrogramPlugin extends BasePlugin<SpectrogramPluginEvents, SpectrogramP
         ctx.textAlign = textAlign
         ctx.textBaseline = 'middle'
 
-        let freq
-        switch (this.scale) {
-          case 'mel':
-            freq = this.getLabelFrequency(i, labelIndex, this.hzToMel, this.melToHz)
-            break
-          case 'logarithmic':
-            freq = this.getLabelFrequency(i, labelIndex, this.hzToLog, this.logToHz)
-            break
-          case 'bark':
-            freq = this.getLabelFrequency(i, labelIndex, this.hzToBark, this.barkToHz)
-            break
-          case 'erb':
-            freq = this.getLabelFrequency(i, labelIndex, this.hzToErb, this.erbToHz)
-            break
-          default:
-            freq = freqStart + step * i
-            break
-        }
-
+        const freq = this.getLabelFrequency(i, labelIndex)
         const label = this.freqType(freq)
         const units = this.unitType(freq)
         const x = 16