comparison LocalCandidatePYIN.cpp @ 132:926c292fa3ff fixedlag

fixed lag smoothing for pitch track working

     License, or (at your option) any later version.  See the file
     COLocalCandidatePYING included with this distribution for more information.
 */
 
 #include "LocalCandidatePYIN.h"
-#include "MonoPitch.h"
+#include "MonoPitchHMM.h"
 #include "YinUtil.h"
 
 #include "vamp-sdk/FFT.h"
 
 #include <vector>

     if (m_pitchProb.empty()) {
         return FeatureSet();
     }
 
     // MONO-PITCH STUFF
-    MonoPitch mp;
+    MonoPitchHMM hmm(0);
     size_t nFrame = m_timestamp.size();
     vector<vector<float> > pitchTracks;
     vector<float> freqSum = vector<float>(m_nCandidate);
     vector<float> freqNumber = vector<float>(m_nCandidate);
     vector<float> freqMean = vector<float>(m_nCandidate);

     
     // Viterbi-decode multiple times with different frequencies emphasised
     for (size_t iCandidate = 0; iCandidate < m_nCandidate; ++iCandidate)
     {
         pitchTracks.push_back(vector<float>(nFrame));
-        vector<vector<pair<double,double> > > tempPitchProb;
+        vector<pair<double,double> > tempPitchProb;
+        vector<vector<double> > tempObsProb;
         float centrePitch = 45 + 3 * iCandidate;
 
         for (size_t iFrame = 0; iFrame < nFrame; ++iFrame) {
-            tempPitchProb.push_back(vector<pair<double,double> >());
             float sumProb = 0;
             float pitch = 0;
             float prob = 0;
             for (size_t iProb = 0; iProb < m_pitchProb[iFrame].size(); ++iProb)
             {
                 pitch = m_pitchProb[iFrame][iProb].first;                
                 prob  = m_pitchProb[iFrame][iProb].second * 
                     boost::math::pdf(normalDist, pitch-centrePitch) /
                     maxNormalDist * 2;
                 sumProb += prob;
-                tempPitchProb[iFrame].push_back(
+                tempPitchProb.push_back(
                     pair<double,double>(pitch,prob));
             }
             for (size_t iProb = 0; iProb < m_pitchProb[iFrame].size(); ++iProb)
             {
-                tempPitchProb[iFrame][iProb].second /= sumProb;
-            }
-        }
-
-        vector<float> mpOut = mp.process(tempPitchProb);
+                tempPitchProb[iProb].second /= sumProb;
+            }
+            tempObsProb.push_back(hmm.calculateObsProb(tempPitchProb));
+        }
+
+        vector<int> rawPitchPath = hmm.decodeViterbi(tempObsProb);
+        vector<float> mpOut;
+
+        for (size_t iFrame = 0; iFrame < rawPitchPath.size(); ++iFrame)
+        {
+            float freq = hmm.nearestFreq(rawPitchPath[iFrame], 
+                                                m_pitchProb[iFrame]);
+            mpOut.push_back(freq); // for note processing below
+        }
+
         float prevFreq = 0;
         for (size_t iFrame = 0; iFrame < nFrame; ++iFrame)
         {
             if (mpOut[iFrame] > 0) {