annotate base/Pitch.h @ 298:255e431ae3d4

* 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 Chris Cannam <c.cannam@qmul.ac.uk>
date Fri, 05 Jun 2009 15:12:39 +0000
parents 49844bc8a895
children e5907ae6de17
rev   line source
c@225 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
c@225 2
c@225 3 /*
c@225 4 QM DSP library
c@225 5 Centre for Digital Music, Queen Mary, University of London.
c@225 6 This file Copyright 2006 Chris Cannam.
c@225 7 All rights reserved.
c@225 8 */
c@225 9
c@225 10 #ifndef _PITCH_H_
c@225 11 #define _PITCH_H_
c@225 12
c@225 13 class Pitch
c@225 14 {
c@225 15 public:
c@225 16 static float getFrequencyForPitch(int midiPitch,
c@225 17 float centsOffset = 0,
c@225 18 float concertA = 440.0);
c@225 19
c@225 20 static int getPitchForFrequency(float frequency,
c@225 21 float *centsOffsetReturn = 0,
c@225 22 float concertA = 440.0);
c@225 23 };
c@225 24
c@225 25
c@225 26 #endif