*/
+#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),
- m_median(6)
+ m_median(6),
+ m_minpitch(27),
+ m_maxpitch(95),
+ m_wrapRange(false),
+ m_avoidLeaps(false),
+ m_prevPitch(-1)
{
}
m_pitchmode);
m_count = 0;
+ m_delay = Vamp::RealTime::frame2RealTime((4 + m_median) * m_stepSize,
+ lrintf(m_inputSampleRate));
m_currentOnset = Vamp::RealTime::zeroTime;
m_haveCurrent = false;
+ m_prevPitch = -1;
return true;
}
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");
list.push_back(desc);
desc = ParameterDescriptor();
+ desc.name = "minpitch";
+ desc.description = "Minimum Pitch";
+ desc.minValue = 0;
+ desc.maxValue = 127;
+ desc.defaultValue = 32;
+ desc.unit = "MIDI units";
+ desc.isQuantized = true;
+ desc.quantizeStep = 1;
+ list.push_back(desc);
+
+ desc = ParameterDescriptor();
+ desc.name = "maxpitch";
+ desc.description = "Maximum Pitch";
+ desc.minValue = 0;
+ desc.maxValue = 127;
+ desc.defaultValue = 95;
+ desc.unit = "MIDI units";
+ desc.isQuantized = true;
+ desc.quantizeStep = 1;
+ list.push_back(desc);
+
+ desc = ParameterDescriptor();
+ desc.name = "wraprange";
+ desc.description = "Fold Higher or Lower Notes into Range";
+ desc.minValue = 0;
+ desc.maxValue = 1;
+ desc.defaultValue = 0;
+ desc.isQuantized = true;
+ desc.quantizeStep = 1;
+ list.push_back(desc);
+
+ desc = ParameterDescriptor();
+ desc.name = "avoidleaps";
+ desc.description = "Avoid Multi-Octave Jumps";
+ desc.minValue = 0;
+ desc.maxValue = 1;
+ desc.defaultValue = 0;
+ desc.isQuantized = true;
+ desc.quantizeStep = 1;
+ list.push_back(desc);
+
+ desc = ParameterDescriptor();
desc.name = "peakpickthreshold";
desc.description = "Peak Picker Threshold";
desc.minValue = 0;
return m_threshold;
} else if (param == "silencethreshold") {
return m_silence;
+ } else if (param == "minpitch") {
+ return m_minpitch;
+ } else if (param == "maxpitch") {
+ return m_maxpitch;
+ } else if (param == "wraprange") {
+ return m_wrapRange ? 1.0 : 0.0;
+ } else if (param == "avoidleaps") {
+ return m_avoidLeaps ? 1.0 : 0.0;
} else {
return 0.0;
}
m_threshold = value;
} else if (param == "silencethreshold") {
m_silence = value;
+ } else if (param == "minpitch") {
+ m_minpitch = lrintf(value);
+ } else if (param == "maxpitch") {
+ m_maxpitch = lrintf(value);
+ } else if (param == "wraprange") {
+ m_wrapRange = (value > 0.5);
+ } else if (param == "avoidleaps") {
+ m_avoidLeaps = (value > 0.5);
}
}
float median = toSort[toSort.size()/2];
if (median < 45.0) return;
+ float freq = median;
+ int midiPitch = (int)FLOOR(aubio_freqtomidi(freq) + 0.5);
+
+ if (m_avoidLeaps) {
+ if (m_prevPitch >= 0) {
+ while (midiPitch < m_prevPitch - 12) {
+ midiPitch += 12;
+ freq *= 2;
+ }
+ while (midiPitch > m_prevPitch + 12) {
+ midiPitch -= 12;
+ freq /= 2;
+ }
+ }
+ }
+
+ while (midiPitch < m_minpitch) {
+ if (!m_wrapRange) return;
+ midiPitch += 12;
+ freq *= 2;
+ }
+
+ while (midiPitch > m_maxpitch) {
+ if (!m_wrapRange) return;
+ midiPitch -= 12;
+ freq /= 2;
+ }
+
+ m_prevPitch = midiPitch;
+
Feature feature;
feature.hasTimestamp = true;
- feature.timestamp = m_currentOnset;
- feature.values.push_back(median);
-// feature.values.push_back(FLOOR(aubio_freqtomidi(median) + 0.5));
+ if (m_currentOnset < m_delay) m_currentOnset = m_delay;
+ feature.timestamp = m_currentOnset - m_delay;
+ feature.values.push_back(freq);
feature.values.push_back
(Vamp::RealTime::realTime2Frame(offTime, lrintf(m_inputSampleRate)) -
Vamp::RealTime::realTime2Frame(m_currentOnset, lrintf(m_inputSampleRate)));