diff options
| author | Jamie Bullock <jamie@postlude.co.uk> | 2011-03-30 10:51:39 +0000 |
|---|---|---|
| committer | Jamie Bullock <jamie@postlude.co.uk> | 2011-03-30 10:51:39 +0000 |
| commit | d88ff54ee9be978bbdb44cedacb9b3df598b1017 (patch) | |
| tree | cf80ee4d0959024fc598aba8741e1b592f7e6147 /src/descriptors.c | |
| parent | d43418e0293c2f1f9954e193a9dcc5b82f5ce0c3 (diff) | |
| download | LibXtract-d88ff54ee9be978bbdb44cedacb9b3df598b1017.tar.gz LibXtract-d88ff54ee9be978bbdb44cedacb9b3df598b1017.tar.bz2 LibXtract-d88ff54ee9be978bbdb44cedacb9b3df598b1017.zip | |
- reimplemented xtract_spectral_variance() xtract_spectral_skewness() and xtract_spectral_kurtosis() using correct maths
- removed xtract_spectral_average_deviation()
Diffstat (limited to 'src/descriptors.c')
| -rw-r--r-- | src/descriptors.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/descriptors.c b/src/descriptors.c index 444256d..892a899 100644 --- a/src/descriptors.c +++ b/src/descriptors.c @@ -62,7 +62,7 @@ xtract_function_descriptor_t *xtract_make_descriptors(void){ case XTRACT_DIFFERENCE_VECTOR: case XTRACT_AVERAGE_DEVIATION: case XTRACT_SPECTRAL_STANDARD_DEVIATION: - case XTRACT_SPECTRAL_AVERAGE_DEVIATION: + /* case XTRACT_SPECTRAL_AVERAGE_DEVIATION: */ case XTRACT_LOWEST_VALUE: case XTRACT_TONALITY: case XTRACT_MFCC: @@ -206,9 +206,9 @@ xtract_function_descriptor_t *xtract_make_descriptors(void){ case XTRACT_SPECTRAL_STANDARD_DEVIATION: *argv_donor = XTRACT_SPECTRAL_VARIANCE; break; - case XTRACT_SPECTRAL_AVERAGE_DEVIATION: + /* case XTRACT_SPECTRAL_AVERAGE_DEVIATION: *argv_donor = XTRACT_SPECTRAL_MEAN; - break; + break; */ case XTRACT_SPECTRAL_INHARMONICITY: *argv_donor = XTRACT_FAILSAFE_F0; break; @@ -300,7 +300,7 @@ xtract_function_descriptor_t *xtract_make_descriptors(void){ case XTRACT_SPECTRAL_MEAN: case XTRACT_SPECTRAL_VARIANCE: case XTRACT_SPECTRAL_STANDARD_DEVIATION: - case XTRACT_SPECTRAL_AVERAGE_DEVIATION: + /* case XTRACT_SPECTRAL_AVERAGE_DEVIATION: */ case XTRACT_SPECTRAL_SKEWNESS: case XTRACT_SPECTRAL_KURTOSIS: case XTRACT_SPECTRAL_CENTROID: @@ -432,7 +432,7 @@ xtract_function_descriptor_t *xtract_make_descriptors(void){ case XTRACT_SPECTRAL_MEAN: case XTRACT_SPECTRAL_VARIANCE: case XTRACT_SPECTRAL_STANDARD_DEVIATION: - case XTRACT_SPECTRAL_AVERAGE_DEVIATION: + /* case XTRACT_SPECTRAL_AVERAGE_DEVIATION: */ case XTRACT_SPECTRAL_SKEWNESS: case XTRACT_SPECTRAL_KURTOSIS: case XTRACT_SPECTRAL_CENTROID: @@ -530,7 +530,7 @@ xtract_function_descriptor_t *xtract_make_descriptors(void){ "Extract the standard deviation of an audio spectrum"); strcpy(author, ""); break; - case XTRACT_SPECTRAL_AVERAGE_DEVIATION: + /* case XTRACT_SPECTRAL_AVERAGE_DEVIATION: strcpy(name, "spectral_average_deviation"); strcpy(p_name, "Spectral Average Deviation"); strcpy(desc, @@ -539,6 +539,7 @@ xtract_function_descriptor_t *xtract_make_descriptors(void){ "Extract the average deviation of an audio spectrum"); strcpy(author, ""); break; + */ case XTRACT_ROLLOFF: strcpy(name, "rolloff"); strcpy(p_name, "Spectral Rolloff"); @@ -963,7 +964,7 @@ xtract_function_descriptor_t *xtract_make_descriptors(void){ case XTRACT_AVERAGE_DEVIATION: case XTRACT_SPECTRAL_VARIANCE: case XTRACT_SPECTRAL_STANDARD_DEVIATION: - case XTRACT_SPECTRAL_AVERAGE_DEVIATION: + /* case XTRACT_SPECTRAL_AVERAGE_DEVIATION: */ case XTRACT_SPECTRAL_INHARMONICITY: case XTRACT_LOWEST_VALUE: case XTRACT_F0: @@ -1059,7 +1060,7 @@ xtract_function_descriptor_t *xtract_make_descriptors(void){ case XTRACT_SPECTRAL_MEAN: case XTRACT_SPECTRAL_VARIANCE: case XTRACT_SPECTRAL_STANDARD_DEVIATION: - case XTRACT_SPECTRAL_AVERAGE_DEVIATION: + /* case XTRACT_SPECTRAL_AVERAGE_DEVIATION: */ case XTRACT_SPECTRAL_SKEWNESS: case XTRACT_SPECTRAL_KURTOSIS: case XTRACT_SPECTRAL_CENTROID: @@ -1135,7 +1136,7 @@ xtract_function_descriptor_t *xtract_make_descriptors(void){ case XTRACT_SPECTRAL_MEAN: case XTRACT_SPECTRAL_VARIANCE: case XTRACT_SPECTRAL_STANDARD_DEVIATION: - case XTRACT_SPECTRAL_AVERAGE_DEVIATION: + /* case XTRACT_SPECTRAL_AVERAGE_DEVIATION: */ case XTRACT_SPECTRAL_SKEWNESS: case XTRACT_SPECTRAL_KURTOSIS: case XTRACT_SPECTRAL_CENTROID: @@ -1227,7 +1228,7 @@ xtract_function_descriptor_t *xtract_make_descriptors(void){ case XTRACT_SPECTRAL_MEAN: case XTRACT_SPECTRAL_VARIANCE: case XTRACT_SPECTRAL_STANDARD_DEVIATION: - case XTRACT_SPECTRAL_AVERAGE_DEVIATION: + /* case XTRACT_SPECTRAL_AVERAGE_DEVIATION: */ case XTRACT_SPECTRAL_CENTROID: case XTRACT_SPREAD: case XTRACT_F0: |