/*
- Copyright (C) 2003-20
09 Paul Brossier <piem@aubio.org>
+ Copyright (C) 2003-20
14 Paul Brossier <piem@aubio.org>
This file is part of aubio.
#include "musicutils.h"
#include "config.h"
-
/** Window types */
typedef enum
{
} aubio_window_type;
fvec_t *
-new_aubio_window (char_t * window_type, uint_t size)
+new_aubio_window (char_t * window_type, uint_t length)
{
- fvec_t * win = new_fvec (size);
+ fvec_t * win = new_fvec (length);
+ uint_t err;
+ if (win == NULL) {
+ return NULL;
+ }
+ err = fvec_set_window (win, window_type);
+ if (err != 0) {
+ del_fvec(win);
+ return NULL;
+ }
+ return win;
+}
+
+uint_t fvec_set_window (fvec_t *win, char_t *window_type) {
smpl_t * w = win->data;
- uint_t i;
+ uint_t i, size = win->length;
aubio_window_type wintype;
- if (strcmp (window_type, "rectangle") == 0)
+ if (window_type == NULL) {
+ AUBIO_ERR ("window type can not be null.\n");
+ return 1;
+ } else if (strcmp (window_type, "rectangle") == 0)
wintype = aubio_win_rectangle;
else if (strcmp (window_type, "hamming") == 0)
wintype = aubio_win_hamming;
else if (strcmp (window_type, "default") == 0)
wintype = aubio_win_default;
else {
- AUBIO_ERR ("unknown window type %s, using default.\n", window_type);
- wintype = aubio_win_default;
+ AUBIO_ERR ("unknown window type `%s`.\n", window_type);
+ return 1;
}
switch(wintype) {
case aubio_win_rectangle:
break;
case aubio_win_parzen:
for (i=0;i<size;i++)
- w[i] = 1.0 - ABS((2.*i-size)/(size+1.0));
+ w[i] = 1.0 - ABS((2.f*i-size)/(size+1.0f));
break;
default:
break;
}
- return win;
+ return 0;
}
smpl_t
smpl_t
fvec_mean (fvec_t * s)
{
- uint_t j;
smpl_t tmp = 0.0;
+#ifndef HAVE_ACCELERATE
+ uint_t j;
for (j = 0; j < s->length; j++) {
tmp += s->data[j];
}
return tmp / (smpl_t) (s->length);
+#else
+ aubio_vDSP_meanv(s->data, 1, &tmp, s->length);
+ return tmp;
+#endif /* HAVE_ACCELERATE */
}
smpl_t
fvec_sum (fvec_t * s)
{
- uint_t j;
smpl_t tmp = 0.0;
+#ifndef HAVE_ACCELERATE
+ uint_t j;
for (j = 0; j < s->length; j++) {
tmp += s->data[j];
}
+#else
+ aubio_vDSP_sve(s->data, 1, &tmp, s->length);
+#endif /* HAVE_ACCELERATE */
return tmp;
}
smpl_t
fvec_max (fvec_t * s)
{
+#ifndef HAVE_ACCELERATE
uint_t j;
smpl_t tmp = 0.0;
for (j = 0; j < s->length; j++) {
tmp = (tmp > s->data[j]) ? tmp : s->data[j];
}
+#else
+ smpl_t tmp = 0.;
+ aubio_vDSP_maxv(s->data, 1, &tmp, s->length);
+#endif
return tmp;
}
smpl_t
fvec_min (fvec_t * s)
{
+#ifndef HAVE_ACCELERATE
uint_t j;
smpl_t tmp = s->data[0];
for (j = 0; j < s->length; j++) {
tmp = (tmp < s->data[j]) ? tmp : s->data[j];
}
+#else
+ smpl_t tmp = 0.;
+ aubio_vDSP_minv(s->data, 1, &tmp, s->length);
+#endif
return tmp;
}
uint_t
fvec_min_elem (fvec_t * s)
{
+#ifndef HAVE_ACCELERATE
uint_t j, pos = 0.;
smpl_t tmp = s->data[0];
for (j = 0; j < s->length; j++) {
pos = (tmp < s->data[j]) ? pos : j;
tmp = (tmp < s->data[j]) ? tmp : s->data[j];
}
+#else
+ smpl_t tmp = 0.;
+ uint_t pos = 0.;
+ aubio_vDSP_minvi(s->data, 1, &tmp, (vDSP_Length *)&pos, s->length);
+#endif
return pos;
}
uint_t
fvec_max_elem (fvec_t * s)
{
+#ifndef HAVE_ACCELERATE
uint_t j, pos = 0;
smpl_t tmp = 0.0;
for (j = 0; j < s->length; j++) {
pos = (tmp > s->data[j]) ? pos : j;
tmp = (tmp > s->data[j]) ? tmp : s->data[j];
}
+#else
+ smpl_t tmp = 0.;
+ uint_t pos = 0.;
+ aubio_vDSP_maxvi(s->data, 1, &tmp, (vDSP_Length *)&pos, s->length);
+#endif
return pos;
}
void
fvec_shift (fvec_t * s)
{
- uint_t j;
- for (j = 0; j < s->length / 2; j++) {
- ELEM_SWAP (s->data[j], s->data[j + s->length / 2]);
+ uint_t half = s->length / 2, start = half, j;
+ // if length is odd, middle element is moved to the end
+ if (2 * half < s->length) start ++;
+#ifndef HAVE_ATLAS
+ for (j = 0; j < half; j++) {
+ ELEM_SWAP (s->data[j], s->data[j + start]);
+ }
+#else
+ aubio_cblas_swap(half, s->data, 1, s->data + start, 1);
+#endif
+ if (start != half) {
+ for (j = 0; j < half; j++) {
+ ELEM_SWAP (s->data[j + start - 1], s->data[j + start]);
+ }
+ }
+}
+
+void
+fvec_ishift (fvec_t * s)
+{
+ uint_t half = s->length / 2, start = half, j;
+ // if length is odd, middle element is moved to the beginning
+ if (2 * half < s->length) start ++;
+#ifndef HAVE_ATLAS
+ for (j = 0; j < half; j++) {
+ ELEM_SWAP (s->data[j], s->data[j + start]);
+ }
+#else
+ aubio_cblas_swap(half, s->data, 1, s->data + start, 1);
+#endif
+ if (start != half) {
+ for (j = 0; j < half; j++) {
+ ELEM_SWAP (s->data[half], s->data[j]);
+ }
}
}
smpl_t
-fvec_local_energy (fvec_t * f)
+aubio_level_lin (const fvec_t * f)
{
smpl_t energy = 0.;
+#ifndef HAVE_ATLAS
uint_t j;
for (j = 0; j < f->length; j++) {
energy += SQR (f->data[j]);
}
+#else
+ energy = aubio_cblas_dot(f->length, f->data, 1, f->data, 1);
+#endif
return energy / f->length;
}
}
}
-smpl_t fvec_quadint (fvec_t * x, uint_t pos) {
- smpl_t s0, s1, s2;
- uint_t x0 = (pos < 1) ? pos : pos - 1;
- uint_t x2 = (pos + 1 < x->length) ? pos + 1 : pos;
+smpl_t fvec_quadratic_peak_pos (const fvec_t * x, uint_t pos) {
+ smpl_t s0, s1, s2; uint_t x0, x2;
+ smpl_t half = .5, two = 2.;
+ if (pos == 0 || pos == x->length - 1) return pos;
+ x0 = (pos < 1) ? pos : pos - 1;
+ x2 = (pos + 1 < x->length) ? pos + 1 : pos;
if (x0 == pos) return (x->data[pos] <= x->data[x2]) ? pos : x2;
if (x2 == pos) return (x->data[pos] <= x->data[x0]) ? pos : x0;
s0 = x->data[x0];
s1 = x->data[pos];
s2 = x->data[x2];
- return pos + 0.5 * (s2 - s0 ) / (s2 - 2.* s1 + s0);
+ return pos + half * (s0 - s2 ) / (s0 - two * s1 + s2);
+}
+
+smpl_t fvec_quadratic_peak_mag (fvec_t *x, smpl_t pos) {
+ smpl_t x0, x1, x2;
+ uint_t index = (uint_t)(pos - .5) + 1;
+ if (pos >= x->length || pos < 0.) return 0.;
+ if ((smpl_t)index == pos) return x->data[index];
+ x0 = x->data[index - 1];
+ x1 = x->data[index];
+ x2 = x->data[index + 1];
+ return x1 - .25 * (x0 - x2) * (pos - index);
}
-uint_t fvec_peakpick(fvec_t * onset, uint_t pos) {
+uint_t fvec_peakpick(const fvec_t * onset, uint_t pos) {
uint_t tmp=0;
tmp = (onset->data[pos] > onset->data[pos-1]
&& onset->data[pos] > onset->data[pos+1]
smpl_t
aubio_freqtomidi (smpl_t freq)
{
+ smpl_t midi;
+ if (freq < 2. || freq > 100000.) return 0.; // avoid nans and infs
/* log(freq/A-2)/log(2) */
- smpl_t midi = freq / 6.875;
+ midi = freq / 6.875;
midi = LOG (midi) / 0.69314718055995;
midi *= 12;
midi -= 3;
smpl_t
aubio_miditofreq (smpl_t midi)
{
- smpl_t freq = (midi + 3.) / 12.;
+ smpl_t freq;
+ if (midi > 140.) return 0.; // avoid infs
+ freq = (midi + 3.) / 12.;
freq = EXP (freq * 0.69314718055995);
freq *= 6.875;
return freq;
aubio_bintofreq (smpl_t bin, smpl_t samplerate, smpl_t fftsize)
{
smpl_t freq = samplerate / fftsize;
- return freq * bin;
+ return freq * MAX(bin, 0);
}
smpl_t
aubio_freqtobin (smpl_t freq, smpl_t samplerate, smpl_t fftsize)
{
smpl_t bin = fftsize / samplerate;
- return freq * bin;
+ return MAX(freq, 0) * bin;
}
smpl_t
}
smpl_t
-aubio_db_spl (fvec_t * o)
+aubio_db_spl (const fvec_t * o)
{
- return 10. * LOG10 (fvec_local_energy (o));
+ return 10. * LOG10 (aubio_level_lin (o));
}
uint_t
-aubio_silence_detection (fvec_t * o, smpl_t threshold)
+aubio_silence_detection (const fvec_t * o, smpl_t threshold)
{
return (aubio_db_spl (o) < threshold);
}
smpl_t
-aubio_level_detection (fvec_t * o, smpl_t threshold)
+aubio_level_detection (const fvec_t * o, smpl_t threshold)
{
smpl_t db_spl = aubio_db_spl (o);
if (db_spl < threshold) {
}
void
-aubio_autocorr (fvec_t * input, fvec_t * output)
+aubio_autocorr (const fvec_t * input, fvec_t * output)
{
uint_t i, j, length = input->length;
smpl_t *data, *acf;
projects / aubio.git / blobdiff