comparison src/Silvet.cpp @ 185:78212f764251 noteagent

Merge from default branch
author Chris Cannam
date Wed, 28 May 2014 14:56:01 +0100
parents 9b9cdfccbd14 59e3cca75b8d
children 9d70d687e4eb
comparison
equal deleted inserted replaced
184:9b9cdfccbd14 185:78212f764251
497 497
498 present[i] = true; 498 present[i] = true;
499 499
500 EM em(&pack, m_hqMode); 500 EM em(&pack, m_hqMode);
501 501
502 em.setPitchSparsity(pack.pitchSparsity);
503
502 for (int j = 0; j < iterations; ++j) { 504 for (int j = 0; j < iterations; ++j) {
503 em.iterate(filtered.at(i).data()); 505 em.iterate(filtered.at(i).data());
504 } 506 }
505 507
506 const float *pitchDist = em.getPitchDistribution(); 508 const float *pitchDist = em.getPitchDistribution();
646 for (int j = 0; j < pack.templateNoteCount; ++j) { 648 for (int j = 0; j < pack.templateNoteCount; ++j) {
647 m_postFilter[j]->push(pitches[j]); 649 m_postFilter[j]->push(pitches[j]);
648 filtered.push_back(m_postFilter[j]->get()); 650 filtered.push_back(m_postFilter[j]->get());
649 } 651 }
650 652
651 double threshold = 1; 653 double threshold = 1; //!!! pack.levelThreshold
652 654
653 double columnDuration = 1.0 / m_colsPerSec; 655 double columnDuration = 1.0 / m_colsPerSec;
654 int postFilterLatency = int(m_postFilter[0]->getSize() / 2); 656 int postFilterLatency = int(m_postFilter[0]->getSize() / 2);
655 RealTime t = RealTime::fromSeconds 657 RealTime t = RealTime::fromSeconds
656 (columnDuration * (m_columnCountOut - postFilterLatency) + 0.02); 658 (columnDuration * (m_columnCountOut - postFilterLatency) + 0.02);