Mercurial > hg > pyin

changeset 44:e5ccda2c06d9 tony

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed some issues (in a very slightly hacky way) -- need to revisit.
author matthiasm
date Tue, 04 Feb 2014 22:31:26 +0000
parents ae21806fe84b
children 68812db649e6
files LocalCandidatePYIN.cpp
diffstat 1 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/LocalCandidatePYIN.cpp	Thu Jan 30 18:25:28 2014 +0000
+++ b/LocalCandidatePYIN.cpp	Tue Feb 04 22:31:26 2014 +0000
@@ -339,17 +339,26 @@
     vector<float> freqSum = vector<float>(m_nCandidate);
     vector<float> freqNumber = vector<float>(m_nCandidate);
     vector<float> freqMean = vector<float>(m_nCandidate);
-
+    
     for (size_t iCandidate = 0; iCandidate < m_nCandidate; ++iCandidate)
     {
         pitchTracks.push_back(vector<float>(nFrame));
         vector<float> mpOut = mp.process(m_pitchProb[iCandidate]);
+        float prevFreq = 0;
         for (size_t iFrame = 0; iFrame < nFrame; ++iFrame)
         {
             if (mpOut[iFrame] > 0) {
+                if (prevFreq>0 && fabs(log2(mpOut[iFrame]/prevFreq)) > 0.1) {
+                    for (size_t jFrame = iFrame; jFrame != -1; --jFrame) {
+                        // hack: setting all freqs to 0 -- will be eliminated later
+                        pitchTracks[iCandidate][jFrame] = 0;
+                    }
+                    break;
+                }
                 pitchTracks[iCandidate][iFrame] = mpOut[iFrame];
                 freqSum[iCandidate] += mpOut[iFrame];
                 freqNumber[iCandidate]++;
+                prevFreq = mpOut[iFrame];
             }
         }
         freqMean[iCandidate] = freqSum[iCandidate]*1.0/freqNumber[iCandidate];