diff options
author | Jamie Bullock <jamie@postlude.co.uk> | 2006-12-20 16:47:52 +0000 |
---|---|---|
committer | Jamie Bullock <jamie@postlude.co.uk> | 2006-12-20 16:47:52 +0000 |
commit | 55e12c391bbfb4c6bd7054e78b807dfc97cd3ed5 (patch) | |
tree | 4ddd517caffe4df2a6ba578e37f70fae09a95642 /src/vector.c | |
parent | 46ee1ba4b2e3eda3e14abfc969356f6dcb0c6dc0 (diff) | |
download | LibXtract-55e12c391bbfb4c6bd7054e78b807dfc97cd3ed5.tar.gz LibXtract-55e12c391bbfb4c6bd7054e78b807dfc97cd3ed5.tar.bz2 LibXtract-55e12c391bbfb4c6bd7054e78b807dfc97cd3ed5.zip |
Added bin frequencies to second half of xtract_magnitude_spectrum()
Diffstat (limited to 'src/vector.c')
-rw-r--r-- | src/vector.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/vector.c b/src/vector.c index 3a6e587..739004e 100644 --- a/src/vector.c +++ b/src/vector.c @@ -32,7 +32,7 @@ int xtract_magnitude_spectrum(const float *data, const int N, const void *argv, float *result){ - float *temp, *input; + float *temp, *input, q; size_t bytes; int n , M = N >> 1; fftwf_plan plan; @@ -41,17 +41,22 @@ int xtract_magnitude_spectrum(const float *data, const int N, const void *argv, input = (float *)malloc(bytes = N * sizeof(float)); input = memcpy(input, data, bytes); + q = 0.f; + + q = *(float *)argv; + q = (q ? (q * .5) / M : 0.f); + plan = fftwf_plan_r2r_1d(N, input, temp, FFTW_R2HC, FFTW_ESTIMATE); fftwf_execute(plan); for(n = 1; n < M; n++){ result[n] = sqrt(SQ(temp[n]) + SQ(temp[N - n])) / N; - result[N-n] = 0.0f; + result[M + n] = n * q; } result[0] = fabs(temp[0]) / N; - result[M] = fabs(temp[M]) / N; + result[M] = q * .5; fftwf_destroy_plan(plan); fftwf_free(temp); |