Mercurial > hg > qm-dsp

comparison dsp/keydetection/GetKeyMode.h @ 499:af5b7ef02aa7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Style fixes: avoid unsigned, fix formatting
author Chris Cannam <cannam@all-day-breakfast.com>
date Mon, 03 Jun 2019 14:20:39 +0100
parents 701233f8ed41
children 3f0a96460c33
comparison
equal deleted inserted replaced
498:8b92623e81c9 499:af5b7ef02aa7
27 virtual ~GetKeyMode(); 27 virtual ~GetKeyMode();
28 28
29 int process( double* PCMData ); 29 int process( double* PCMData );
30 30
31 double krumCorr( const double *pDataNorm, const double *pProfileNorm, 31 double krumCorr( const double *pDataNorm, const double *pProfileNorm,
32 int shiftProfile, unsigned int length ); 32 int shiftProfile, int length );
33 33
34 unsigned int getBlockSize() { return m_ChromaFrameSize*m_DecimationFactor; } 34 int getBlockSize() { return m_chromaFrameSize * m_decimationFactor; }
35 unsigned int getHopSize() { return m_ChromaHopSize*m_DecimationFactor; } 35 int getHopSize() { return m_chromaHopSize * m_decimationFactor; }
36 36
37 double* getChroma() { return m_ChrPointer; } 37 double* getChroma() { return m_chrPointer; }
38 unsigned int getChromaSize(); 38 int getChromaSize();
39 39
40 double* getMeanHPCP() { return m_MeanHPCP; } 40 double* getMeanHPCP() { return m_meanHPCP; }
41 41
42 double* getKeyStrengths(); 42 double* getKeyStrengths();
43 43
44 bool isModeMinor( int key ); 44 bool isModeMinor( int key );
45 45
46 protected: 46 protected:
47 47
48 double m_hpcpAverage; 48 double m_hpcpAverage;
49 double m_medianAverage; 49 double m_medianAverage;
50 unsigned int m_DecimationFactor; 50 int m_decimationFactor;
51 51
52 //Decimator (fixed) 52 // Decimator (fixed)
53 Decimator* m_Decimator; 53 Decimator* m_decimator;
54 54
55 //chroma configuration 55 // Chroma configuration
56 ChromaConfig m_ChromaConfig; 56 ChromaConfig m_chromaConfig;
57 57
58 //Chromagram object 58 // Chromagram object
59 Chromagram* m_Chroma; 59 Chromagram* m_chroma;
60 60
61 //Chromagram output pointer 61 // Chromagram output pointer
62 double* m_ChrPointer; 62 double* m_chrPointer;
63 63
64 //Framesize 64 // Framesize
65 unsigned int m_ChromaFrameSize; 65 int m_chromaFrameSize;
66 //Hop
67 unsigned int m_ChromaHopSize;
68 66
67 // Hop
68 int m_chromaHopSize;
69 69
70 unsigned int m_ChromaBuffersize; 70 int m_chromaBufferSize;
71 unsigned int m_MedianWinsize; 71 int m_medianWinSize;
72 72
73 unsigned int m_bufferindex; 73 int m_bufferIndex;
74 unsigned int m_ChromaBufferFilling; 74 int m_chromaBufferFilling;
75 unsigned int m_MedianBufferFilling; 75 int m_medianBufferFilling;
76
77 76
78 double* m_DecimatedBuffer; 77 double* m_decimatedBuffer;
79 double* m_ChromaBuffer; 78 double* m_chromaBuffer;
80 double* m_MeanHPCP; 79 double* m_meanHPCP;
81 80
82 double* m_MajProfileNorm; 81 double* m_majProfileNorm;
83 double* m_MinProfileNorm; 82 double* m_minProfileNorm;
84 double* m_MajCorr; 83 double* m_majCorr;
85 double* m_MinCorr; 84 double* m_minCorr;
86 int* m_MedianFilterBuffer; 85 int* m_medianFilterBuffer;
87 int* m_SortedBuffer; 86 int* m_sortedBuffer;
88 87
89 double *m_keyStrengths; 88 double *m_keyStrengths;
90 }; 89 };
91 90
92 #endif // !defined GETKEYMODE_H 91 #endif // !defined QM_DSP_GETKEYMODE_H