Mercurial > hg > qm-dsp
diff dsp/tempotracking/TempoTrackV2.h @ 278:833ca65b0820
* Update with fixes from Matthew's newer code
| author | Chris Cannam <c.cannam@qmul.ac.uk> |
|---|---|
| date | Mon, 09 Feb 2009 16:05:32 +0000 |
| parents | 09bceb0aeff6 |
| children | 5bec06ecc88a |
line wrap: on
line diff
--- a/dsp/tempotracking/TempoTrackV2.h Tue Jan 20 15:01:01 2009 +0000 +++ b/dsp/tempotracking/TempoTrackV2.h Mon Feb 09 16:05:32 2009 +0000 @@ -23,7 +23,8 @@ ~TempoTrackV2(); void calculateBeatPeriod(const vector<double> &df, - vector<double> &beatPeriod); + vector<double> &beatPeriod, + vector<double> &tempi); void calculateBeats(const vector<double> &df, const vector<double> &beatPeriod, @@ -39,7 +40,8 @@ double mean_array(const d_vec_t &dfin, int start, int end); void filter_df(d_vec_t &df); void get_rcf(const d_vec_t &dfframe, const d_vec_t &wv, d_vec_t &rcf); - void viterbi_decode(const d_mat_t &rcfmat, const d_vec_t &wv, d_vec_t &bp); + void viterbi_decode(const d_mat_t &rcfmat, const d_vec_t &wv, + d_vec_t &bp, d_vec_t &tempi); double get_max_val(const d_vec_t &df); int get_max_ind(const d_vec_t &df); void normalise_vec(d_vec_t &df);