smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

update OnsetDetector for updated QM-DSP

Browse source
This commit is contained in:
Robin Gareus 2016-10-06 00:21:00 +02:00
parent f68d2e06bc
commit 72060df884
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
libs/vamp-plugins/OnsetDetect.cpp
View file

@ -354,7 +354,7 @@ OnsetDetector::process(const float *const *inputBuffers,
return FeatureSet(); return FeatureSet();
} }
size_t len = m_d->dfConfig.frameLength / 2; size_t len = m_d->dfConfig.frameLength / 2 + 1;
// float mean = 0.f; // float mean = 0.f;
// for (size_t i = 0; i < len; ++i) { // for (size_t i = 0; i < len; ++i) {
@ -366,25 +366,22 @@ OnsetDetector::process(const float *const *inputBuffers,
// std::cerr << "OnsetDetector::process(" << timestamp << "): " // std::cerr << "OnsetDetector::process(" << timestamp << "): "
// << "dftype " << m_dfType << ", sens " << m_sensitivity // << "dftype " << m_dfType << ", sens " << m_sensitivity
// << ", len " << len << std::endl; // << ", len " << len << ", mean " << mean << std::endl;
double *magnitudes = new double[len]; double *reals = new double[len];
double *phases = new double[len]; double *imags = new double[len];
// We only support a single input channel // We only support a single input channel
for (size_t i = 0; i < len; ++i) { for (size_t i = 0; i < len; ++i) {
reals[i] = inputBuffers[0][i*2];
magnitudes[i] = sqrt(inputBuffers[0][i*2 ] * inputBuffers[0][i*2 ] + imags[i] = inputBuffers[0][i*2+1];
inputBuffers[0][i*2+1] * inputBuffers[0][i*2+1]);
phases[i] = atan2(-inputBuffers[0][i*2+1], inputBuffers[0][i*2]);
} }
double output = m_d->df->process(magnitudes, phases); double output = m_d->df->processFrequencyDomain(reals, imags);
delete[] magnitudes; delete[] reals;
delete[] phases; delete[] imags;
if (m_d->dfOutput.empty()) m_d->origin = timestamp; if (m_d->dfOutput.empty()) m_d->origin = timestamp;