aboutsummaryrefslogtreecommitdiff
path: root/src/scalar.c
diff options
context:
space:
mode:
authorJamie Bullock <jamie@postlude.co.uk>2011-03-31 12:22:29 +0000
committerJamie Bullock <jamie@postlude.co.uk>2011-03-31 12:22:29 +0000
commit2c47459bdf912a30ba1c64c2bf538aaacf4c2aa2 (patch)
tree0f60897b5c57a5a3cfdc1f9f705899f5db1d00e6 /src/scalar.c
parentd88ff54ee9be978bbdb44cedacb9b3df598b1017 (diff)
downloadLibXtract-2c47459bdf912a30ba1c64c2bf538aaacf4c2aa2.tar.gz
LibXtract-2c47459bdf912a30ba1c64c2bf538aaacf4c2aa2.tar.bz2
LibXtract-2c47459bdf912a30ba1c64c2bf538aaacf4c2aa2.zip
- fixed xtract_spread() -- now just calls xtract_spectral_variance()
Diffstat (limited to 'src/scalar.c')
-rw-r--r--src/scalar.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/src/scalar.c b/src/scalar.c
index 72422fb..a82dda0 100644
--- a/src/scalar.c
+++ b/src/scalar.c
@@ -411,24 +411,7 @@ int xtract_smoothness(const float *data, const int N, const void *argv, float *r
int xtract_spread(const float *data, const int N, const void *argv, float *result){
- int n = N;
-
- float num = 0.f, den = 0.f, temp = 0.f;
-
- if(argv == NULL)
- return XTRACT_BAD_ARGV;
-
- while(n--){
- temp = n - *(float *)argv;
- num += XTRACT_SQ(temp) * data[n];
- den += data[n];
- }
-
- /* FIX: spectral spread is mathematically equivalent to spectral variance --
- * here we are computing the spectral standard deviation */
- *result = sqrtf(num / den);
-
- return XTRACT_SUCCESS;
+ return xtract_spectral_variance(data, N, argv, result);
}
int xtract_zcr(const float *data, const int N, const void *argv, float *result){