Mercurial > hg > match-vamp
comparison src/FeatureExtractor.cpp @ 183:24ddab06aace re-minimise
Toward allowing types to be small again. Doesn't currently build
author | Chris Cannam |
---|---|
date | Thu, 19 Feb 2015 17:17:20 +0000 |
parents | d1bc89794cd4 |
children | 6c12db195986 |
comparison
equal
deleted
inserted
replaced
182:a67663dc698d | 183:24ddab06aace |
---|---|
152 m_freqMap[i++] = (int(midi + 0.5)) % 12 + 1; | 152 m_freqMap[i++] = (int(midi + 0.5)) % 12 + 1; |
153 } | 153 } |
154 } | 154 } |
155 } | 155 } |
156 | 156 |
157 vector<double> | 157 feature_t |
158 FeatureExtractor::process(const vector<double> &real, const vector<double> &imag) | 158 FeatureExtractor::process(const vector<double> &real, const vector<double> &imag) |
159 { | 159 { |
160 vector<double> mags(m_params.fftSize/2 + 1, 0.0); | 160 vector<double> mags(m_params.fftSize/2 + 1, 0.0); |
161 | 161 |
162 for (int i = 0; i <= m_params.fftSize/2; i++) { | 162 for (int i = 0; i <= m_params.fftSize/2; i++) { |
164 } | 164 } |
165 | 165 |
166 return processMags(mags); | 166 return processMags(mags); |
167 } | 167 } |
168 | 168 |
169 vector<double> | 169 feature_t |
170 FeatureExtractor::process(const float *cframe) | 170 FeatureExtractor::process(const float *cframe) |
171 { | 171 { |
172 vector<double> mags(m_params.fftSize/2 + 1, 0.0); | 172 vector<double> mags(m_params.fftSize/2 + 1, 0.0); |
173 | 173 |
174 for (int i = 0; i <= m_params.fftSize/2; i++) { | 174 for (int i = 0; i <= m_params.fftSize/2; i++) { |
176 } | 176 } |
177 | 177 |
178 return processMags(mags); | 178 return processMags(mags); |
179 } | 179 } |
180 | 180 |
181 vector<double> | 181 feature_t |
182 FeatureExtractor::processMags(const vector<double> &mags) | 182 FeatureExtractor::processMags(const vector<double> &mags) |
183 { | 183 { |
184 vector<double> frame(m_featureSize, 0.0); | 184 feature_t frame(m_featureSize, 0.0); |
185 | 185 |
186 if (!m_params.useChromaFrequencyMap && | 186 if (!m_params.useChromaFrequencyMap && |
187 (m_params.referenceFrequency != 440.)) { | 187 (m_params.referenceFrequency != 440.)) { |
188 | 188 |
189 // See comment in makeStandardFrequencyMap above | 189 // See comment in makeStandardFrequencyMap above |