comparison layer/SpectrumLayer.cpp @ 977:f40ccbf228c2 3.0-integration

Merge from branch simple-fft-model
author Chris Cannam
date Fri, 26 Jun 2015 14:10:18 +0100
parents b8187c83b93a
children 64c2b3a4435a
comparison
equal deleted inserted replaced
974:6645b6b8356f 977:f40ccbf228c2
110 FFTModel *newFFT = new FFTModel(m_originModel, 110 FFTModel *newFFT = new FFTModel(m_originModel,
111 m_channel, 111 m_channel,
112 m_windowType, 112 m_windowType,
113 m_windowSize, 113 m_windowSize,
114 getWindowIncrement(), 114 getWindowIncrement(),
115 m_windowSize, 115 m_windowSize);
116 false,
117 StorageAdviser::Criteria
118 (StorageAdviser::SpeedCritical |
119 StorageAdviser::FrequentLookupLikely));
120 116
121 setSliceableModel(newFFT); 117 setSliceableModel(newFFT);
122 118
123 m_biasCurve.clear(); 119 m_biasCurve.clear();
124 for (int i = 0; i < m_windowSize; ++i) { 120 for (int i = 0; i < m_windowSize; ++i) {
125 m_biasCurve.push_back(1.f / (float(m_windowSize)/2.f)); 121 m_biasCurve.push_back(1.f / (float(m_windowSize)/2.f));
126 } 122 }
127
128 newFFT->resume();
129 123
130 m_newFFTNeeded = false; 124 m_newFFTNeeded = false;
131 } 125 }
132 126
133 Layer::PropertyList 127 Layer::PropertyList