Mercurial > hg > match-vamp
comparison test/TestFeatureExtractor.cpp @ 216:ccdadbdd80df
Default the fft size in feature extractor params -- in practice we never vary it
author | Chris Cannam |
---|---|
date | Thu, 05 Mar 2015 11:18:05 +0000 |
parents | fa005e5e0953 |
children |
comparison
equal
deleted
inserted
replaced
215:0df914e353e1 | 216:ccdadbdd80df |
---|---|
62 int sz = szs[isz]; | 62 int sz = szs[isz]; |
63 | 63 |
64 int hs = sz / 2 + 1; | 64 int hs = sz / 2 + 1; |
65 int fsz = 13; | 65 int fsz = 13; |
66 | 66 |
67 FeatureExtractor::Parameters params(float(rate), sz); | 67 FeatureExtractor::Parameters params { float(rate) }; |
68 params.fftSize = sz; | |
68 params.useChromaFrequencyMap = true; | 69 params.useChromaFrequencyMap = true; |
69 params.minFrequency = 0; | 70 params.minFrequency = 0; |
70 FeatureExtractor fe(params); | 71 FeatureExtractor fe(params); |
71 BOOST_CHECK_EQUAL(fe.getFeatureSize(), fsz); | 72 BOOST_CHECK_EQUAL(fe.getFeatureSize(), fsz); |
72 | 73 |
140 int rate = 44100; | 141 int rate = 44100; |
141 int sz = 2048; | 142 int sz = 2048; |
142 int hs = sz / 2 + 1; | 143 int hs = sz / 2 + 1; |
143 int fsz = 84; | 144 int fsz = 84; |
144 | 145 |
145 FeatureExtractor::Parameters params(float(rate), sz); | 146 FeatureExtractor::Parameters params { float(rate) }; |
147 params.fftSize = sz; | |
146 params.minFrequency = 0; | 148 params.minFrequency = 0; |
147 FeatureExtractor fe(params); | 149 FeatureExtractor fe(params); |
148 BOOST_CHECK_EQUAL(fe.getFeatureSize(), fsz); | 150 BOOST_CHECK_EQUAL(fe.getFeatureSize(), fsz); |
149 | 151 |
150 for (int bin = 0; bin < hs; ++bin) { | 152 for (int bin = 0; bin < hs; ++bin) { |