Mercurial > hg > beatroot-vamp
comparison BeatRootProcessor.h @ 5:2150607d4726
minor fixes
author | Chris Cannam |
---|---|
date | Mon, 19 Sep 2011 15:58:12 +0100 |
parents | c06cf6f7cb04 |
children | 02d388f98c23 |
comparison
equal
deleted
inserted
replaced
4:c06cf6f7cb04 | 5:2150607d4726 |
---|---|
282 // vector<Integer> peaks = Peaks.findPeaks(slope, (int)lrint(0.06 / hop), 10); | 282 // vector<Integer> peaks = Peaks.findPeaks(slope, (int)lrint(0.06 / hop), 10); |
283 | 283 |
284 double hop = hopTime; | 284 double hop = hopTime; |
285 Peaks::normalise(spectralFlux); | 285 Peaks::normalise(spectralFlux); |
286 vector<int> peaks = Peaks::findPeaks(spectralFlux, (int)lrint(0.06 / hop), 0.35, 0.84, true); | 286 vector<int> peaks = Peaks::findPeaks(spectralFlux, (int)lrint(0.06 / hop), 0.35, 0.84, true); |
287 onsets = new double[peaks.size()]; | 287 onsets.clear(); |
288 double[] y2 = new double[onsets.length]; | 288 onsets.resize(peaks.size(), 0); |
289 vector<int>::iterator it = peaks.begin(); | 289 vector<int>::iterator it = peaks.begin(); |
290 onsetList = new EventList(); | 290 onsetList = new EventList(); |
291 double minSalience = Peaks.min(spectralFlux); | 291 double minSalience = Peaks.min(spectralFlux); |
292 for (int i = 0; i < onsets.length; i++) { | 292 for (int i = 0; i < onsets.length; i++) { |
293 int index = *it; | 293 int index = *it; |
294 ++it; | 294 ++it; |
295 onsets[i] = index * hop; | 295 onsets[i] = index * hop; |
296 y2[i] = spectralFlux[index]; | |
297 Event e = BeatTrackDisplay.newBeat(onsets[i], 0); | 296 Event e = BeatTrackDisplay.newBeat(onsets[i], 0); |
298 // if (debug) | 297 // if (debug) |
299 // System.err.printf("Onset: %8.3f %8.3f %8.3f\n", | 298 // System.err.printf("Onset: %8.3f %8.3f %8.3f\n", |
300 // onsets[i], energy[index], slope[index]); | 299 // onsets[i], energy[index], slope[index]); |
301 // e.salience = slope[index]; // or combination of energy + slope?? | 300 // e.salience = slope[index]; // or combination of energy + slope?? |