# HG changeset patch # User Jamie Bullock # Date 1301574149 0 # Node ID fc4bc58b92da98b970a8737a920cb2f9178e9050 # Parent efb1c1ae2ba87c7ff750825d5590734c4801bd37 - fixed xtract_spread() -- now just calls xtract_spectral_variance() diff -r efb1c1ae2ba8 -r fc4bc58b92da src/scalar.c --- a/src/scalar.c Wed Mar 30 10:51:39 2011 +0000 +++ b/src/scalar.c Thu Mar 31 12:22:29 2011 +0000 @@ -411,24 +411,7 @@ 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){