From 2fb4ac1621dff45940c40bfdf4d82737bb4e6fc3 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Sat, 9 May 2020 16:44:29 -0700
Subject: Revert "Fix the FFT half point for the shifter effects"

This reverts commit 12bb5a47cda0ef6ec1ced73ccf5d267a71f9e710.
---
 alc/effects/pshifter.cpp | 12 ++++++------
 common/alcomplex.cpp     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/alc/effects/pshifter.cpp b/alc/effects/pshifter.cpp
index 24b5979a..a91fd2fb 100644
--- a/alc/effects/pshifter.cpp
+++ b/alc/effects/pshifter.cpp
@@ -172,9 +172,9 @@ void PshifterState::process(const size_t samplesToDo, const al::span<const Float
         complex_fft(mFftBuffer, -1.0);
 
         /* Analyze the obtained data. Since the real FFT is symmetric, only
-         * STFT_HALF_SIZE samples are needed.
+         * STFT_HALF_SIZE+1 samples are needed.
          */
-        for(size_t k{0u};k < STFT_HALF_SIZE;k++)
+        for(size_t k{0u};k < STFT_HALF_SIZE+1;k++)
         {
             const double amplitude{std::abs(mFftBuffer[k])};
             const double phase{std::arg(mFftBuffer[k])};
@@ -204,10 +204,10 @@ void PshifterState::process(const size_t samplesToDo, const al::span<const Float
          * accumulating the amplitudes of overlapping frequency bins.
          */
         std::fill(mSynthesisBuffer.begin(), mSynthesisBuffer.end(), FrequencyBin{});
-        for(size_t k{0u};k < STFT_HALF_SIZE;k++)
+        for(size_t k{0u};k < STFT_HALF_SIZE+1;k++)
         {
             size_t j{(k*mPitchShiftI) >> FRACTIONBITS};
-            if(j >= STFT_HALF_SIZE) break;
+            if(j >= STFT_HALF_SIZE+1) break;
 
             mSynthesisBuffer[j].Amplitude += mAnalysisBuffer[k].Amplitude;
             mSynthesisBuffer[j].Frequency  = mAnalysisBuffer[k].Frequency * mPitchShift;
@@ -216,7 +216,7 @@ void PshifterState::process(const size_t samplesToDo, const al::span<const Float
         /* Reconstruct the frequency-domain signal from the adjusted frequency
          * bins.
          */
-        for(size_t k{0u};k < STFT_HALF_SIZE;k++)
+        for(size_t k{0u};k < STFT_HALF_SIZE+1;k++)
         {
             /* Compute bin deviation from scaled freq */
             const double tmp{mSynthesisBuffer[k].Frequency / freq_per_bin};
@@ -227,7 +227,7 @@ void PshifterState::process(const size_t samplesToDo, const al::span<const Float
             mFftBuffer[k] = std::polar(mSynthesisBuffer[k].Amplitude, mSumPhase[k]);
         }
         /* Clear negative frequencies to recontruct the time-domain signal. */
-        std::fill(mFftBuffer.begin()+STFT_HALF_SIZE, mFftBuffer.end(), complex_d{});
+        std::fill(mFftBuffer.begin()+STFT_HALF_SIZE+1, mFftBuffer.end(), complex_d{});
 
         /* Apply an inverse FFT to get the time-domain siganl, and accumulate
          * for the output with windowing.
diff --git a/common/alcomplex.cpp b/common/alcomplex.cpp
index 9f30c716..e5cbe8a0 100644
--- a/common/alcomplex.cpp
+++ b/common/alcomplex.cpp
@@ -59,7 +59,7 @@ void complex_hilbert(const al::span<std::complex<double>> buffer)
 
     const double inverse_size = 1.0/static_cast<double>(buffer.size());
     auto bufiter = buffer.begin();
-    const auto halfiter = bufiter + (buffer.size()>>1) - 1;
+    const auto halfiter = bufiter + (buffer.size()>>1);
 
     *bufiter *= inverse_size; ++bufiter;
     bufiter = std::transform(bufiter, halfiter, bufiter,
-- 
cgit v1.2.3