From 68e943265edf04e63a8e8b8f62bab20f99d9c637 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 10 Sep 2008 15:03:30 +0000 Subject: merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/onset_detector.cc | 126 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 libs/ardour/onset_detector.cc (limited to 'libs/ardour/onset_detector.cc') diff --git a/libs/ardour/onset_detector.cc b/libs/ardour/onset_detector.cc new file mode 100644 index 0000000000..f58e64ad4a --- /dev/null +++ b/libs/ardour/onset_detector.cc @@ -0,0 +1,126 @@ +#include + +#include "i18n.h" + +using namespace Vamp; +using namespace ARDOUR; +using namespace std; + +/* need a static initializer function for this */ + +string OnsetDetector::_op_id = X_("libardourvampplugins:aubioonset:2"); + +OnsetDetector::OnsetDetector (float sr) + : AudioAnalyser (sr, X_("libardourvampplugins:aubioonset")) +{ + /* update the op_id */ + + _op_id = X_("libardourvampplugins:aubioonset"); + + // XXX this should load the above-named plugin and get the current version + + _op_id += ":2"; +} + +OnsetDetector::~OnsetDetector() +{ +} + +string +OnsetDetector::operational_identifier() +{ + return _op_id; +} + +int +OnsetDetector::run (const std::string& path, Readable* src, uint32_t channel, AnalysisFeatureList& results) +{ + current_results = &results; + int ret = analyse (path, src, channel); + + current_results = 0; + return ret; +} + +int +OnsetDetector::use_features (Plugin::FeatureSet& features, ostream* out) +{ + const Plugin::FeatureList& fl (features[0]); + + for (Plugin::FeatureList::const_iterator f = fl.begin(); f != fl.end(); ++f) { + + if ((*f).hasTimestamp) { + + if (out) { + (*out) << (*f).timestamp.toString() << endl; + } + + current_results->push_back (RealTime::realTime2Frame ((*f).timestamp, (nframes_t) floor(sample_rate))); + } + } + + return 0; +} + +void +OnsetDetector::set_silence_threshold (float val) +{ + if (plugin) { + plugin->setParameter ("silencethreshold", val); + } +} + +void +OnsetDetector::set_peak_threshold (float val) +{ + if (plugin) { + plugin->setParameter ("peakpickthreshold", val); + } +} + +void +OnsetDetector::set_function (int val) +{ + if (plugin) { + plugin->setParameter ("onsettype", (float) val); + } +} + +void +OnsetDetector::cleanup_onsets (AnalysisFeatureList& t, float sr, float gap_msecs) +{ + if (t.empty()) { + return; + } + + t.sort (); + + /* remove duplicates or other things that are too close */ + + AnalysisFeatureList::iterator i = t.begin(); + AnalysisFeatureList::iterator f, b; + const nframes64_t gap_frames = (nframes64_t) floor (gap_msecs * (sr / 1000.0)); + + while (i != t.end()) { + + // move front iterator to just past i, and back iterator the same place + + f = i; + ++f; + b = f; + + // move f until we find a new value that is far enough away + + while ((f != t.end()) && (((*f) - (*i)) < gap_frames)) { + ++f; + } + + i = f; + + // if f moved forward from b, we had duplicates/too-close points: get rid of them + + if (b != f) { + t.erase (b, f); + } + } +} -- cgit v1.2.3