Changeset c59e693 for src

Timestamp:

Sep 5, 2015, 12:40:07 PM (9 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

4aa18e3

Parents:

0969113 (diff), f45dd12 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'develop' into accelerate

Location:

src

Files:

• tempo/beattracking.c (modified) (4 diffs)
• tempo/beattracking.h (modified) (5 diffs)
• utils/scale.h (modified) (4 diffs)

src/tempo/beattracking.c

@@ -136 +136 @@
   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
@@ -227 +227 @@
   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);
 
@@ -319 +319 @@
   }
 
-  //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) {
@@ -342 +342 @@
     }
   } else if (counter > 0) {
-    //if counter doesn't = 1, 
+    //if counter doesn't = 1,
     counter = counter - 1;
   }

src/tempo/beattracking.h

@@ -1 +1 @@
 /*
-  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.
@@ -35 +35 @@
 
   \example tempo/test-beattracking.c
-  
+
 */
 #ifndef _AUBIO_BEATTRACKING_H
@@ -50 +50 @@
 
   \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
 
@@ -57 +57 @@
     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
 
 */
@@ -78 +78 @@
 smpl_t aubio_beattracking_get_bpm(aubio_beattracking_t * bt);
 
-/** get current tempo confidence 
+/** get current tempo confidence
 
   \param bt beat tracking object

src/utils/scale.h

@@ -21 +21 @@
 /** \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
@@ -40 +40 @@
 
 /** create a scale object
- 
+
   \param flow lower value of output function
   \param fhig higher value of output function
@@ -49 +49 @@
 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
@@ -76 +76 @@
 #ifdef __cplusplus
 }
-#endif 
+#endif
 
 #endif /* _AUBIO_SCALE_H */