Replaced --enable-vector with --enable-fft and improved build

1 files changed, 23 insertions, 24 deletions

diff --git a/xtract/xtract_vector.h b/xtract/xtract_vector.h
index fc39aa7..d72d051 100644
--- a/xtract/xtract_vector.h
+++ b/xtract/xtract_vector.h
@@ -43,24 +43,42 @@ extern "C" {
  */
 int xtract_magnitude_spectrum(float *data, int N, void *argv, float *result);
 
-
-/** \brief Extract autocorrelation from time domain signal using time-domain autocorrelation technique 
+/** \brief Extract autocorrelation from time domain signal using FFT based method
  * 
  * \param *data: a pointer to the first element in an array of floats representing an audio vector
  * \param N: the number of array elements to be considered
  * \param *argv: a pointer to NULL 
  * \param *result: the autocorrelation of N values from the array pointed to by *data 
  */
-int xtract_autocorrelation(float *data, int N, void *argv, float *result);
+int xtract_autocorrelation_fft(float *data, int N, void *argv, float *result);
 
-/** \brief Extract autocorrelation from time domain signal using FFT based method
+/** \brief Extract Mel Frequency Cepstral Coefficients based on a method described by Rabiner
+ * 
+ * \param *data: a pointer to the first element in an array of floats
+ * \param N: the number of array elements to be considered
+ * \param *argv: a pointer to a data structure of type xtract_mel_filter, containing n_filters coefficient tables to make up a mel-spaced filterbank
+ * \param *result: a pointer to an array containing the resultant MFCC
+ * 
+ * The data structure pointed to by *argv must be obtained by first calling xtract_init_mfcc
+ */
+int xtract_mfcc(float *data, int N, void *argv, float *result);
+
+/** \brief Extract the Discrete Cosine transform of a time domain signal
+ * \param *data: a pointer to the first element in an array of floats representing an audio vector
+ * \param N: the number of array elements to be considered
+ * \param *argv: a pointer to NULL 
+ * \param *result: a pointer to an array containing resultant dct coefficients
+ */
+int xtract_dct(float *data, int N, void *argv, float *result);
+
+/** \brief Extract autocorrelation from time domain signal using time-domain autocorrelation technique 
  * 
  * \param *data: a pointer to the first element in an array of floats representing an audio vector
  * \param N: the number of array elements to be considered
  * \param *argv: a pointer to NULL 
  * \param *result: the autocorrelation of N values from the array pointed to by *data 
  */
-int xtract_autocorrelation_fft(float *data, int N, void *argv, float *result);
+int xtract_autocorrelation(float *data, int N, void *argv, float *result);
 
 /** \brief Extract Average Magnitude Difference Function from time domain signal 
  * 
@@ -80,17 +98,6 @@ int xtract_amdf(float *data, int N, void *argv, float *result);
  */
 int xtract_asdf(float *data, int N, void *argv, float *result);
     
-/** \brief Extract Mel Frequency Cepstral Coefficients based on a method described by Rabiner
- * 
- * \param *data: a pointer to the first element in an array of floats
- * \param N: the number of array elements to be considered
- * \param *argv: a pointer to a data structure of type xtract_mel_filter, containing n_filters coefficient tables to make up a mel-spaced filterbank
- * \param *result: a pointer to an array containing the resultant MFCC
- * 
- * The data structure pointed to by *argv must be obtained by first calling xtract_init_mfcc
- */
-int xtract_mfcc(float *data, int N, void *argv, float *result);
-
 /** \brief Extract Bark band coefficients based on a method   
  * \param *data: a pointer to the first element in an array of floats representing the magnitude spectrum of an audio vector
  * \param N: the number of array elements to be considered
@@ -102,14 +109,6 @@ int xtract_mfcc(float *data, int N, void *argv, float *result);
  */
 int xtract_bark_coefficients(float *data, int N, void *argv, float *result);
 
-/** \brief Extract the Discrete Cosine transform of a time domain signal
- * \param *data: a pointer to the first element in an array of floats representing an audio vector
- * \param N: the number of array elements to be considered
- * \param *argv: a pointer to NULL 
- * \param *result: a pointer to an array containing resultant dct coefficients
- */
-int xtract_dct(float *data, int N, void *argv, float *result);
-
 /** \brief Extract the frequency and amplitude of spectral peaks from a of a magnitude spectrum
  * \param *data: a pointer to the first element in an array of floats representing the magnitude spectrum of an audio vector
  * \param N: the number of array elements to be considered