FFTReal: PSRAM support

Author: pschatzmann

src/AudioTools/AudioLibs/AudioFFT.h

@@ -259,6 +259,7 @@ class AudioFFTBase : public AudioStream {
     l_magnitudes.resize(0);
     rfft_data.resize(0);
     rfft_add.resize(0);
+    step_data.resize(0);
   }
 
   /// Provide the audio data as FFT input
@@ -433,6 +434,7 @@ class AudioFFTBase : public AudioStream {
   unsigned long timestamp = 0l;
   RingBuffer<uint8_t> stride_buffer{0};
   Vector<float> l_magnitudes{0};
+  Vector<float> step_data{0};
   int bins = 0;
   RingBuffer<uint8_t> rfft_data{0};
   FFTInverseOverlapAdder rfft_add{0};
@@ -506,25 +508,25 @@ class AudioFFTBase : public AudioStream {
   void rfftWriteData(BaseBuffer<uint8_t> &data) {
     int step_size = cfg.stride > 0 ? cfg.stride : cfg.length;
     // get data to result buffer
-    float step_data[step_size];
+    step_data.resize(step_size);
     for (int j = 0; j < step_size; j++) {
       step_data[j] = 0.0;
     }
-    rfft_add.getStepData(step_data, step_size,
+    rfft_add.getStepData(step_data.data(), step_size,
                          NumberConverter::maxValue(cfg.bits_per_sample));
 
     switch (cfg.bits_per_sample) {
       case 8:
-        writeIFFT<int8_t>(step_data, step_size);
+        writeIFFT<int8_t>(step_data.data(), step_size);
         break;
       case 16:
-        writeIFFT<int16_t>(step_data, step_size);
+        writeIFFT<int16_t>(step_data.data(), step_size);
         break;
       case 24:
-        writeIFFT<int24_t>(step_data, step_size);
+        writeIFFT<int24_t>(step_data.data(), step_size);
         break;
       case 32:
-        writeIFFT<int32_t>(step_data, step_size);
+        writeIFFT<int32_t>(step_data.data(), step_size);
         break;
       default:
         LOGE("Unsupported bits: %d", cfg.bits_per_sample);

src/AudioTools/AudioLibs/FFT/FFTReal.h

@@ -14,6 +14,9 @@ To Public License, Version 2, as published by Sam Hocevar. See
 *Tab=3***********************************************************************/
 #pragma GCC diagnostic ignored "-Wdeprecated-enum-enum-conversion"
 
+// We use the DefaultAllocator which supports PSRAM
+#define FFT_CUSTOM_ALLOC DefaultAllocator
+
 
 #if ! defined (ffft_FFTReal_HEADER_INCLUDED)
 #define	ffft_FFTReal_HEADER_INCLUDED
@@ -240,7 +243,11 @@ DynArray <T>::DynArray (long size)
 	assert (size >= 0);
 	if (size > 0)
 	{
+#ifdef FFT_CUSTOM_ALLOC
+		_data_ptr = FFT_CUSTOM_ALLOC.createArray<DataType>(size);
+#else
 		_data_ptr = new DataType [size];
+#endif
 		_len = size;
 	}
 }
@@ -250,7 +257,11 @@ DynArray <T>::DynArray (long size)
 template <class T>
 DynArray <T>::~DynArray ()
 {
+#ifdef FFT_CUSTOM_ALLOC
+  	FFT_CUSTOM_ALLOC.removeArray<DataType>(_data_ptr, _len);
+#else
 	delete [] _data_ptr;
+#endif
 	_data_ptr = 0;
 	_len = 0;
 }
@@ -272,12 +283,19 @@ void	DynArray <T>::resize (long size)
 	if (size > 0)
 	{
 		DataType *		old_data_ptr = _data_ptr;
+#ifdef FFT_CUSTOM_ALLOC
+		DataType *		tmp_data_ptr = FFT_CUSTOM_ALLOC.createArray<DataType>(size);
+#else
 		DataType *		tmp_data_ptr = new DataType [size];
-
+#endif
 		_data_ptr = tmp_data_ptr;
 		_len = size;
 
+#ifdef FFT_CUSTOM_ALLOC
+		FFT_CUSTOM_ALLOC.removeArray<DataType>(old_data_ptr, _len);
+#else
 		delete [] old_data_ptr;
+#endif
 	}
 }
 
@@ -1973,7 +1991,11 @@ DynArray <T>::DynArray (long size)
 	assert (size >= 0);
 	if (size > 0)
 	{
+#ifdef FFT_CUSTOM_ALLOC
+		_data_ptr = FFT_CUSTOM_ALLOC.createArray<DataType>(size);
+#else
 		_data_ptr = new DataType [size];
+#endif
 		_len = size;
 	}
 }
@@ -1983,7 +2005,11 @@ DynArray <T>::DynArray (long size)
 template <class T>
 DynArray <T>::~DynArray ()
 {
+#ifdef FFT_CUSTOM_ALLOC
+	FFT_CUSTOM_ALLOC.removeArray<T>(_data_ptr, _len);
+#else
 	delete [] _data_ptr;
+#endif
 	_data_ptr = 0;
 	_len = 0;
 }
@@ -2005,12 +2031,18 @@ void	DynArray <T>::resize (long size)
 	if (size > 0)
 	{
 		DataType *		old_data_ptr = _data_ptr;
+#ifdef FFT_CUSTOM_ALLOC
+#else
 		DataType *		tmp_data_ptr = new DataType [size];
+#endif
 
 		_data_ptr = tmp_data_ptr;
 		_len = size;
 
+#ifdef FFT_CUSTOM_ALLOC
+#else
 		delete [] old_data_ptr;
+#endif
 	}
 }