test vamp

gesellkammer · Feb 18, 2024 · b67187a · b67187a
1 parent b4ba111
commit b67187a
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 20 deletions.
diff --git a/maelzel/snd/sndfiletools.py b/maelzel/snd/sndfiletools.py
@@ -310,7 +310,8 @@ def maxPeak(filename: str, start: float = 0, end: float = 0, resolution=0.01
     maximum_peak = 0
     max_pos = 0
     info = sndfileio.sndinfo(filename)
-    for data, pos in readChunks(filename, start=start, end=end, chunksize=int(info.sr*resolution)):
+    chunksize = int(info.samplerate * resolution)
+    for data, pos in readChunks(filename, start=start, end=end, chunksize=chunksize):
         np.abs(data, data)
         peak = np.max(data)
         if peak > maximum_peak:

diff --git a/maelzel/snd/vamptools.py b/maelzel/snd/vamptools.py
@@ -430,4 +430,4 @@ def pyinSmoothPitch(samples: np.ndarray,
                            step_size=stepSize, parameters=params)
     dt, freqs = result1['vector']
     freqsarray = np.array(freqs, dtype=float)
-    return (dt, freqsarray)
+    return (float(dt), freqsarray)
diff --git a/maelzel/test/snd/finneganswake.wav b/maelzel/test/snd/finneganswake.wav
diff --git a/maelzel/test/test_soundfiletools.py b/maelzel/test/test_soundfiletools.py
diff --git a/maelzel/test/snd/bourre-fragment.wav → test/snd/bourre-fragment.wav b/maelzel/test/snd/bourre-fragment.wav → test/snd/bourre-fragment.wav
diff --git a/test/snd/finneganswake-fragm.wav b/test/snd/finneganswake-fragm.wav
diff --git a/test/snd/finneganswake.flac b/test/snd/finneganswake.flac
diff --git a/maelzel/test/snd/finneganswake.mp3 → test/snd/finneganswake.mp3 b/maelzel/test/snd/finneganswake.mp3 → test/snd/finneganswake.mp3
diff --git a/maelzel/test/snd/sine440.flac → test/snd/sine440.flac b/maelzel/test/snd/sine440.flac → test/snd/sine440.flac
diff --git a/maelzel/test/snd/sines.aiff → test/snd/sines.aiff b/maelzel/test/snd/sines.aiff → test/snd/sines.aiff
diff --git a/test/snd/tuning-fork--A4--44100.flac b/test/snd/tuning-fork--A4--44100.flac
diff --git a/test/test-dependencies.py b/test/test-dependencies.py
@@ -3,6 +3,20 @@
 import sys
 
 
+def testvamp():
+    print("Testing included vamp plugins")
+    import sndfileio
+    import numpy as np
+    samples, sr = sndfileio.sndread("snd/sine440.flac")
+    dur = len(samples) / sr
+    from maelzel.snd import vamptools
+    print("  Testing pyin")
+    assert vamptools.pyinAvailable()
+    arr = vamptools.pyinPitchTrack(samples=samples, sr=sr)
+    for row in arr:
+        print(f"time={row[0]:.3f}, freq: {row[1]:.3f} Hz, voiced: {row[2]:.3f}")
+
+
 exiterr = 0
 errors = dependencies.checkDependencies(fix=True)
 if errors:
@@ -18,6 +32,9 @@
     print(f"lilypond binary: {lily}")
     print(f"lilypond version: {lilytools.getLilypondVersion()}")
 
+testvamp()
+
 dependencies.printReport()
 
+
 sys.exit(exiterr)
diff --git a/test/test-sndfiletools.py b/test/test-sndfiletools.py
@@ -0,0 +1,20 @@
+from maelzel.snd import sndfiletools
+import pitchtools as pt
+import matplotlib.pyplot as plt
+import time
+
+
+def peakbpf():
+    peaks = sndfiletools.peakbpf("snd/finneganswake.wav", channel=1, resolution=0.05)
+    t, maxpeak = sndfiletools.maxPeak("snd/finneganswake.wav")
+    print(f"Max. peak: {maxpeak} at {t} seconds")
+    for t, peak in zip(*peaks.points()):
+        db = pt.amp2db(peak)
+        print(f"{t=:.3f}, {peak=:.4f} ({db:.1f} dB)")
+    peaks.plot()
+
+
+if __name__ == "__main__":
+    peakbpf()
+    plt.show()
+