annotate dsp/tempotracking/DownBeat.h @ 73:dcb555b90924

* Key detector: when returning key strengths, use the peak value of the three underlying chromagram correlations (from 36-bin chromagram) corresponding to each key, instead of the mean. Rationale: This is the same method as used when returning the key value, and it's nice to have the same results in both returned value and plot. The peak performed better than the sum with a simple test set of triads, so it seems reasonable to change the plot to match the key output rather than the other way around. * FFT: kiss_fftr returns only the non-conjugate bins, synthesise the rest rather than leaving them (perhaps dangerously) undefined. Fixes an uninitialised data error in chromagram that could cause garbage results from key detector. * Constant Q: remove precalculated values again, I reckon they're not proving such a good tradeoff.
author cannam
date Fri, 05 Jun 2009 15:12:39 +0000
parents 6cb2b3cd5356
children e5907ae6de17
rev   line source
cannam@54 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
cannam@54 2
cannam@54 3 /*
cannam@54 4 QM DSP Library
cannam@54 5
cannam@54 6 Centre for Digital Music, Queen Mary, University of London.
cannam@54 7 This file copyright 2008-2009 Matthew Davies and QMUL.
cannam@54 8 All rights reserved.
cannam@54 9 */
cannam@54 10
cannam@54 11 #ifndef DOWNBEAT_H
cannam@54 12 #define DOWNBEAT_H
cannam@54 13
cannam@54 14 #include <vector>
cannam@54 15
cannam@54 16 #include "dsp/rateconversion/Decimator.h"
cannam@54 17
cannam@54 18 using std::vector;
cannam@54 19
cannam@64 20 class FFTReal;
cannam@64 21
cannam@54 22 /**
cannam@54 23 * This class takes an input audio signal and a sequence of beat
cannam@54 24 * locations (calculated e.g. by TempoTrackV2) and estimates which of
cannam@54 25 * the beat locations are downbeats (first beat of the bar).
cannam@54 26 *
cannam@54 27 * The input audio signal is expected to have been downsampled to a
cannam@54 28 * very low sampling rate (e.g. 2700Hz). A utility function for
cannam@54 29 * downsampling and buffering incoming block-by-block audio is
cannam@54 30 * provided.
cannam@54 31 */
cannam@54 32 class DownBeat
cannam@54 33 {
cannam@54 34 public:
cannam@54 35 /**
cannam@54 36 * Construct a downbeat locator that will operate on audio at the
cannam@54 37 * downsampled by the given decimation factor from the given
cannam@54 38 * original sample rate, plus beats extracted from the same audio
cannam@54 39 * at the given original sample rate with the given frame
cannam@54 40 * increment.
cannam@54 41 *
cannam@54 42 * decimationFactor must be a power of two no greater than 64, and
cannam@54 43 * dfIncrement must be a multiple of decimationFactor.
cannam@54 44 */
cannam@54 45 DownBeat(float originalSampleRate,
cannam@54 46 size_t decimationFactor,
cannam@54 47 size_t dfIncrement);
cannam@54 48 ~DownBeat();
cannam@54 49
cannam@55 50 void setBeatsPerBar(int bpb);
cannam@55 51
cannam@54 52 /**
cannam@54 53 * Estimate which beats are down-beats.
cannam@54 54 *
cannam@54 55 * audio contains the input audio stream after downsampling, and
cannam@54 56 * audioLength contains the number of samples in this downsampled
cannam@54 57 * stream.
cannam@54 58 *
cannam@54 59 * beats contains a series of beat positions expressed in
cannam@54 60 * multiples of the df increment at the audio's original sample
cannam@54 61 * rate, as described to the constructor.
cannam@54 62 *
cannam@54 63 * The returned downbeat array contains a series of indices to the
cannam@54 64 * beats array.
cannam@54 65 */
cannam@55 66 void findDownBeats(const float *audio, // downsampled
cannam@54 67 size_t audioLength, // after downsampling
cannam@54 68 const vector<double> &beats,
cannam@54 69 vector<int> &downbeats);
cannam@56 70
cannam@56 71 /**
cannam@56 72 * Return the beat spectral difference function. This is
cannam@56 73 * calculated during findDownBeats, so this function can only be
cannam@56 74 * meaningfully called after that has completed. The returned
cannam@56 75 * vector contains one value for each of the beat times passed in
cannam@56 76 * to findDownBeats, less one. Each value contains the spectral
cannam@56 77 * difference between region prior to the beat's nominal position
cannam@56 78 * and the region following it.
cannam@56 79 */
cannam@56 80 void getBeatSD(vector<double> &beatsd) const;
cannam@54 81
cannam@54 82 /**
cannam@54 83 * For your downsampling convenience: call this function
cannam@54 84 * repeatedly with input audio blocks containing dfIncrement
cannam@54 85 * samples at the original sample rate, to decimate them to the
cannam@54 86 * downsampled rate and buffer them within the DownBeat class.
cannam@54 87 *
cannam@54 88 * Call getBufferedAudio() to retrieve the results after all
cannam@54 89 * blocks have been processed.
cannam@54 90 */
cannam@55 91 void pushAudioBlock(const float *audio);
cannam@54 92
cannam@54 93 /**
cannam@54 94 * Retrieve the accumulated audio produced by pushAudioBlock calls.
cannam@54 95 */
cannam@55 96 const float *getBufferedAudio(size_t &length) const;
cannam@55 97
cannam@55 98 /**
cannam@55 99 * Clear any buffered downsampled audio data.
cannam@55 100 */
cannam@55 101 void resetAudioBuffer();
cannam@54 102
cannam@54 103 private:
cannam@54 104 typedef vector<int> i_vec_t;
cannam@54 105 typedef vector<vector<int> > i_mat_t;
cannam@54 106 typedef vector<double> d_vec_t;
cannam@54 107 typedef vector<vector<double> > d_mat_t;
cannam@54 108
cannam@54 109 void makeDecimators();
cannam@54 110 double measureSpecDiff(d_vec_t oldspec, d_vec_t newspec);
cannam@54 111
cannam@55 112 int m_bpb;
cannam@54 113 float m_rate;
cannam@54 114 size_t m_factor;
cannam@54 115 size_t m_increment;
cannam@54 116 Decimator *m_decimator1;
cannam@54 117 Decimator *m_decimator2;
cannam@55 118 float *m_buffer;
cannam@55 119 float *m_decbuf;
cannam@54 120 size_t m_bufsiz;
cannam@54 121 size_t m_buffill;
cannam@54 122 size_t m_beatframesize;
cannam@54 123 double *m_beatframe;
cannam@64 124 FFTReal *m_fft;
cannam@54 125 double *m_fftRealOut;
cannam@54 126 double *m_fftImagOut;
cannam@56 127 d_vec_t m_beatsd;
cannam@54 128 };
cannam@54 129
cannam@54 130 #endif