Remove SDFT prototype #5

jurihock · Nov 12, 2023 · f33f1c4 · f33f1c4
1 parent 0ab11c2
commit f33f1c4
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 370 deletions.
diff --git a/cpp/StftPitchShift/LibStftPitchShift.cmake b/cpp/StftPitchShift/LibStftPitchShift.cmake
@@ -37,7 +37,6 @@ set(HEADERS
   "${CMAKE_CURRENT_LIST_DIR}/Pitcher.h"
   "${CMAKE_CURRENT_LIST_DIR}/Resampler.h"
   "${CMAKE_CURRENT_LIST_DIR}/RFFT.h"
-  "${CMAKE_CURRENT_LIST_DIR}/SDFT.h"
   "${CMAKE_CURRENT_LIST_DIR}/STFT.h"
   "${CMAKE_CURRENT_LIST_DIR}/StftPitchShift.h"
   "${CMAKE_CURRENT_LIST_DIR}/StftPitchShiftCore.h"

diff --git a/cpp/StftPitchShift/SDFT.h b/cpp/StftPitchShift/SDFT.h
diff --git a/cpp/StftPitchShift/StftPitchShift.cpp b/cpp/StftPitchShift/StftPitchShift.cpp
@@ -3,7 +3,6 @@
 #include <StftPitchShift/FFT.h>
 #include <StftPitchShift/RFFT.h>
 
-#include <StftPitchShift/SDFT.h>
 #include <StftPitchShift/STFT.h>
 
 #include <StftPitchShift/StftPitchShiftCore.h>
@@ -162,24 +161,12 @@ void StftPitchShift::shiftpitch(
   core.distortion(distortion);
   core.normalization(normalization);
 
-  if (hopsize == 1)
-  {
-    SDFT<float> sdft(framesize, /* latency */ 1, chronometry);
-
-    sdft(size, input, output, [&](std::vector<std::complex<float>>& dft)
-    {
-      core.shiftpitch(dft);
-    });
-  }
-  else
-  {
-    STFT<float> stft(fft, framesize, hopsize, chronometry);
+  STFT<float> stft(fft, framesize, hopsize, chronometry);
 
-    stft(size, input, output, [&](std::vector<std::complex<float>>& dft)
-    {
-      core.shiftpitch(dft);
-    });
-  }
+  stft(size, input, output, [&](std::vector<std::complex<float>>& dft)
+  {
+    core.shiftpitch(dft);
+  });
 }
 
 void StftPitchShift::shiftpitch(
@@ -197,22 +184,10 @@ void StftPitchShift::shiftpitch(
   core.distortion(distortion);
   core.normalization(normalization);
 
-  if (hopsize == 1)
-  {
-    SDFT<double> sdft(framesize, /* latency */ 1, chronometry);
-
-    sdft(size, input, output, [&](std::vector<std::complex<double>>& dft)
-    {
-      core.shiftpitch(dft);
-    });
-  }
-  else
-  {
-    STFT<double> stft(fft, framesize, hopsize, chronometry);
+  STFT<double> stft(fft, framesize, hopsize, chronometry);
 
-    stft(size, input, output, [&](std::vector<std::complex<double>>& dft)
-    {
-      core.shiftpitch(dft);
-    });
-  }
+  stft(size, input, output, [&](std::vector<std::complex<double>>& dft)
+  {
+    core.shiftpitch(dft);
+  });
 }
diff --git a/cpp/StftPitchShift/main.cpp b/cpp/StftPitchShift/main.cpp
@@ -66,7 +66,7 @@ int main(int argc, char** argv)
 
       StftPitchShift stft(
         cli.framesize,
-        cli.hoprate ? cli.framesize / cli.hoprate : 1,
+        cli.framesize / cli.hoprate,
         samplerate,
         cli.normalization,
         cli.chronometry);

diff --git a/cpp/StftPitchShift/wasm.cpp b/cpp/StftPitchShift/wasm.cpp
@@ -119,7 +119,7 @@ extern "C"
     {
       StftPitchShift stft(
         cli.framesize,
-        cli.hoprate ? cli.framesize / cli.hoprate : 1,
+        cli.framesize / cli.hoprate,
         samplerate,
         cli.normalization,
         cli.chronometry);

diff --git a/python/stftpitchshift/main.py b/python/stftpitchshift/main.py
@@ -2,7 +2,6 @@
 from stftpitchshift import __version__ as version
 from stftpitchshift.io import read, write
 from stftpitchshift.plot import spectrogram
-from stftpitchshift.sdft import sdft
 from stftpitchshift.stft import stft
 
 import click
@@ -55,18 +54,9 @@ def cent(value): return pow(2, float(re.match('([+,-]?\\d+){1}([+,-]\\d+){0,1}',
 
         for channel in range(channels):
 
-            # STFT
             framesX = stft(x[:, channel], framesize, hopsize)
             framesY = stft(y[:, channel], framesize, hopsize)
 
-            # SDFT
-            # framesX = sdft(x[:, channel], framesize // 2)
-            # framesY = sdft(y[:, channel], framesize // 2)
-
-            # TEST
-            # framesX = stft(x[:, channel], framesize, hopsize)
-            # framesY = sdft(x[:, channel], framesize // 2)
-
             figure = plot.figure(f'Channel {channel+1}/{channels}')
 
             spectrogramX = figure.add_subplot(2, 1, 1, title='Input Spectrogram')