annotate dsp/signalconditioning/Framer.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
c@225 6 Centre for Digital Music, Queen Mary, University of London.
c@225 7 This file copyright 2005-2006 Christian Landone.
c@225 8 All rights reserved.
c@225 9 */
c@225 10
c@225 11 #ifndef FRAMER_H
c@225 12 #define FRAMER_H
c@225 13
c@225 14 //#include <io.h>
c@225 15 #include <fcntl.h>
c@225 16 #include <stdio.h>
c@225 17
c@225 18
c@225 19 class Framer
c@225 20 {
c@225 21 public:
c@225 22 void setSource( double* src, unsigned int length );
c@225 23 unsigned int getMaxNoFrames();
c@225 24 void getFrame( double* dst );
c@225 25 void configure( unsigned int frameLength, unsigned int hop );
c@225 26 Framer();
c@225 27 virtual ~Framer();
c@225 28
c@225 29 void resetCounters();
c@225 30
c@225 31 private:
c@225 32
c@225 33 unsigned long m_ulSampleLen; // DataLength (samples)
c@225 34 unsigned int m_framesRead; // Read Frames Index
c@225 35
c@225 36 double* m_srcBuffer;
c@225 37 double* m_dataFrame; // Analysis Frame Buffer
c@225 38 double* m_strideFrame; // Stride Frame Buffer
c@225 39 unsigned int m_frameLength; // Analysis Frame Length
c@225 40 unsigned int m_stepSize; // Analysis Frame Stride
c@225 41
c@225 42 unsigned int m_maxFrames;
c@225 43
c@225 44 unsigned long m_ulSrcIndex;
c@225 45 };
c@225 46
c@225 47 #endif