comparison data/model/FFTModel.h @ 1576:0f62bce0f0be spectrogramparam

Further adjustments to peak picking, to try to avoid a surfeit of peaks in the higher frequencies
author Chris Cannam
date Tue, 13 Nov 2018 13:29:37 +0000
parents fad8f533ca13
children c01cbe41aeb5
comparison
equal deleted inserted replaced
1575:054bbf17ac17 1576:0f62bce0f0be
154 int m_fftSize; 154 int m_fftSize;
155 Window<float> m_windower; 155 Window<float> m_windower;
156 mutable breakfastquay::FFT m_fft; 156 mutable breakfastquay::FFT m_fft;
157 157
158 int getPeakPickWindowSize(PeakPickType type, sv_samplerate_t sampleRate, 158 int getPeakPickWindowSize(PeakPickType type, sv_samplerate_t sampleRate,
159 int bin, float &percentile) const; 159 int bin, double &dist) const;
160 160
161 std::pair<sv_frame_t, sv_frame_t> getSourceSampleRange(int column) const { 161 std::pair<sv_frame_t, sv_frame_t> getSourceSampleRange(int column) const {
162 sv_frame_t startFrame = m_windowIncrement * sv_frame_t(column); 162 sv_frame_t startFrame = m_windowIncrement * sv_frame_t(column);
163 sv_frame_t endFrame = startFrame + m_windowSize; 163 sv_frame_t endFrame = startFrame + m_windowSize;
164 // Cols are centred on the audio sample (e.g. col 0 is centred at sample 0) 164 // Cols are centred on the audio sample (e.g. col 0 is centred at sample 0)