ref: ade9afe663f3175a6ed9e75c0866fa436591e3e1
parent: 05468516a12b949f73d55b478753c7ab6aa77730
author: Paul Brossier <piem@piem.org>
date: Wed May 2 11:10:42 EDT 2007
mathutils.c: indentation, remove tabs, no { at beginning of line, no spaces at end of line
--- a/src/mathutils.c
+++ b/src/mathutils.c
@@ -29,7 +29,7 @@
switch(wintype) {case aubio_win_rectangle:
for (i=0;i<size;i++)
- w[i] = 0.5;
+ w[i] = 0.5;
break;
case aubio_win_hamming:
for (i=0;i<size;i++)
@@ -47,11 +47,11 @@
for (i=0;i<size;i++)
w[i] = 0.42
- 0.50 * COS( TWO_PI*i/(size-1.0))
- + 0.08 * COS(2.0*TWO_PI*i/(size-1.0));
+ + 0.08 * COS(2.0*TWO_PI*i/(size-1.0));
break;
case aubio_win_blackman_harris:
for (i=0;i<size;i++)
- w[i] = 0.35875
+ w[i] = 0.35875
- 0.48829 * COS( TWO_PI*i/(size-1.0))
+ 0.14128 * COS(2.0*TWO_PI*i/(size-1.0))
- 0.01168 * COS(3.0*TWO_PI*i/(size-1.0));
@@ -73,15 +73,12 @@
}
}
-
smpl_t aubio_unwrap2pi(smpl_t phase) {/* mod(phase+pi,-2pi)+pi */
return phase + TWO_PI * (1. + FLOOR(-(phase+PI)/TWO_PI));
}
-
-smpl_t vec_mean(fvec_t *s)
-{+smpl_t vec_mean(fvec_t *s) {uint_t i,j;
smpl_t tmp = 0.0f;
for (i=0; i < s->channels; i++)
@@ -90,9 +87,7 @@
return tmp/(smpl_t)(s->length);
}
-
-smpl_t vec_sum(fvec_t *s)
-{+smpl_t vec_sum(fvec_t *s) {uint_t i,j;
smpl_t tmp = 0.0f;
for (i=0; i < s->channels; i++)
@@ -101,9 +96,7 @@
return tmp;
}
-
-smpl_t vec_max(fvec_t *s)
-{+smpl_t vec_max(fvec_t *s) {uint_t i,j;
smpl_t tmp = 0.0f;
for (i=0; i < s->channels; i++)
@@ -112,8 +105,7 @@
return tmp;
}
-smpl_t vec_min(fvec_t *s)
-{+smpl_t vec_min(fvec_t *s) {uint_t i,j;
smpl_t tmp = s->data[0][0];
for (i=0; i < s->channels; i++)
@@ -122,9 +114,7 @@
return tmp;
}
-
-uint_t vec_min_elem(fvec_t *s)
-{+uint_t vec_min_elem(fvec_t *s) {uint_t i,j=0, pos=0.;
smpl_t tmp = s->data[0][0];
for (i=0; i < s->channels; i++)
@@ -135,8 +125,7 @@
return pos;
}
-uint_t vec_max_elem(fvec_t *s)
-{+uint_t vec_max_elem(fvec_t *s) {uint_t i,j=0, pos=0.;
smpl_t tmp = 0.0f;
for (i=0; i < s->channels; i++)
@@ -147,8 +136,7 @@
return pos;
}
-void vec_shift(fvec_t *s)
-{+void vec_shift(fvec_t *s) {uint_t i,j;
//smpl_t tmp = 0.0f;
for (i=0; i < s->channels; i++)
@@ -160,8 +148,7 @@
}
}
-smpl_t vec_local_energy(fvec_t * f)
-{+smpl_t vec_local_energy(fvec_t * f) {smpl_t locE = 0.;
uint_t i,j;
for (i=0;i<f->channels;i++)
@@ -170,8 +157,7 @@
return locE;
}
-smpl_t vec_local_hfc(fvec_t * f)
-{+smpl_t vec_local_hfc(fvec_t * f) {smpl_t locE = 0.;
uint_t i,j;
for (i=0;i<f->channels;i++)
@@ -180,8 +166,7 @@
return locE;
}
-smpl_t vec_alpha_norm(fvec_t * DF, smpl_t alpha)
-{+smpl_t vec_alpha_norm(fvec_t * DF, smpl_t alpha) {smpl_t tmp = 0.;
uint_t i,j;
for (i=0;i<DF->channels;i++)
@@ -190,9 +175,7 @@
return POW(tmp/DF->length,1./alpha);
}
-
-void vec_dc_removal(fvec_t * mag)
-{+void vec_dc_removal(fvec_t * mag) {smpl_t mini = 0.;
uint_t length = mag->length, i=0, j;
mini = vec_min(mag);
@@ -201,9 +184,7 @@
}
}
-
-void vec_alpha_normalise(fvec_t * mag, uint_t alpha)
-{+void vec_alpha_normalise(fvec_t * mag, uint_t alpha) {smpl_t alphan = 1.;
uint_t length = mag->length, i=0, j;
alphan = vec_alpha_norm(mag,alpha);
@@ -212,7 +193,6 @@
}
}
-
void vec_add(fvec_t * mag, smpl_t threshold) {uint_t length = mag->length, i=0, j;
for (j=0;j<length;j++) {@@ -220,10 +200,8 @@
}
}
-
-void vec_adapt_thres(fvec_t * vec, fvec_t * tmp,
- uint_t post, uint_t pre)
-{+void vec_adapt_thres(fvec_t * vec, fvec_t * tmp,
+ uint_t post, uint_t pre) {uint_t length = vec->length, i=0, j;
for (j=0;j<length;j++) {vec->data[i][j] -= vec_moving_thres(vec, tmp, post, pre, j);
@@ -231,8 +209,7 @@
}
smpl_t vec_moving_thres(fvec_t * vec, fvec_t * tmpvec,
- uint_t post, uint_t pre, uint_t pos)
-{+ uint_t post, uint_t pre, uint_t pos) {smpl_t * medar = (smpl_t *)tmpvec->data[0];
uint_t k;
uint_t win_length = post+pre+1;
@@ -239,7 +216,7 @@
uint_t length = vec->length;
/* post part of the buffer does not exist */
if (pos<post+1) {- for (k=0;k<post+1-pos;k++)
+ for (k=0;k<post+1-pos;k++)
medar[k] = 0.; /* 0-padding at the beginning */
for (k=post+1-pos;k<win_length;k++)
medar[k] = vec->data[0][k+pos-post];
@@ -251,9 +228,9 @@
} else {for (k=0;k<length-pos+post+1;k++)
medar[k] = vec->data[0][k+pos-post];
- for (k=length-pos+post+1;k<win_length;k++)
+ for (k=length-pos+post+1;k<win_length;k++)
medar[k] = 0.; /* 0-padding at the end */
- }
+ }
return vec_median(tmpvec);
}
@@ -320,9 +297,9 @@
/* increase frac */
for (frac = 0.; frac < 2.; frac = frac + step) {res = aubio_quadfrac(s0, s1, s2, frac);
- if (res > resold)
+ if (res > resold)
resold = res;
- else { + else {exactpos += (frac-step)*2. - 1.;
break;
}
@@ -344,7 +321,7 @@
res = aubio_quadfrac(s0, s1, s2, frac);
if (res < resold) {resold = res;
- } else { + } else {exactpos += (frac-step)*span - span/2.;
break;
}
@@ -359,28 +336,28 @@
}
uint_t vec_peakpick(fvec_t * onset, uint_t pos) {- uint_t i=0, tmp=0;
- /*for (i=0;i<onset->channels;i++)*/
- tmp = (onset->data[i][pos] > onset->data[i][pos-1]
- && onset->data[i][pos] > onset->data[i][pos+1]
- && onset->data[i][pos] > 0.);
- return tmp;
+ uint_t i=0, tmp=0;
+ /*for (i=0;i<onset->channels;i++)*/
+ tmp = (onset->data[i][pos] > onset->data[i][pos-1]
+ && onset->data[i][pos] > onset->data[i][pos+1]
+ && onset->data[i][pos] > 0.);
+ return tmp;
}
smpl_t aubio_freqtomidi(smpl_t freq) {- /* log(freq/A-2)/log(2) */
- smpl_t midi = freq/6.875;
- midi = LOG(midi)/0.69314718055995;
- midi *= 12;
- midi -= 3;
- return midi;
+ /* log(freq/A-2)/log(2) */
+ smpl_t midi = freq/6.875;
+ midi = LOG(midi)/0.69314718055995;
+ midi *= 12;
+ midi -= 3;
+ return midi;
}
smpl_t aubio_miditofreq(smpl_t midi) {- smpl_t freq = (midi+3.)/12.;
- freq = EXP(freq*0.69314718055995);
- freq *= 6.875;
- return freq;
+ smpl_t freq = (midi+3.)/12.;
+ freq = EXP(freq*0.69314718055995);
+ freq *= 6.875;
+ return freq;
}
smpl_t aubio_bintofreq(smpl_t bin, smpl_t samplerate, smpl_t fftsize) {@@ -403,9 +380,7 @@
return aubio_freqtobin(freq,samplerate,fftsize);
}
-
-
-/** returns 1 if wassilence is 0 and RMS(ibuf)<threshold
+/** returns 1 if wassilence is 0 and RMS(ibuf)<threshold
* \bug mono
*/
uint_t aubio_silence_detection(fvec_t * ibuf, smpl_t threshold) {@@ -435,9 +410,9 @@
loudness = LIN2DB(loudness);
if (loudness < threshold)
- return 1.;
+ return 1.;
else
- return loudness;
+ return loudness;
}
smpl_t aubio_zero_crossing_rate(fvec_t * input) {@@ -450,7 +425,7 @@
zcr += 1;
}
//previous was positive
- } else if ( input->data[i][j] <= 0. ){+ } else if ( input->data[i][j] <= 0. ) {zcr += 1;
}
}
@@ -470,27 +445,26 @@
return sc / sum * samplerate / (smpl_t)(spectrum->length);
}
-void aubio_autocorr(fvec_t * input, fvec_t * output){- uint_t i = 0, j = 0, length = input->length;
- smpl_t * data = input->data[0];
- smpl_t * acf = output->data[0];
- smpl_t tmp =0.;
- for(i=0;i<length;i++){- for(j=i;j<length;j++){- tmp += data[j-i]*data[j];
- }
- acf[i] = tmp /(smpl_t)(length-i);
- tmp = 0.0;
- }
-}
+void aubio_autocorr(fvec_t * input, fvec_t * output) {+ uint_t i = 0, j = 0, length = input->length;
+ smpl_t * data = input->data[0];
+ smpl_t * acf = output->data[0];
+ smpl_t tmp =0.;
+ for(i=0;i<length;i++){+ for(j=i;j<length;j++){+ tmp += data[j-i]*data[j];
+ }
+ acf[i] = tmp /(smpl_t)(length-i);
+ tmp = 0.0;
+ }
+}
-void aubio_cleanup(void)
-{+void aubio_cleanup(void) {#if FFTW3_SUPPORT
- fftw_cleanup();
+ fftw_cleanup();
#else
#if FFTW3F_SUPPORT
- fftwf_cleanup();
+ fftwf_cleanup();
#endif
#endif
}