aboutsummaryrefslogtreecommitdiff
path: root/src/scalar.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/scalar.c')
-rw-r--r--src/scalar.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/scalar.c b/src/scalar.c
index cf453f9..8d0f821 100644
--- a/src/scalar.c
+++ b/src/scalar.c
@@ -316,19 +316,20 @@ int xtract_rms_amplitude(float *data, int N, void *argv, float *result){
int xtract_inharmonicity(float *data, int N, void *argv, float *result){
- int n = N;
+ int n = N >> 1;
float num = 0.f, den = 0.f,
- *fund, *freq;
+ fund, *freqs, *amps;
- fund = *(float **)argv;
- freq = fund+1;
+ fund = *(float *)argv;
+ freqs = data;
+ amps = data + n;
while(n--){
- num += abs(freq[n] - n * *fund) * SQ(data[n]);
- den += SQ(data[n]);
+ num += abs(freqs[n] - n * fund) * SQ(amps[n]);
+ den += SQ(amps[n]);
}
- *result = (2 * num) / (*fund * den);
+ *result = (2 * num) / (fund * den);
return SUCCESS;
}