comparison xtract/xtract_scalar.h @ 125:2bdf5e248870

- fixed build-time bug. in some cases average_deviation was commented out instead of spectral_average_deviation
author Jamie Bullock <jamie@postlude.co.uk>
date Thu, 29 Mar 2012 12:23:04 +0000
parents efb1c1ae2ba8
children e4f704649c50
comparison
equal deleted inserted replaced
124:fc4bc58b92da 125:2bdf5e248870
69 * \param *data: a pointer to the first element in an array of floats 69 * \param *data: a pointer to the first element in an array of floats
70 * \param N: the number of elements to be considered 70 * \param N: the number of elements to be considered
71 * \param *argv: a pointer to a float representing the mean of the input vector 71 * \param *argv: a pointer to a float representing the mean of the input vector
72 * \param *result: the average deviation of N values from the array pointed to by *data 72 * \param *result: the average deviation of N values from the array pointed to by *data
73 */ 73 */
74 /*int xtract_average_deviation(const float *data, const int N, const void *argv, float *result); 74 int xtract_average_deviation(const float *data, const int N, const void *argv, float *result);
75 */ 75
76 76
77 /** \brief Extract the skewness of an input vector 77 /** \brief Extract the skewness of an input vector
78 * 78 *
79 * \param *data: a pointer to the first element in an array of floats 79 * \param *data: a pointer to the first element in an array of floats
80 * \param N: the number of elements to be considered 80 * \param N: the number of elements to be considered
125 * \param *data: a pointer to the first element in an array of floats representing the spectrum of an audio vector, (e.g. the array pointed to by *result from xtract_spectrum(), xtract_peak_spectrum() or xtract_harmonic_spectrum()). 125 * \param *data: a pointer to the first element in an array of floats representing the spectrum of an audio vector, (e.g. the array pointed to by *result from xtract_spectrum(), xtract_peak_spectrum() or xtract_harmonic_spectrum()).
126 * \param N: the size of the array pointed to by *data 126 * \param N: the size of the array pointed to by *data
127 * \param *argv: a pointer to a float representing the spectral mean of the input spectrum 127 * \param *argv: a pointer to a float representing the spectral mean of the input spectrum
128 * \param *result: the average deviation of the spectrum pointed to by *data 128 * \param *result: the average deviation of the spectrum pointed to by *data
129 */ 129 */
130 /*
130 int xtract_spectral_average_deviation(const float *data, const int N, const void *argv, float *result); 131 int xtract_spectral_average_deviation(const float *data, const int N, const void *argv, float *result);
132 */
131 133
132 /** \brief Extract the skewness of an input spectrum 134 /** \brief Extract the skewness of an input spectrum
133 * 135 *
134 * \param *data: a pointer to the first element in an array of floats representing the spectrum of an audio vector, (e.g. the array pointed to by *result from xtract_spectrum(), xtract_peak_spectrum() or xtract_harmonic_spectrum()). 136 * \param *data: a pointer to the first element in an array of floats representing the spectrum of an audio vector, (e.g. the array pointed to by *result from xtract_spectrum(), xtract_peak_spectrum() or xtract_harmonic_spectrum()).
135 * \param N: the size of the array pointed to by *data 137 * \param N: the size of the array pointed to by *data