ref: c59e6935d6b56a067b7a7b882d649dcfe1ba2ec7
parent: 0969113110f96081523419ccde6ac0e8616e8eeb
parent: f45dd12cc696444320b8360b0c84650e50324e34
author: Paul Brossier <piem@piem.org>
date: Sat Sep 5 08:40:07 EDT 2015
Merge branch 'develop' into accelerate
--- a/src/tempo/beattracking.c
+++ b/src/tempo/beattracking.c
@@ -135,8 +135,8 @@
//number of harmonics in shift invariant comb filterbank
uint_t numelem = 4;
- smpl_t phase; // beat alignment (step - lastbeat)
- smpl_t beat; // beat position
+ smpl_t phase; // beat alignment (step - lastbeat)
+ smpl_t beat; // beat position
smpl_t bp; // beat period
uint_t a, b; // used to build shift invariant comb filterbank
uint_t kmax; // number of elements used to find beat phase
@@ -226,7 +226,7 @@
i = 1;
beat = bp - phase;
- // AUBIO_DBG ("bp: %f, phase: %f, lastbeat: %f, step: %d, winlen: %d\n", + // AUBIO_DBG ("bp: %f, phase: %f, lastbeat: %f, step: %d, winlen: %d\n",// bp, phase, bt->lastbeat, step, winlen);
/* the next beat will be earlier than 60% of the tempo period
@@ -318,7 +318,7 @@
gp = 0;
}
- //now look for step change - i.e. a difference between gp and rp that
+ //now look for step change - i.e. a difference between gp and rp that
// is greater than 2*constthresh - always true in first case, since gp = 0
if (counter == 0) { if (ABS (gp - rp) > 2. * bt->g_var) {@@ -341,7 +341,7 @@
counter = 2; // let it look next time
}
} else if (counter > 0) {- //if counter doesn't = 1,
+ //if counter doesn't = 1,
counter = counter - 1;
}
--- a/src/tempo/beattracking.h
+++ b/src/tempo/beattracking.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2003-2013 Matthew Davies and Paul Brossier <piem@aubio.org>
+ Copyright (C) 2003-2015 Matthew Davies and Paul Brossier <piem@aubio.org>
This file is part of aubio.
@@ -34,7 +34,7 @@
Engeeniring Society 118th Convention, Barcelona, Spain, May 2005.
\example tempo/test-beattracking.c
-
+
*/
#ifndef _AUBIO_BEATTRACKING_H
#define _AUBIO_BEATTRACKING_H
@@ -49,7 +49,7 @@
/** create beat tracking object
\param winlen length of the onset detection window
- \param hop_size number of onset detection samples [512]
+ \param hop_size number of onset detection samples [512]
\param samplerate samplerate of the input signal
*/
@@ -56,12 +56,12 @@
aubio_beattracking_t * new_aubio_beattracking(uint_t winlen, uint_t hop_size,
uint_t samplerate);
-/** track the beat
+/** track the beat
\param bt beat tracking object
\param dfframes current input detection function frame, smoothed by
- adaptive median threshold.
- \param out stored detected beat locations
+ adaptive median threshold.
+ \param out stored detected beat locations
*/
void aubio_beattracking_do (aubio_beattracking_t * bt, fvec_t * dfframes,
@@ -77,7 +77,7 @@
*/
smpl_t aubio_beattracking_get_bpm(aubio_beattracking_t * bt);
-/** get current tempo confidence
+/** get current tempo confidence
\param bt beat tracking object
--- a/src/utils/scale.h
+++ b/src/utils/scale.h
@@ -20,13 +20,13 @@
/** \file
- Vector scaling function
-
+ Vector scaling function
+
This object, inspired from the scale object in FTS, the jMax engine, scales
the values of a vector according to an affine function defined as follow:
-
- \f$ y = (x - ilow)*(ohig-olow)/(ihig-ilow) + olow \f$
-
+
+ \f$ y = (x - ilow)*(ohig-olow)/(ihig-ilow) + olow \f$
+
*/
#ifndef _AUBIO_SCALE_H
#define _AUBIO_SCALE_H
@@ -39,7 +39,7 @@
typedef struct _aubio_scale_t aubio_scale_t;
/** create a scale object
-
+
\param flow lower value of output function
\param fhig higher value of output function
\param ilow lower value of input function
@@ -48,7 +48,7 @@
*/
aubio_scale_t * new_aubio_scale(smpl_t flow, smpl_t fhig,
smpl_t ilow, smpl_t ihig);
-/** delete a scale object
+/** delete a scale object
\param s scale object as returned by new_aubio_scale
@@ -75,6 +75,6 @@
#ifdef __cplusplus
}
-#endif
+#endif
#endif /* _AUBIO_SCALE_H */