Changeset c59e693
- Timestamp:
- Sep 5, 2015, 12:40:07 PM (9 years ago)
- 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. - Location:
- src
- Files:
-
- 3 edited
-
tempo/beattracking.c (modified) (4 diffs)
-
tempo/beattracking.h (modified) (5 diffs)
-
utils/scale.h (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
src/tempo/beattracking.c
r0969113 rc59e693 136 136 uint_t numelem = 4; 137 137 138 smpl_t phase; // beat alignment (step - lastbeat) 139 smpl_t beat; // beat position 138 smpl_t phase; // beat alignment (step - lastbeat) 139 smpl_t beat; // beat position 140 140 smpl_t bp; // beat period 141 141 uint_t a, b; // used to build shift invariant comb filterbank … … 227 227 beat = bp - phase; 228 228 229 // AUBIO_DBG ("bp: %f, phase: %f, lastbeat: %f, step: %d, winlen: %d\n", 229 // AUBIO_DBG ("bp: %f, phase: %f, lastbeat: %f, step: %d, winlen: %d\n", 230 230 // bp, phase, bt->lastbeat, step, winlen); 231 231 … … 319 319 } 320 320 321 //now look for step change - i.e. a difference between gp and rp that 321 //now look for step change - i.e. a difference between gp and rp that 322 322 // is greater than 2*constthresh - always true in first case, since gp = 0 323 323 if (counter == 0) { … … 342 342 } 343 343 } else if (counter > 0) { 344 //if counter doesn't = 1, 344 //if counter doesn't = 1, 345 345 counter = counter - 1; 346 346 } -
src/tempo/beattracking.h
r0969113 rc59e693 1 1 /* 2 Copyright (C) 2003-201 3Matthew Davies and Paul Brossier <piem@aubio.org>2 Copyright (C) 2003-2015 Matthew Davies and Paul Brossier <piem@aubio.org> 3 3 4 4 This file is part of aubio. … … 35 35 36 36 \example tempo/test-beattracking.c 37 37 38 38 */ 39 39 #ifndef _AUBIO_BEATTRACKING_H … … 50 50 51 51 \param winlen length of the onset detection window 52 \param hop_size number of onset detection samples [512] 52 \param hop_size number of onset detection samples [512] 53 53 \param samplerate samplerate of the input signal 54 54 … … 57 57 uint_t samplerate); 58 58 59 /** track the beat 59 /** track the beat 60 60 61 61 \param bt beat tracking object 62 62 \param dfframes current input detection function frame, smoothed by 63 adaptive median threshold. 64 \param out stored detected beat locations 63 adaptive median threshold. 64 \param out stored detected beat locations 65 65 66 66 */ … … 78 78 smpl_t aubio_beattracking_get_bpm(aubio_beattracking_t * bt); 79 79 80 /** get current tempo confidence 80 /** get current tempo confidence 81 81 82 82 \param bt beat tracking object -
src/utils/scale.h
r0969113 rc59e693 21 21 /** \file 22 22 23 Vector scaling function 24 23 Vector scaling function 24 25 25 This object, inspired from the scale object in FTS, the jMax engine, scales 26 26 the values of a vector according to an affine function defined as follow: 27 28 \f$ y = (x - ilow)*(ohig-olow)/(ihig-ilow) + olow \f$ 29 27 28 \f$ y = (x - ilow)*(ohig-olow)/(ihig-ilow) + olow \f$ 29 30 30 */ 31 31 #ifndef _AUBIO_SCALE_H … … 40 40 41 41 /** create a scale object 42 42 43 43 \param flow lower value of output function 44 44 \param fhig higher value of output function … … 49 49 aubio_scale_t * new_aubio_scale(smpl_t flow, smpl_t fhig, 50 50 smpl_t ilow, smpl_t ihig); 51 /** delete a scale object 51 /** delete a scale object 52 52 53 53 \param s scale object as returned by new_aubio_scale … … 76 76 #ifdef __cplusplus 77 77 } 78 #endif 78 #endif 79 79 80 80 #endif /* _AUBIO_SCALE_H */
Note: See TracChangeset
for help on using the changeset viewer.
