comparison PYIN.cpp @ 94:2687ba2cafae

some cleaning up
author matthiasm
date Wed, 07 Jan 2015 17:05:07 +0000
parents 854d9403c5be
children ca0ea8c9c712
comparison
equal deleted inserted replaced
93:b24668a40770 94:2687ba2cafae
474 std::vector<float> notePitchTrack; // collects pitches for one note at a time 474 std::vector<float> notePitchTrack; // collects pitches for one note at a time
475 for (size_t iFrame = 0; iFrame < nFrame; ++iFrame) 475 for (size_t iFrame = 0; iFrame < nFrame; ++iFrame)
476 { 476 {
477 isVoiced = mnOut[iFrame].noteState < 3 477 isVoiced = mnOut[iFrame].noteState < 3
478 && smoothedPitch[iFrame].size() > 0 478 && smoothedPitch[iFrame].size() > 0
479 && (iFrame == nFrame-1 479 && (iFrame >= nFrame-2
480 || ((m_level[iFrame+1]/m_level[iFrame]) < 1.25)); 480 || ((m_level[iFrame]/m_level[iFrame+2]) > 0.8));
481 // std::cerr << m_level[iFrame]/m_level[iFrame-1] << std::endl; 481 // std::cerr << m_level[iFrame]/m_level[iFrame-1] << std::endl;
482 if (isVoiced && iFrame != nFrame-1) 482 if (isVoiced && iFrame != nFrame-1)
483 { 483 {
484 if (oldIsVoiced == 0) // beginning of a note 484 if (oldIsVoiced == 0) // beginning of a note
485 { 485 {