comparison PYinVamp.cpp @ 141:72bda34e0e64 fixedlag

Merge from branch vamp-fft-revision
author Chris Cannam
date Fri, 24 Mar 2017 14:50:44 +0000
parents 83978b93aac1 d71170f5ba76
children 218bfe953159
comparison
equal deleted inserted replaced
133:83978b93aac1 141:72bda34e0e64
12 */ 12 */
13 13
14 #include "PYinVamp.h" 14 #include "PYinVamp.h"
15 #include "MonoNote.h" 15 #include "MonoNote.h"
16 #include "MonoPitchHMM.h" 16 #include "MonoPitchHMM.h"
17
18 #include "vamp-sdk/FFT.h"
19 17
20 #include <vector> 18 #include <vector>
21 #include <algorithm> 19 #include <algorithm>
22 20
23 #include <cstdio> 21 #include <cstdio>
304 { 302 {
305 return ""; // no programs 303 return ""; // no programs
306 } 304 }
307 305
308 void 306 void
309 PYinVamp::selectProgram(string name) 307 PYinVamp::selectProgram(string)
310 { 308 {
311 } 309 }
312 310
313 PYinVamp::OutputList 311 PYinVamp::OutputList
314 PYinVamp::getOutputDescriptors() const 312 PYinVamp::getOutputDescriptors() const
512 510
513 int lag = m_pitchHmm.m_fixedLag; 511 int lag = m_pitchHmm.m_fixedLag;
514 512
515 if (m_fixedLag == 1.f) // do fixed-lag smoothing instead of full Viterbi 513 if (m_fixedLag == 1.f) // do fixed-lag smoothing instead of full Viterbi
516 { 514 {
517 if (m_timestamp.size() == lag + 1) 515 if (int(m_timestamp.size()) == lag + 1)
518 { 516 {
519 m_timestamp.pop_front(); 517 m_timestamp.pop_front();
520 m_pitchProb.pop_front(); 518 m_pitchProb.pop_front();
521 519
522 Feature f; 520 Feature f;