Add AudioAnalyzeFFT1024

Audio.h

@@ -46,6 +46,7 @@
 // #include <Audio.h> to get the whole library
 //
 #include "analyze_fft256.h"
+#include "analyze_fft1024.h"
 #include "analyze_print.h"
 #include "analyze_tonedetect.h"
 #include "analyze_peakdetect.h"

analyze_fft1024.cpp

@@ -0,0 +1,164 @@
+/* Audio Library for Teensy 3.X
+ * Copyright (c) 2014, Paul Stoffregen, paul@pjrc.com
+ *
+ * Development of this audio library was funded by PJRC.COM, LLC by sales of
+ * Teensy and Audio Adaptor boards.  Please support PJRC's efforts to develop
+ * open source software by purchasing Teensy or other PJRC products.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice, development funding notice, and this permission
+ * notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "analyze_fft1024.h"
+#include "sqrt_integer.h"
+#include "utility/dspinst.h"
+#include "arm_math.h"
+
+// TODO: this should be a class member, so more than one FFT can be used
+static arm_cfft_radix4_instance_q15 fft_inst;
+
+void AudioAnalyzeFFT1024::init(void)
+{
+	// TODO: replace this with static const version
+	arm_cfft_radix4_init_q15(&fft_inst, 1024, 0, 1);
+	//state = 0;
+	//outputflag = false;
+}
+
+// 140312 - PAH - slightly faster copy
+static void copy_to_fft_buffer(void *destination, const void *source)
+{
+	const uint16_t *src = (const uint16_t *)source;
+	uint32_t *dst = (uint32_t *)destination;
+
+	for (int i=0; i < AUDIO_BLOCK_SAMPLES; i++) {
+		*dst++ = *src++;  // real sample plus a zero for imaginary
+	}
+}
+
+static void apply_window_to_fft_buffer(void *buffer, const void *window)
+{
+	int16_t *buf = (int16_t *)buffer;
+	const int16_t *win = (int16_t *)window;;
+
+	for (int i=0; i < 1024; i++) {
+		int32_t val = *buf * *win++;
+		//*buf = signed_saturate_rshift(val, 16, 15);
+		*buf = val >> 15;
+		buf += 2;
+	}
+
+}
+
+void AudioAnalyzeFFT1024::update(void)
+{
+	audio_block_t *block;
+
+	block = receiveReadOnly();
+	if (!block) return;
+
+	switch (state) {
+	case 0:
+		blocklist[0] = block;
+		state = 1;
+		break;
+	case 1:
+		blocklist[1] = block;
+		state = 2;
+		break;
+	case 2:
+		blocklist[2] = block;
+		state = 3;
+		break;
+	case 3:
+		blocklist[3] = block;
+		state = 4;
+		break;
+	case 4:
+		blocklist[4] = block;
+		state = 5;
+		break;
+	case 5:
+		blocklist[5] = block;
+		state = 6;
+		break;
+	case 6:
+		blocklist[6] = block;
+		state = 7;
+		break;
+	case 7:
+		blocklist[7] = block;
+		// TODO: perhaps distribute the work over multiple update() ??
+		//       github pull requsts welcome......
+		copy_to_fft_buffer(buffer+0x000, blocklist[0]->data);
+		copy_to_fft_buffer(buffer+0x100, blocklist[1]->data);
+		copy_to_fft_buffer(buffer+0x200, blocklist[2]->data);
+		copy_to_fft_buffer(buffer+0x300, blocklist[3]->data);
+		copy_to_fft_buffer(buffer+0x400, blocklist[4]->data);
+		copy_to_fft_buffer(buffer+0x500, blocklist[5]->data);
+		copy_to_fft_buffer(buffer+0x600, blocklist[6]->data);
+		copy_to_fft_buffer(buffer+0x700, blocklist[7]->data);
+		if (window) apply_window_to_fft_buffer(buffer, window);
+		arm_cfft_radix4_q15(&fft_inst, buffer);
+		// TODO: support averaging multiple copies
+		for (int i=0; i < 512; i++) {
+			uint32_t tmp = *((uint32_t *)buffer + i); // real & imag
+			uint32_t magsq = multiply_16tx16t_add_16bx16b(tmp, tmp);
+			output[i] = sqrt_uint32_approx(magsq);
+		}
+		outputflag = true;
+		release(blocklist[0]);
+		release(blocklist[1]);
+		release(blocklist[2]);
+		release(blocklist[3]);
+		blocklist[0] = blocklist[4];
+		blocklist[1] = blocklist[5];
+		blocklist[2] = blocklist[6];
+		blocklist[3] = blocklist[7];
+		state = 4;
+		break;
+	}
+/*
+	copy_to_fft_buffer(buffer, prevblock->data);
+	copy_to_fft_buffer(buffer+256, block->data);
+	if (window) apply_window_to_fft_buffer(buffer, window);
+	arm_cfft_radix4_q15(&fft_inst, buffer);
+	if (count == 0) {
+		for (int i=0; i < 128; i++) {
+			uint32_t tmp = *((uint32_t *)buffer + i);
+			uint32_t magsq = multiply_16tx16t_add_16bx16b(tmp, tmp);
+			sum[i] = magsq / naverage;
+		}
+	} else {
+		for (int i=0; i < 128; i++) {
+			uint32_t tmp = *((uint32_t *)buffer + i);
+			uint32_t magsq = multiply_16tx16t_add_16bx16b(tmp, tmp);
+			sum[i] += magsq / naverage;
+		}
+	}
+	if (++count == naverage) {
+		count = 0;
+		for (int i=0; i < 128; i++) {
+			output[i] = sqrt_uint32_approx(sum[i]);
+		}
+		outputflag = true;
+	}
+*/
+}
+
+

analyze_fft1024.h

@@ -0,0 +1,76 @@
+/* Audio Library for Teensy 3.X
+ * Copyright (c) 2014, Paul Stoffregen, paul@pjrc.com
+ *
+ * Development of this audio library was funded by PJRC.COM, LLC by sales of
+ * Teensy and Audio Adaptor boards.  Please support PJRC's efforts to develop
+ * open source software by purchasing Teensy or other PJRC products.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice, development funding notice, and this permission
+ * notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef analyze_fft1024_h_
+#define analyze_fft1024_h_
+
+#include "AudioStream.h"
+
+// windows.c
+extern "C" {
+extern const int16_t AudioWindowHanning1024[];
+extern const int16_t AudioWindowBartlett1024[];
+extern const int16_t AudioWindowBlackman1024[];
+extern const int16_t AudioWindowFlattop1024[];
+extern const int16_t AudioWindowBlackmanHarris1024[];
+extern const int16_t AudioWindowNuttall1024[];
+extern const int16_t AudioWindowBlackmanNuttall1024[];
+extern const int16_t AudioWindowWelch1024[];
+extern const int16_t AudioWindowHamming1024[];
+extern const int16_t AudioWindowCosine1024[];
+extern const int16_t AudioWindowTukey1024[];
+}
+
+class AudioAnalyzeFFT1024 : public AudioStream
+{
+public:
+	AudioAnalyzeFFT1024(uint8_t navg = 1, const int16_t *win = AudioWindowHanning1024)
+	  : AudioStream(1, inputQueueArray), window(win), 
+	    state(0), outputflag(false) { init(); }
+
+	bool available() {
+		if (outputflag == true) {
+			outputflag = false;
+			return true;
+		}
+		return false;
+	}
+	virtual void update(void);
+	uint16_t output[512] __attribute__ ((aligned (4)));
+private:
+	void init(void);
+	const int16_t *window;
+	audio_block_t *blocklist[8];
+	int16_t buffer[2048] __attribute__ ((aligned (4)));
+	//uint32_t sum[512];
+	//uint8_t count;
+	uint8_t state;
+	//uint8_t naverage;
+	volatile bool outputflag;
+	audio_block_t *inputQueueArray[1];
+};
+
+#endif

data_windows.c

@@ -345,6 +345,114 @@ const int16_t AudioWindowTukey256[] __attribute__ ((aligned (4))) = {
    495,   317,   179,    80,    20,     0,
 };
 
+const int16_t AudioWindowHanning1024[] __attribute__ ((aligned (4))) = {
+     0,     0,     1,     3,     5,     8,    11,    15,    20,    25,
+    31,    37,    44,    52,    61,    69,    79,    89,   100,   111,
+   123,   136,   149,   163,   178,   193,   208,   225,   242,   259,
+   277,   296,   315,   335,   356,   377,   399,   421,   444,   468,
+   492,   517,   542,   568,   595,   622,   650,   678,   707,   736,
+   767,   797,   829,   860,   893,   926,   960,   994,  1029,  1064,
+  1100,  1137,  1174,  1211,  1250,  1288,  1328,  1368,  1408,  1449,
+  1491,  1533,  1576,  1619,  1663,  1708,  1753,  1798,  1844,  1891,
+  1938,  1986,  2034,  2083,  2133,  2182,  2233,  2284,  2335,  2387,
+  2440,  2493,  2547,  2601,  2656,  2711,  2766,  2823,  2879,  2937,
+  2994,  3053,  3111,  3171,  3230,  3291,  3351,  3413,  3474,  3536,
+  3599,  3662,  3726,  3790,  3855,  3920,  3985,  4051,  4118,  4185,
+  4252,  4320,  4388,  4457,  4526,  4596,  4666,  4737,  4808,  4879,
+  4951,  5023,  5096,  5169,  5243,  5317,  5391,  5466,  5541,  5617,
+  5693,  5769,  5846,  5923,  6001,  6079,  6158,  6236,  6316,  6395,
+  6475,  6555,  6636,  6717,  6799,  6880,  6962,  7045,  7128,  7211,
+  7295,  7379,  7463,  7547,  7632,  7717,  7803,  7889,  7975,  8062,
+  8148,  8236,  8323,  8411,  8499,  8587,  8676,  8765,  8854,  8944,
+  9033,  9123,  9214,  9304,  9395,  9486,  9578,  9670,  9761,  9854,
+  9946, 10039, 10132, 10225, 10318, 10412, 10505, 10599, 10694, 10788,
+ 10883, 10978, 11073, 11168, 11264, 11359, 11455, 11551, 11648, 11744,
+ 11841, 11937, 12034, 12131, 12229, 12326, 12424, 12521, 12619, 12717,
+ 12815, 12914, 13012, 13111, 13209, 13308, 13407, 13506, 13605, 13704,
+ 13804, 13903, 14003, 14102, 14202, 14302, 14401, 14501, 14601, 14701,
+ 14802, 14902, 15002, 15102, 15203, 15303, 15403, 15504, 15604, 15705,
+ 15806, 15906, 16007, 16107, 16208, 16309, 16409, 16510, 16610, 16711,
+ 16812, 16912, 17013, 17113, 17214, 17314, 17415, 17515, 17616, 17716,
+ 17816, 17916, 18017, 18117, 18217, 18317, 18416, 18516, 18616, 18716,
+ 18815, 18915, 19014, 19113, 19213, 19312, 19411, 19509, 19608, 19707,
+ 19805, 19904, 20002, 20100, 20198, 20296, 20393, 20491, 20588, 20685,
+ 20782, 20879, 20976, 21072, 21169, 21265, 21361, 21457, 21552, 21647,
+ 21743, 21838, 21932, 22027, 22121, 22216, 22309, 22403, 22497, 22590,
+ 22683, 22776, 22868, 22961, 23053, 23144, 23236, 23327, 23418, 23509,
+ 23599, 23690, 23780, 23869, 23959, 24048, 24136, 24225, 24313, 24401,
+ 24489, 24576, 24663, 24750, 24836, 24922, 25008, 25093, 25178, 25263,
+ 25347, 25431, 25515, 25599, 25682, 25764, 25847, 25929, 26010, 26091,
+ 26172, 26253, 26333, 26413, 26492, 26571, 26650, 26728, 26806, 26883,
+ 26960, 27037, 27113, 27189, 27265, 27340, 27414, 27488, 27562, 27636,
+ 27708, 27781, 27853, 27925, 27996, 28067, 28137, 28207, 28276, 28345,
+ 28414, 28482, 28550, 28617, 28683, 28750, 28815, 28881, 28946, 29010,
+ 29074, 29137, 29200, 29263, 29325, 29386, 29447, 29508, 29568, 29627,
+ 29686, 29745, 29803, 29860, 29917, 29974, 30029, 30085, 30140, 30194,
+ 30248, 30301, 30354, 30407, 30458, 30510, 30560, 30611, 30660, 30709,
+ 30758, 30806, 30853, 30900, 30947, 30993, 31038, 31083, 31127, 31170,
+ 31213, 31256, 31298, 31339, 31380, 31420, 31460, 31499, 31538, 31576,
+ 31613, 31650, 31686, 31722, 31757, 31791, 31825, 31859, 31891, 31924,
+ 31955, 31986, 32017, 32046, 32076, 32104, 32132, 32160, 32187, 32213,
+ 32239, 32264, 32288, 32312, 32335, 32358, 32380, 32402, 32422, 32443,
+ 32462, 32481, 32500, 32518, 32535, 32551, 32567, 32583, 32598, 32612,
+ 32625, 32638, 32651, 32662, 32673, 32684, 32694, 32703, 32712, 32720,
+ 32727, 32734, 32740, 32746, 32751, 32755, 32759, 32762, 32764, 32766,
+ 32767, 32767, 32767, 32767, 32766, 32764, 32762, 32759, 32755, 32751,
+ 32746, 32740, 32734, 32727, 32720, 32712, 32703, 32694, 32684, 32673,
+ 32662, 32651, 32638, 32625, 32612, 32598, 32583, 32567, 32551, 32535,
+ 32518, 32500, 32481, 32462, 32443, 32422, 32402, 32380, 32358, 32335,
+ 32312, 32288, 32264, 32239, 32213, 32187, 32160, 32132, 32104, 32076,
+ 32046, 32017, 31986, 31955, 31924, 31891, 31859, 31825, 31791, 31757,
+ 31722, 31686, 31650, 31613, 31576, 31538, 31499, 31460, 31420, 31380,
+ 31339, 31298, 31256, 31213, 31170, 31127, 31083, 31038, 30993, 30947,
+ 30900, 30853, 30806, 30758, 30709, 30660, 30611, 30560, 30510, 30458,
+ 30407, 30354, 30301, 30248, 30194, 30140, 30085, 30029, 29974, 29917,
+ 29860, 29803, 29745, 29686, 29627, 29568, 29508, 29447, 29386, 29325,
+ 29263, 29200, 29137, 29074, 29010, 28946, 28881, 28815, 28750, 28683,
+ 28617, 28550, 28482, 28414, 28345, 28276, 28207, 28137, 28067, 27996,
+ 27925, 27853, 27781, 27708, 27636, 27562, 27488, 27414, 27340, 27265,
+ 27189, 27113, 27037, 26960, 26883, 26806, 26728, 26650, 26571, 26492,
+ 26413, 26333, 26253, 26172, 26091, 26010, 25929, 25847, 25764, 25682,
+ 25599, 25515, 25431, 25347, 25263, 25178, 25093, 25008, 24922, 24836,
+ 24750, 24663, 24576, 24489, 24401, 24313, 24225, 24136, 24048, 23959,
+ 23869, 23780, 23690, 23599, 23509, 23418, 23327, 23236, 23144, 23053,
+ 22961, 22868, 22776, 22683, 22590, 22497, 22403, 22309, 22216, 22121,
+ 22027, 21932, 21838, 21743, 21647, 21552, 21457, 21361, 21265, 21169,
+ 21072, 20976, 20879, 20782, 20685, 20588, 20491, 20393, 20296, 20198,
+ 20100, 20002, 19904, 19805, 19707, 19608, 19509, 19411, 19312, 19213,
+ 19113, 19014, 18915, 18815, 18716, 18616, 18516, 18416, 18317, 18217,
+ 18117, 18017, 17916, 17816, 17716, 17616, 17515, 17415, 17314, 17214,
+ 17113, 17013, 16912, 16812, 16711, 16610, 16510, 16409, 16309, 16208,
+ 16107, 16007, 15906, 15806, 15705, 15604, 15504, 15403, 15303, 15203,
+ 15102, 15002, 14902, 14802, 14701, 14601, 14501, 14401, 14302, 14202,
+ 14102, 14003, 13903, 13804, 13704, 13605, 13506, 13407, 13308, 13209,
+ 13111, 13012, 12914, 12815, 12717, 12619, 12521, 12424, 12326, 12229,
+ 12131, 12034, 11937, 11841, 11744, 11648, 11551, 11455, 11359, 11264,
+ 11168, 11073, 10978, 10883, 10788, 10694, 10599, 10505, 10412, 10318,
+ 10225, 10132, 10039,  9946,  9854,  9761,  9670,  9578,  9486,  9395,
+  9304,  9214,  9123,  9033,  8944,  8854,  8765,  8676,  8587,  8499,
+  8411,  8323,  8236,  8148,  8062,  7975,  7889,  7803,  7717,  7632,
+  7547,  7463,  7379,  7295,  7211,  7128,  7045,  6962,  6880,  6799,
+  6717,  6636,  6555,  6475,  6395,  6316,  6236,  6158,  6079,  6001,
+  5923,  5846,  5769,  5693,  5617,  5541,  5466,  5391,  5317,  5243,
+  5169,  5096,  5023,  4951,  4879,  4808,  4737,  4666,  4596,  4526,
+  4457,  4388,  4320,  4252,  4185,  4118,  4051,  3985,  3920,  3855,
+  3790,  3726,  3662,  3599,  3536,  3474,  3413,  3351,  3291,  3230,
+  3171,  3111,  3053,  2994,  2937,  2879,  2823,  2766,  2711,  2656,
+  2601,  2547,  2493,  2440,  2387,  2335,  2284,  2233,  2182,  2133,
+  2083,  2034,  1986,  1938,  1891,  1844,  1798,  1753,  1708,  1663,
+  1619,  1576,  1533,  1491,  1449,  1408,  1368,  1328,  1288,  1250,
+  1211,  1174,  1137,  1100,  1064,  1029,   994,   960,   926,   893,
+   860,   829,   797,   767,   736,   707,   678,   650,   622,   595,
+   568,   542,   517,   492,   468,   444,   421,   399,   377,   356,
+   335,   315,   296,   277,   259,   242,   225,   208,   193,   178,
+   163,   149,   136,   123,   111,   100,    89,    79,    69,    61,
+    52,    44,    37,    31,    25,    20,    15,    11,     8,     5,
+     3,     1,     0,     0,
+};
+
+
+
 /*
 #! /usr/bin/perl
 

keywords.txt

@@ -7,6 +7,7 @@ AudioControlSGTL5000	KEYWORD2
 AudioMemory	KEYWORD2
 
 AudioAnalyzeFFT256	KEYWORD2
+AudioAnalyzeFFT1024	KEYWORD2
 AudioAnalyzePeak	KEYWORD2
 AudioAnalyzePrint	KEYWORD2
 AudioAnalyzeToneDetect	KEYWORD2