diff --git a/src/fft.c b/src/fft.c index 6a1016c..5a5f53b 100644 --- a/src/fft.c +++ b/src/fft.c @@ -96,30 +96,64 @@ free(outputComponents); } -void -average_signal(unsigned int *fftBuf, int inLen, int max, unsigned int* fftAvg) +const double upperbound(const double bfreq, const double x) { - int i, j, step, k=0; - unsigned int avg; - int maxfreq = 0; + return bfreq*pow(2, 1/(2*x)); +} - // N_SAMPLES / maximum number of columns - step = inLen*FOCUS/max; - for(i=0; i maxfreq) { - maxfreq = fftBuf[i+j]; - } - } - fftAvg[k] = maxfreq-step/FOCUS; +const double lowerbound(const double bfreq, const double x) +{ + return bfreq / pow(2, 1/(2*x)); +} - for(j=1; j max) break; + f = next_bfreq(f, oratio); + } } // compute the average energy of a sample array (in amplitude form) diff --git a/src/music_visualizer.c b/src/music_visualizer.c index 832569f..d346751 100644 --- a/src/music_visualizer.c +++ b/src/music_visualizer.c @@ -64,8 +64,8 @@ int i; // main loop to print column by column - for(i=X_CORRECTION; i