Provide Window Function Name

pschatzmann · pschatzmann · commit 5e19374d3544 · 2025-02-24T15:35:55.000+01:00
diff --git a/src/AudioTools/AudioLibs/AudioFFT.h b/src/AudioTools/AudioLibs/AudioFFT.h
@@ -329,13 +329,13 @@ class AudioFFTBase : public AudioStream {
 
   /// We try to fill the buffer at once
   int availableForWrite() override {
-    return cfg.channels * bytesPerSample() * cfg.length;
+    return cfg.length * cfg.channels * bytesPerSample();
   }
 
   /// Data available for reverse fft
   int available() override {
-    int step_size = cfg.stride > 0 ? cfg.stride : cfg.length;
-    return step_size * cfg.channels * bytesPerSample();
+    assert(cfg.stride != 0);
+    return cfg.stride * cfg.channels * bytesPerSample();
   }
 
   /// The number of bins used by the FFT which are relevant for the result
@@ -456,7 +456,10 @@ class AudioFFTBase : public AudioStream {
   /// sets the value of a bin
   bool setBin(int idx, float real, float img) {
     has_rfft_data = true;
-    return p_driver->setBin(idx, real, img);
+    if (idx < 0 || idx >= size()) return false;
+    bool rc = p_driver->setBin(idx, real, img);
+    bool rc1 = p_driver->setBin(cfg.length - idx, real, img);
+    return rc && rc1;
   }
   /// sets the value of a bin
   bool setBin(int pos, FFTBin &bin) {
diff --git a/src/AudioTools/AudioLibs/AudioRealFFT.h b/src/AudioTools/AudioLibs/AudioRealFFT.h
@@ -67,7 +67,7 @@ class FFTDriverRealFFT : public FFTDriver {
         float getValue(int idx) override { return v_x[idx];}
 
         bool setBin(int pos, float real, float img) override {
-            if (pos>=len) return false;
+            if (pos < 0 || pos >= len) return false;
             v_x[pos] = real;
             v_f[pos] = img;
             return true;
diff --git a/src/AudioTools/AudioLibs/FFT/FFTWindows.h b/src/AudioTools/AudioLibs/FFT/FFTWindows.h
@@ -40,6 +40,8 @@ class WindowFunction {
   /// Provides the number of samples (fft length)
   inline int samples() { return i_samples; }
 
+  virtual const char* name() = 0;
+
  protected:
   float samples_minus_1 = 0.0f;
   int i_samples = 0;
@@ -68,6 +70,12 @@ class BufferedWindow : public WindowFunction {
  public:
   BufferedWindow(WindowFunction* wf) { p_wf = wf; }
 
+  const char* name() { 
+    static char buffer[80] = "Buffered ";
+    strncpy(buffer+9, p_wf->name(),69);
+    return buffer; 
+  }
+
   virtual void begin(int samples) override {
     // process only if there is a change
     WindowFunction::begin(samples);
@@ -102,7 +110,8 @@ class Rectange : public WindowFunction {
   float factor_internal(int idx) { 
     if (idx < 0 || idx >= i_samples) return 0;
     return 1.0f; }
-};
+    const char* name() { return "Rectange"; }
+  };
 
 /**
  * @brief Hamming FFT Window function
@@ -115,6 +124,7 @@ class Hamming : public WindowFunction {
   float factor_internal(int idx) {
     return 0.54f - (0.46f * cos(twoPi * ratio(idx)));
   }
+  const char* name() { return "Hamming"; }
 };
 
 /**
@@ -125,6 +135,8 @@ class Hamming : public WindowFunction {
 class Hann : public WindowFunction {
  public:
   Hann() = default;
+  const char* name() { return "Hann"; }
+  
   float factor_internal(int idx) {
     return 0.54f * (1.0f - cos(twoPi * ratio(idx)));
   }
@@ -138,6 +150,7 @@ class Hann : public WindowFunction {
 class Triangle : public WindowFunction {
  public:
   Triangle() = default;
+  const char* name() { return "Triangle"; }
   float factor_internal(int idx) {
     return 1.0f - ((2.0f * fabs((idx - 1) -
                               (static_cast<float>(i_samples - 1) / 2.0f))) /
@@ -154,6 +167,7 @@ class Triangle : public WindowFunction {
 class Nuttall : public WindowFunction {
  public:
   Nuttall() = default;
+  const char* name() { return "Nuttall"; }
   float factor_internal(int idx) override {
     float r = ratio(idx);
     return 0.355768f - (0.487396f * (cos(twoPi * r))) +
@@ -170,6 +184,7 @@ class Nuttall : public WindowFunction {
 class Blackman : public WindowFunction {
  public:
   Blackman() = default;
+  const char* name() { return "Blackman"; }
   float factor_internal(int idx)override {
     float r = ratio(idx);
     return 0.42323f - (0.49755f * (cos(twoPi * r))) +
@@ -185,6 +200,7 @@ class Blackman : public WindowFunction {
 class BlackmanNuttall : public WindowFunction {
  public:
   BlackmanNuttall() = default;
+  const char* name() { return "BlackmanNuttall"; }
   float factor_internal(int idx) override{
     float r = ratio(idx);
     return 0.3635819f - (0.4891775f * (cos(twoPi * r))) +
@@ -200,6 +216,7 @@ class BlackmanNuttall : public WindowFunction {
 class BlackmanHarris : public WindowFunction {
  public:
   BlackmanHarris() = default;
+  const char* name() { return "BlackmanHarris"; }
   float factor_internal(int idx) override{
     float r = ratio(idx);
     return 0.35875f - (0.48829f * (cos(twoPi * r))) +
@@ -215,6 +232,7 @@ class BlackmanHarris : public WindowFunction {
 class FlatTop : public WindowFunction {
  public:
   FlatTop() = default;
+  const char* name() { return "FlatTop"; }
   float factor_internal(int idx) override{
     float r = ratio(idx);
     return 0.2810639f - (0.5208972f * cos(twoPi * r)) +
@@ -230,6 +248,7 @@ class FlatTop : public WindowFunction {
 class Welch : public WindowFunction {
  public:
   Welch() = default;
+  const char* name() { return "Welch"; }
   float factor_internal(int idx) override{
     float tmp = (((idx - 1) - samples_minus_1 / 2.0f) / (samples_minus_1 / 2.0f));
     return 1.0f - (tmp*tmp);
diff --git a/src/AudioTools/CoreAudio/AudioEffects/FFTEffects.h b/src/AudioTools/CoreAudio/AudioEffects/FFTEffects.h
@@ -41,49 +41,56 @@ class FFTEffect : public AudioOutput {
   }
 
   bool begin(FFTEffectConfig info) {
+    copier.setLogName("ifft");
     setAudioInfo(info);
     fft_cfg.length = info.length;
-    fft_cfg.stride = info.stride;
+    fft_cfg.stride = info.stride > 0 ? info.stride : info.length;
     fft_cfg.window_function = info.window_function;
     return begin();
   }
 
   bool begin() override {
+    TRACED();
     // copy result to output
     copier.begin(*p_out, fft);
 
     // setup fft
     fft_cfg.copyFrom(audioInfo());
-    fft_cfg.length = 1024;
-    fft_cfg.stride = 512;
-    fft_cfg.window_function = &buffered;
     fft_cfg.callback = effect_callback;
+    LOGI("length: %d", fft_cfg.length);
+    LOGI("stride: %d", fft_cfg.stride);
+    LOGI("window_function: %s", (fft_cfg.window_function!=nullptr) ? fft_cfg.window_function->name() : "-");
     return fft.begin(fft_cfg);
   }
 
   size_t write(const uint8_t *data, size_t len) override {
+    TRACED();
     return fft.write(data, len);
   }
 
  protected:
   Print *p_out = nullptr;
   AudioRealFFT fft;
-  AudioFFTConfig fft_cfg{fft.defaultConfig()};
+  AudioFFTConfig fft_cfg{fft.defaultConfig(RXTX_MODE)};
   Hann hann;
   BufferedWindow buffered{&hann};
   StreamCopy copier;
 
   virtual void effect(AudioFFTBase &fft) = 0;
 
   static void effect_callback(AudioFFTBase &fft) {
+    TRACED();
     FFTEffect *ref = (FFTEffect *)fft.config().ref;
     // execute effect
     ref->effect(fft);
     // write ifft to output
     ref->processOutput();
   }
 
-  void processOutput() { while (copier.copy()); }
+  void processOutput() {
+    TRACED();
+    while (copier.copy());
+  }
 };
 
 /**
@@ -103,9 +110,10 @@ class FFTRobotize : public FFTEffect {
  protected:
   /// Robotise the output
   void effect(AudioFFTBase &fft) {
+    TRACED();
     FFTBin bin;
     for (int n = 0; n < fft.size(); n++) {
-      float amplitude = fft.magnitudeFast(n);
+      float amplitude = fft.magnitude(n);
       // update new bin value
       bin.real = amplitude;
       bin.img = 0;
@@ -131,9 +139,10 @@ class FFTWhisper : public FFTEffect {
  protected:
   /// Robotise the output
   void effect(AudioFFTBase &fft) {
+    TRACED();
     FFTBin bin;
     for (int n = 0; n < fft.size(); n++) {
-      float amplitude = fft.magnitudeFast(n);
+      float amplitude = fft.magnitude(n);
       float phase = rand() / (float)RAND_MAX * 2.f * M_PI;
 
       // update new bin value
@@ -174,6 +183,7 @@ class FFTPitchShift : public FFTEffect {
 
   FFTPitchShiftConfig defaultConfig() {
     FFTPitchShiftConfig result;
+    result.shift = shift;
     return result;
   }
 
@@ -190,13 +200,16 @@ class FFTPitchShift : public FFTEffect {
 
   /// Pitch Shift
   void effect(AudioFFTBase &fft) {
+    TRACED();
     FFTBin bin;
     int max = fft.size();
 
     if (shift < 0) {
       // copy bins: left shift
       for (int n = -shift; n < max; n++) {
         int to_bin = n + shift;
+        assert(to_bin >= 0);
+        assert(to_bin < max);
         fft.getBin(n, bin);
         fft.setBin(to_bin, bin);
       }
@@ -209,6 +222,8 @@ class FFTPitchShift : public FFTEffect {
       // copy bins: right shift
       for (int n = max - shift; n <= 0; n--) {
         int to_bin = n + shift;
+        assert(to_bin >= 0);
+        assert(to_bin < max);
         fft.getBin(n, bin);
         fft.setBin(to_bin, bin);
       }
diff --git a/tests-cmake/ifft/ifft.cpp b/tests-cmake/ifft/ifft.cpp
@@ -13,7 +13,7 @@ int bin_idx = 0;
 void fftFillData(AudioFFTBase &fft) {
   fft.clearBins();
   FFTBin bin{1.0f,1.0f};
-  fft.setBin(bin_idx, bin);
+  assert(fft.setBin(bin_idx, bin));
 
   // restart from first bin
   if (++bin_idx>=fft.size()) bin_idx = 0;
