*/
+#include <math.h>
#include "Notes.h"
using std::string;
m_pv(0),
m_peakpick(0),
m_onsetdet(0),
- m_onsettype(aubio_onset_mkl),
+ m_onsettype(aubio_onset_complex),
m_pitchdet(0),
- m_pitchtype(aubio_pitch_fcomb),
+ m_pitchtype(aubio_pitch_yinfft),
m_pitchmode(aubio_pitchm_freq),
m_threshold(0.3),
m_silence(-90),
size_t
Notes::getPreferredStepSize() const
{
- if (m_onsettype == aubio_onset_energy ||
- m_onsettype == aubio_onset_hfc) {
- return 512;
- } else {
- return 128;
- }
+ return 512;
}
size_t
Notes::getPreferredBlockSize() const
{
- return getPreferredStepSize();
+ return 4*getPreferredStepSize();
}
Notes::ParameterList
desc.description = "Onset Detection Function Type";
desc.minValue = 0;
desc.maxValue = 6;
- desc.defaultValue = (int)aubio_onset_mkl;
+ desc.defaultValue = (int)aubio_onset_complex;
desc.isQuantized = true;
desc.quantizeStep = 1;
desc.valueNames.push_back("Energy Based");
desc.description = "Pitch Detection Function Type";
desc.minValue = 0;
desc.maxValue = 4;
- desc.defaultValue = (int)aubio_pitch_fcomb;
+ desc.defaultValue = (int)aubio_pitch_yinfft;
desc.isQuantized = true;
desc.quantizeStep = 1;
desc.valueNames.push_back("YIN Frequency Estimator");
*/
+#include <math.h>
#include "Onset.h"
using std::string;
m_pv(0),
m_peakpick(0),
m_onsetdet(0),
- m_onsettype(aubio_onset_mkl),
+ m_onsettype(aubio_onset_complex),
m_threshold(0.3),
m_silence(-90),
m_channelCount(1)
m_stepSize = stepSize;
m_blockSize = blockSize;
- size_t processingBlockSize;
- if (m_onsettype == aubio_onset_energy ||
- m_onsettype == aubio_onset_hfc) {
- processingBlockSize = stepSize * 2;
- } else {
- processingBlockSize = stepSize * 4;
- }
-
m_ibuf = new_fvec(stepSize, channels);
m_onset = new_fvec(1, channels);
- m_fftgrain = new_cvec(processingBlockSize, channels);
- m_pv = new_aubio_pvoc(processingBlockSize, stepSize, channels);
+ m_fftgrain = new_cvec(blockSize, channels);
+ m_pv = new_aubio_pvoc(blockSize, stepSize, channels);
m_peakpick = new_aubio_peakpicker(m_threshold);
- m_onsetdet = new_aubio_onsetdetection(m_onsettype, processingBlockSize, channels);
+ m_onsetdet = new_aubio_onsetdetection(m_onsettype, blockSize, channels);
return true;
}
size_t
Onset::getPreferredStepSize() const
{
- if (m_onsettype == aubio_onset_energy ||
- m_onsettype == aubio_onset_hfc) {
- return 512;
- } else {
- return 128;
- }
+ return 512;
}
size_t
Onset::getPreferredBlockSize() const
{
- return getPreferredStepSize();
+ return 2*getPreferredStepSize();
}
Onset::ParameterList
desc.description = "Onset Detection Function Type";
desc.minValue = 0;
desc.maxValue = 6;
- desc.defaultValue = (int)aubio_onset_mkl;
+ desc.defaultValue = (int)aubio_onset_complex;
desc.isQuantized = true;
desc.quantizeStep = 1;
desc.valueNames.push_back("Energy Based");
FeatureSet returnFeatures;
if (isonset) {
- returnFeatures[0].push_back(Feature());
+ Feature onsettime;
+ onsettime.hasTimestamp = false;
+ returnFeatures[0].push_back(onsettime);
}
Feature feature;
for (size_t j = 0; j < m_channelCount; ++j) {
*/
+#include <math.h>
#include "Pitch.h"
using std::string;
Plugin(inputSampleRate),
m_ibuf(0),
m_pitchdet(0),
- m_pitchtype(aubio_pitch_fcomb),
+ m_pitchtype(aubio_pitch_yinfft),
m_pitchmode(aubio_pitchm_freq)
{
}
m_ibuf = new_fvec(stepSize, channels);
- m_pitchdet = new_aubio_pitchdetection(blockSize * 4,
+ m_pitchdet = new_aubio_pitchdetection(blockSize,
stepSize,
channels,
lrintf(m_inputSampleRate),
size_t
Pitch::getPreferredBlockSize() const
{
- return 1024;
+ return 2048;
}
Pitch::ParameterList
desc.description = "Pitch Detection Function Type";
desc.minValue = 0;
desc.maxValue = 4;
- desc.defaultValue = (int)aubio_pitch_fcomb;
+ desc.defaultValue = (int)aubio_pitch_yinfft;
desc.isQuantized = true;
desc.quantizeStep = 1;
desc.valueNames.push_back("YIN Frequency Estimator");