Move the aec_rdft* files to a more proper place beneath APM and make them thread-safe.

webrtc/modules/audio_processing/aec/aec_core_mips.cc

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 /*
  * The core AEC algorithm, which is presented with time-aligned signals.
  */
 
 #include "webrtc/modules/audio_processing/aec/aec_core.h"
 
 #include <math.h>
 
 extern "C" {
 #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
 }
 #include "webrtc/modules/audio_processing/aec/aec_core_optimized_methods.h"
-#include "webrtc/modules/audio_processing/aec/aec_rdft.h"
+#include "webrtc/modules/audio_processing/utility/ooura_fft.h"
 
 namespace webrtc {
 
 extern const float WebRtcAec_weightCurve[65];
 extern const float WebRtcAec_overDriveCurve[65];
 
 void WebRtcAec_FilterFar_mips(
     int num_partitions,
     int x_fft_buf_block_pos,
     float x_fft_buf[2][kExtendedNumPartitions * PART_LEN1],
@@ skipping 103 matching lines @@
         [f9] "=&f" (f9), [f10] "=&f" (f10), [f11] "=&f" (f11),
         [f12] "=&f" (f12), [f13] "=&f" (f13), [aRe] "+r" (aRe),
         [aIm] "+r" (aIm), [bRe] "+r" (bRe), [bIm] "+r" (bIm),
         [yf0] "+r" (yf0), [yf1] "+r" (yf1), [len] "+r" (len)
       :
       : "memory");
   }
 }
 
 void WebRtcAec_FilterAdaptation_mips(
+    const OouraFft& ooura_fft,
     int num_partitions,
     int x_fft_buf_block_pos,
     float x_fft_buf[2][kExtendedNumPartitions * PART_LEN1],
     float e_fft[2][PART_LEN1],
     float h_fft_buf[2][kExtendedNumPartitions * PART_LEN1]) {
   float fft[PART_LEN2];
   int i;
   for (i = 0; i < num_partitions; i++) {
     int xPos = (i + x_fft_buf_block_pos) * (PART_LEN1);
     int pos;
@@ skipping 74 matching lines @@
       : [f0] "=&f" (f0), [f1] "=&f" (f1), [f2] "=&f" (f2),
         [f3] "=&f" (f3), [f4] "=&f" (f4), [f5] "=&f" (f5),
         [f6] "=&f" (f6), [f7] "=&f" (f7), [f8] "=&f" (f8),
         [f9] "=&f" (f9), [f10] "=&f" (f10), [f11] "=&f" (f11),
         [f12] "=&f" (f12), [aRe] "+r" (aRe), [aIm] "+r" (aIm),
         [bRe] "+r" (bRe), [bIm] "+r" (bIm), [fft_tmp] "=&r" (fft_tmp),
         [len] "+r" (len)
       : [fft] "r" (fft)
       : "memory");
 
-    aec_rdft_inverse_128(fft);
+    ooura_fft.InverseFft(fft);
     memset(fft + PART_LEN, 0, sizeof(float) * PART_LEN);
 
     // fft scaling
     {
       float scale = 2.0f / PART_LEN2;
       __asm __volatile(
         ".set     push                                    \n\t"
         ".set     noreorder                               \n\t"
         "addiu    %[fft_tmp], %[fft],        0            \n\t"
         "addiu    %[len],     $zero,         8            \n\t"
@@ skipping 26 matching lines @@
         "bgtz     %[len],     1b                          \n\t"
         " addiu   %[fft_tmp], %[fft_tmp],    32           \n\t"
         ".set     pop                                     \n\t"
         : [f0] "=&f" (f0), [f1] "=&f" (f1), [f2] "=&f" (f2),
           [f3] "=&f" (f3), [f4] "=&f" (f4), [f5] "=&f" (f5),
           [f6] "=&f" (f6), [f7] "=&f" (f7), [len] "=&r" (len),
           [fft_tmp] "=&r" (fft_tmp)
         : [scale] "f" (scale), [fft] "r" (fft)
         : "memory");
     }
-    aec_rdft_forward_128(fft);
+    ooura_fft.Fft(fft);
     aRe = h_fft_buf[0] + pos;
     aIm = h_fft_buf[1] + pos;
     __asm __volatile(
       ".set     push                                    \n\t"
       ".set     noreorder                               \n\t"
       "addiu    %[fft_tmp], %[fft],        0            \n\t"
       "addiu    %[len],     $zero,         31           \n\t"
       "lwc1     %[f0],      0(%[aRe])                   \n\t"
       "lwc1     %[f1],      0(%[fft_tmp])               \n\t"
       "lwc1     %[f2],      256(%[aRe])                 \n\t"
@@ skipping 181 matching lines @@
 }
 
 void WebRtcAec_InitAec_mips(void) {
   WebRtcAec_FilterFar = WebRtcAec_FilterFar_mips;
   WebRtcAec_FilterAdaptation = WebRtcAec_FilterAdaptation_mips;
   WebRtcAec_ScaleErrorSignal = WebRtcAec_ScaleErrorSignal_mips;
   WebRtcAec_Overdrive = WebRtcAec_Overdrive_mips;
   WebRtcAec_Suppress = WebRtcAec_Suppress_mips;
 }
 }  // namespace webrtc