activate swipe

Author: sebastianrosenzweig

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pytch"
-version = "0.3.0"
+version = "2.2.0"
 description = "A Real-Time Pitch Analysis Tool For Polyphonic Music"
 authors = [
   {name = "Pytch Contributors"}

pytch/audio.py

@@ -342,10 +342,12 @@ def compute_f0(self, audio, lvl):
             if lvl[0, c] < self.f0_lvl_threshold:
                 continue
 
+            audio_tmp = np.concatenate(
+                (audio[:, c][::-1], audio[:, c], audio[:, c][::-1])
+            )
             if self.f0_algorithm == "YIN":
-                # TODO: replace with real-time version, add real-time SWIPE, relax min/max limits
                 f0_tmp, _, conf_tmp = libf0.yin(
-                    np.concatenate((audio[:, c][::-1], audio[:, c], audio[:, c][::-1])),
+                    audio_tmp,
                     Fs=self.fs,
                     N=self.fft_len,
                     H=self.fft_len,
@@ -356,7 +358,13 @@ def compute_f0(self, audio, lvl):
                 )
                 f0[:, c] = np.mean(f0_tmp)  # take the center frame
                 conf[:, c] = 1 - np.mean(conf_tmp)
-
+            elif self.f0_algorithm == "SWIPE":
+                # TODO: replace with real-time version when available
+                f0_tmp, _, conf_tmp = libf0.swipe(
+                    audio[:, c], Fs=self.fs, H=self.fft_len, F_min=80.0, F_max=640.0
+                )
+                f0[:, c] = np.mean(f0_tmp)
+                conf[:, c] = 1 - np.mean(conf_tmp)
             else:
                 f0[:, c] = np.zeros(f0.shape[0])
                 conf[:, c] = np.zeros(f0.shape[0])

pytch/gui.py

@@ -189,7 +189,7 @@ def __init__(self, sounddevice_idx, channels, fs, fft_size, out_path):
         self.fs = fs
         self.fft_size = fft_size
         self.out_path = out_path
-        self.f0_algorithms = ["YIN"]
+        self.f0_algorithms = ["YIN", "SWIPE"]
         self.buf_len_sec = 30.0
         self.spec_scale_types = ["log", "linear"]
         self.ref_freq_modes = ["fixed", "highest", "lowest"]