Mercurial > hg > pyin
comparison LocalCandidatePYIN.cpp @ 138:d71170f5ba76 vamp-fft-revision
Fix some compiler warnings
author | Chris Cannam |
---|---|
date | Fri, 19 Aug 2016 13:26:55 +0100 |
parents | 7cbf40306c10 |
children | 72bda34e0e64 |
comparison
equal
deleted
inserted
replaced
137:109c3a2ad930 | 138:d71170f5ba76 |
---|---|
226 { | 226 { |
227 return ""; // no programs | 227 return ""; // no programs |
228 } | 228 } |
229 | 229 |
230 void | 230 void |
231 LocalCandidatePYIN::selectProgram(string name) | 231 LocalCandidatePYIN::selectProgram(string) |
232 { | 232 { |
233 } | 233 } |
234 | 234 |
235 LocalCandidatePYIN::OutputList | 235 LocalCandidatePYIN::OutputList |
236 LocalCandidatePYIN::getOutputDescriptors() const | 236 LocalCandidatePYIN::getOutputDescriptors() const |
385 tempPitchProb[iFrame][iProb].second /= sumProb; | 385 tempPitchProb[iFrame][iProb].second /= sumProb; |
386 } | 386 } |
387 } | 387 } |
388 | 388 |
389 vector<float> mpOut = mp.process(tempPitchProb); | 389 vector<float> mpOut = mp.process(tempPitchProb); |
390 float prevFreq = 0; | |
391 for (size_t iFrame = 0; iFrame < nFrame; ++iFrame) | 390 for (size_t iFrame = 0; iFrame < nFrame; ++iFrame) |
392 { | 391 { |
393 if (mpOut[iFrame] > 0) { | 392 if (mpOut[iFrame] > 0) { |
394 | 393 |
395 pitchTracks[iCandidate][iFrame] = mpOut[iFrame]; | 394 pitchTracks[iCandidate][iFrame] = mpOut[iFrame]; |
396 freqSum[iCandidate] += mpOut[iFrame]; | 395 freqSum[iCandidate] += mpOut[iFrame]; |
397 freqNumber[iCandidate]++; | 396 freqNumber[iCandidate]++; |
398 prevFreq = mpOut[iFrame]; | |
399 | |
400 } | 397 } |
401 } | 398 } |
402 freqMean[iCandidate] = freqSum[iCandidate]*1.0/freqNumber[iCandidate]; | 399 freqMean[iCandidate] = freqSum[iCandidate]*1.0/freqNumber[iCandidate]; |
403 } | 400 } |
404 | 401 |