aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/delta.c1
-rw-r--r--src/descriptors.c102
-rw-r--r--src/vector.c34
3 files changed, 51 insertions, 86 deletions
diff --git a/src/delta.c b/src/delta.c
index f1a5ee0..6ca3794 100644
--- a/src/delta.c
+++ b/src/delta.c
@@ -24,6 +24,7 @@
int xtract_flux(const float *data, const int N, const void *argv , float *result){
+
return XTRACT_FEATURE_NOT_IMPLEMENTED;
}
diff --git a/src/descriptors.c b/src/descriptors.c
index 3c43775..4584899 100644
--- a/src/descriptors.c
+++ b/src/descriptors.c
@@ -48,79 +48,6 @@ void *xtract_make_descriptors(){
argc = &d->argc;
argv_type = &d->argv.type;
- switch(f){
-
- case XTRACT_VARIANCE:
- case XTRACT_STANDARD_DEVIATION:
- case XTRACT_AVERAGE_DEVIATION:
- case XTRACT_SPECTRAL_VARIANCE:
- case XTRACT_SPECTRAL_STANDARD_DEVIATION:
- case XTRACT_SPECTRAL_AVERAGE_DEVIATION:
- case XTRACT_SPECTRAL_INHARMONICITY:
- case XTRACT_LOWEST_VALUE:
- case XTRACT_F0:
- case XTRACT_FAILSAFE_F0:
- case XTRACT_TONALITY:
- *argc = 1;
- *argv_type = XTRACT_FLOAT;
- break;
- case XTRACT_SKEWNESS:
- case XTRACT_KURTOSIS:
- case XTRACT_SPECTRAL_SKEWNESS:
- case XTRACT_SPECTRAL_KURTOSIS:
- case XTRACT_SPECTRUM:
- case XTRACT_PEAK_SPECTRUM:
- case XTRACT_HARMONIC_SPECTRUM:
- case XTRACT_NOISINESS:
- case XTRACT_CREST:
- case XTRACT_ROLLOFF:
- *argc = 2;
- *argv_type = XTRACT_FLOAT;
- break;
- case XTRACT_MFCC:
- *argc = 1;
- *argv_type = XTRACT_MEL_FILTER;
- break;
- case XTRACT_BARK_COEFFICIENTS:
- *argc = XTRACT_BARK_BANDS;
- *argv_type = XTRACT_INT;
- break;
- case XTRACT_MEAN:
- case XTRACT_SPECTRAL_MEAN:
- case XTRACT_SPECTRAL_CENTROID:
- case XTRACT_IRREGULARITY_K:
- case XTRACT_IRREGULARITY_J:
- case XTRACT_TRISTIMULUS_1:
- case XTRACT_TRISTIMULUS_2:
- case XTRACT_TRISTIMULUS_3:
- case XTRACT_SMOOTHNESS:
- case XTRACT_FLATNESS:
- case XTRACT_SPREAD:
- case XTRACT_ZCR:
- case XTRACT_LOUDNESS:
- case XTRACT_HIGHEST_VALUE:
- case XTRACT_SUM:
- case XTRACT_RMS_AMPLITUDE:
- case XTRACT_POWER:
- case XTRACT_SHARPNESS:
- case XTRACT_SPECTRAL_SLOPE:
- case XTRACT_HPS:
- case XTRACT_FLUX:
- case XTRACT_ATTACK_TIME:
- case XTRACT_DECAY_TIME:
- case XTRACT_DELTA_FEATURE:
- case XTRACT_AUTOCORRELATION_FFT:
- case XTRACT_DCT:
- case XTRACT_AUTOCORRELATION:
- case XTRACT_AMDF:
- case XTRACT_ASDF:
- case XTRACT_NONZERO_COUNT:
- case XTRACT_ODD_EVEN_RATIO:
- default:
- *argc = 0;
- break;
- }
-
argv_min = &d->argv.min[0];
argv_max = &d->argv.max[0];
argv_def = &d->argv.def[0];
@@ -169,14 +96,22 @@ void *xtract_make_descriptors(){
*(argv_unit + 1) = XTRACT_PERCENT;
break;
case XTRACT_SPECTRUM:
- *argv_min = XTRACT_SR_LOWER_LIMIT / 2;
- *argv_max = XTRACT_SR_UPPER_LIMIT / 2;
- *argv_def = XTRACT_SR_DEFAULT / 2;
+ *argv_min = XTRACT_SR_LOWER_LIMIT / XTRACT_FFT_BANDS_MIN;
+ *argv_max = XTRACT_SR_UPPER_LIMIT / XTRACT_FFT_BANDS_MAX;
+ *argv_def = XTRACT_SR_DEFAULT / XTRACT_FFT_BANDS_DEF;
*argv_unit = XTRACT_HERTZ;
*(argv_min + 1) = 0;
*(argv_max + 1) = 3 ;
*(argv_def + 1) = 0;
*(argv_unit + 1) = XTRACT_NONE;
+ *(argv_min + 2) = 0;
+ *(argv_max + 2) = 1;
+ *(argv_def + 2) = 0;
+ *(argv_unit + 2) = XTRACT_NONE;
+ *(argv_min + 3) = 0;
+ *(argv_max + 3) = 1;
+ *(argv_def + 3) = 0;
+ *(argv_unit + 3) = XTRACT_NONE;
break;
case XTRACT_PEAK_SPECTRUM:
*argv_min = XTRACT_SR_LOWER_LIMIT / 2;
@@ -260,7 +195,6 @@ void *xtract_make_descriptors(){
*argv_donor = XTRACT_INIT_MFCC;
break;
/* argc = 2 */;
- case XTRACT_SPECTRUM:
case XTRACT_ROLLOFF:
case XTRACT_PEAK_SPECTRUM:
*argv_donor = XTRACT_ANY;
@@ -288,7 +222,14 @@ void *xtract_make_descriptors(){
*argv_donor = XTRACT_HIGHEST_VALUE;
*(argv_donor + 1) = XTRACT_MEAN;
break;
- /* argc = BARK_BANDS */
+ /* argc = 4 */
+ case XTRACT_SPECTRUM:
+ *argv_donor = XTRACT_ANY;
+ *(argv_donor + 1) = XTRACT_ANY;
+ *(argv_donor + 2) = XTRACT_ANY;
+ *(argv_donor + 3) = XTRACT_ANY;
+ break;
+ /* BARK_BANDS */
case XTRACT_BARK_COEFFICIENTS:
*argv_donor = XTRACT_INIT_BARK;
break;
@@ -951,7 +892,6 @@ void *xtract_make_descriptors(){
case XTRACT_KURTOSIS:
case XTRACT_SPECTRAL_SKEWNESS:
case XTRACT_SPECTRAL_KURTOSIS:
- case XTRACT_SPECTRUM:
case XTRACT_PEAK_SPECTRUM:
case XTRACT_HARMONIC_SPECTRUM:
case XTRACT_NOISINESS:
@@ -960,6 +900,10 @@ void *xtract_make_descriptors(){
*argc = 2;
*argv_type = XTRACT_FLOAT;
break;
+ case XTRACT_SPECTRUM:
+ *argc = 4;
+ *argv_type = XTRACT_FLOAT;
+ break;
case XTRACT_MFCC:
*argc = 1;
*argv_type = XTRACT_MEL_FILTER;
diff --git a/src/vector.c b/src/vector.c
index 06fc281..d3fdd67 100644
--- a/src/vector.c
+++ b/src/vector.c
@@ -45,12 +45,17 @@
int xtract_spectrum(const float *data, const int N, const void *argv, float *result){
- float *input, *rfft, q, temp;
+ float *input, *rfft, q, temp, max;
size_t bytes;
- int n , NxN, M, vector, withDC, argc;
- //fftwf_plan plan;
+ int n,
+ NxN,
+ M,
+ vector,
+ withDC,
+ argc,
+ normalise;
- vector = argc = withDC = 0;
+ vector = argc = withDC = normalise = 0;
M = N >> 1;
NxN = XTRACT_SQ(N);
@@ -62,13 +67,14 @@ int xtract_spectrum(const float *data, const int N, const void *argv, float *res
q = *(float *)argv;
vector = (int)*((float *)argv+1);
withDC = (int)*((float *)argv+2);
+ normalise = (int)*((float *)argv+3);
+
+ temp = 0.f;
+ max = 0.f;
XTRACT_CHECK_q;
if(fft_plans.spectrum_plan == NULL){
- /* FIX: Not sure this should really be here. Might introduce
- * DEBUG_POST macro, or some kind of error handler, or leave it to the
- * caller... */
fprintf(stderr,
"libxtract: Error: xtract_spectrum() has uninitialised plan\n");
return XTRACT_NO_RESULT;
@@ -98,6 +104,7 @@ int xtract_spectrum(const float *data, const int N, const void *argv, float *res
XTRACT_DB_SCALE_OFFSET;
result[M + n - 1] = n * q;
}
+ max = result[n] > max ? result[n] : max;
}
break;
@@ -113,6 +120,7 @@ int xtract_spectrum(const float *data, const int N, const void *argv, float *res
(XTRACT_SQ(rfft[n]) + XTRACT_SQ(rfft[N - n])) / NxN;
result[M + n - 1] = n * q;
}
+ max = result[n] > max ? result[n] : max;
}
break;
@@ -133,6 +141,7 @@ int xtract_spectrum(const float *data, const int N, const void *argv, float *res
XTRACT_DB_SCALE_OFFSET;
result[M + n - 1] = n * q;
}
+ max = result[n] > max ? result[n] : max;
}
break;
@@ -149,6 +158,7 @@ int xtract_spectrum(const float *data, const int N, const void *argv, float *res
XTRACT_SQ(rfft[N - n])) / N;
result[M + n - 1] = n * q;
}
+ max = result[n] > max ? result[n] : max;
}
break;
}
@@ -157,16 +167,26 @@ int xtract_spectrum(const float *data, const int N, const void *argv, float *res
/* The DC component */
result[0] = XTRACT_SQ(rfft[0]);
result[M + 1] = 0.f;
+ max = result[0] > max ? result[0] : max;
/* The Nyquist */
result[M] = XTRACT_SQ(rfft[M]);
result[N + 1] = q * M;
+ max = result[M] > max ? result[M] : max;
+ M++; /* So we normalise the Nyquist (below) */
}
else {
/* The Nyquist */
result[M - 1] = (float)XTRACT_SQ(rfft[M]);
result[N - 1] = q * M;
+ max = result[M - 1] > max ? result[M - 1] : max;
}
+
+ if(normalise){
+ for(n = 0; n < M; n++)
+ result[n] /= max;
+ }
+
fftwf_free(rfft);
free(input);
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-03 06:42:49 +0000