Mercurial > hg > multitrack-audio-matcher
changeset 14:0a52258accec
tmp commit
| author | Andrew N Robertson <andrew.robertson@eecs.qmul.ac.uk> |
|---|---|
| date | Sun, 05 Feb 2012 09:58:56 +0000 |
| parents | 66783ace7506 |
| children | 780def3a1f36 |
| files | src/AudioEventMatcher.cpp src/AudioEventMatcher.h |
| diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/AudioEventMatcher.cpp Sun Feb 05 00:17:28 2012 +0000 +++ b/src/AudioEventMatcher.cpp Sun Feb 05 09:58:56 2012 +0000 @@ -20,10 +20,13 @@ bayesianStruct.realTimeMode = &usingRealTime; recentPitch = 0; currentAlignmentPosition = 0; + + onsetLikelihoodWidth = 20; followingLiveInput = true; } + void AudioEventMatcher::setWindowDimensions(){ double startHeight = recordedTracks.numberOfAudioTracks * recordedTracks.trackScreenHeight; double heightAvailable = 1 - startHeight; @@ -227,8 +230,6 @@ //start at beginning but OPTIMISE later double onsetLikelihoodToNoise = 0.3; - double likelihoodWidth = 40; - bayesianStruct.likelihood.offset = bayesianStruct.prior.offset; bayesianStruct.likelihood.zero();//set to zero @@ -243,7 +244,7 @@ for (int i = 0;i < recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets.size();i++){ double millisTime = recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets[i].millisTime; if (millisTime >= startMatchingTime && millisTime <= endMatchingTime){ - bayesianStruct.likelihood.addGaussianShapeFromRealTime(millisTime, likelihoodWidth, quantity); + bayesianStruct.likelihood.addGaussianShapeFromRealTime(millisTime, onsetLikelihoodWidth, quantity); numberOfMatchesFound++; // printf("Adding Gaussian for onset at time %f offset %f\n", millisTime, bayesianStruct.likelihood.offset);
--- a/src/AudioEventMatcher.h Sun Feb 05 00:17:28 2012 +0000 +++ b/src/AudioEventMatcher.h Sun Feb 05 09:58:56 2012 +0000 @@ -78,5 +78,8 @@ double screenStartTimeMillis, screenEndTimeMillis, screenWidthMillis; bool followingLiveInput; void setScreenDisplayTimes(); + + //params + double onsetLikelihoodWidth; }; #endif