comparison vamp/CQVamp.cpp @ 56:e2b7f7462618

Single Makefile, build Vamp by default
author Chris Cannam <c.cannam@qmul.ac.uk>
date Thu, 30 Jan 2014 10:33:38 +0000
parents 2a21b4506d7f
children daf7c92058da
comparison
equal deleted inserted replaced
55:2a21b4506d7f 56:e2b7f7462618
1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
2 2
3 #include "CQVamp.h" 3 #include "CQVamp.h"
4 4
5 #include "../cpp-qm-dsp/ConstantQ.h" 5 #include "cpp-qm-dsp/ConstantQ.h"
6 6
7 #include "qm-dsp/base/Pitch.h" 7 #include "base/Pitch.h"
8 8
9 using std::string; 9 using std::string;
10 using std::vector; 10 using std::vector;
11 using std::cerr; 11 using std::cerr;
12 using std::endl; 12 using std::endl;
316 (m_columnCount * m_cq->getColumnHop() - m_cq->getLatency(), 316 (m_columnCount * m_cq->getColumnHop() - m_cq->getLatency(),
317 m_inputSampleRate); 317 m_inputSampleRate);
318 feature.values = column; 318 feature.values = column;
319 feature.label = ""; 319 feature.label = "";
320 320
321 // cerr << "timestamp = " << feature.timestamp << " (latency = " << m_cq->getLatency() << ", sample rate " << m_inputSampleRate << ")" << endl; 321 // cerr << "timestamp = " << feature.timestamp << " (start time = " << m_startTime << ", column count = " << m_columnCount << ", latency = " << m_cq->getLatency() << ", sample rate " << m_inputSampleRate << ")" << endl;
322 322
323 if (feature.timestamp >= m_startTime) { 323 if (feature.timestamp >= m_startTime) {
324 returnFeatures[0].push_back(feature); 324 returnFeatures[0].push_back(feature);
325 } 325 }
326 326