comparison src/AudioEventMatcher.cpp @ 56:4394c9490716 tip

minor changes

 
 
 const int matchWindowWidth = 8000;//ms in which to match
 
 const float pitchCutOff = 16;//within which pitches are even considered
+const double pitchWidth = 12;
 
 bool printInfo = false;
 
 AudioEventMatcher::AudioEventMatcher(){
 
 	ofBackground(0);
 	useChromaDotProduct = false;//false for most tests
-	
 	printingData = false;
+	updateTempoMethodOn = false;
 	
 	pitchLikelihoodToNoise = 0.6;//more noise
+	pitchLikelihoodWidth = 30;
+	
 	chromaLikelihoodToNoise = 0.5;//lower => more noise, higher more weight for events
 	chromaLikelihoodWidth = 50;//ms round onset event
 	
-	onsetLikelihoodToNoise = 0.2;//0.1 and 10 as to 9/5/12
+	//onsetLikelihoodToNoise = 0.2;//0.1 and 10 as to 9/5/12
 	kickLikelihoodToNoise = 0.3;
 	snareLikelihoodToNoise = 0.1;
 	
 	
 	onsetLikelihoodWidth = 6;//in ms

 		recordedTracks.updatePosition();
 		markerPlaybackPosition = recordedTracks.loadedAudioFiles[0].fileLoader.onsetDetect.framesToMillis(recordedTracks.loadedAudioFiles[0].fileLoader.onsetDetect.playPositionFrames);
 		currentAlignmentPosition = markerPlaybackPosition;
 	}
 	
-	updateRecordedTempo();
-	temporal.tempoPosterior.addGaussianShape(temporal.tempoPosterior.MAPestimate, temporal.tempoArraySize / 4, 0.5	);
+	if (updateTempoMethodOn){
+		updateRecordedTempo();
+	}
 }
 
 void AudioEventMatcher::updateRecordedTempo(){
 	//tempo of equivalent recorded position is updated 
-	recordedTempo = getRecordedTempoAtMillis(currentAlignmentPosition);
-		
-	double tmpRatio = currentSpeedRatio;
-	currentSpeedRatio = temporal.playingTempo / recordedTempo;
-	if (currentSpeedRatio != tmpRatio)
-		setSpeedRatioDistribution(currentSpeedRatio);
+
+	if (recordedTempoIndex < recordedTempoData.globalTempoTimes.size()){//if for debug
+		recordedTempo = getRecordedTempoAtMillis(currentAlignmentPosition);
+		
+		double tmpRatio = currentSpeedRatio;
+		
+		currentSpeedRatio = temporal.playingTempo / recordedTempo;
+		if (currentSpeedRatio != tmpRatio)
+			setSpeedRatioDistribution(currentSpeedRatio);
+		
 	}//end if to prevent debug crash
-}
-
+	
+	temporal.tempoPosterior.addGaussianShape(temporal.tempoPosterior.MAPestimate, temporal.tempoArraySize / 4, 0.5	);
+
+}
+ 
 double AudioEventMatcher::getRecordedTempoAtMillis(const double& millisPosition){
-	if (recordedTempoIndex < recordedTempoData.globalTempoTimes.size()){//if for debug
+	
 		while(currentAlignmentPosition < recordedTempoData.globalTempoTimes[recordedTempoIndex] && recordedTempoIndex > 0){
-			//this loop never used as sequential, so we expewct the laignment time to be ahead of the last recorded tempo point
+			//this loop never used as sequential, so we expect the alignment time to be ahead of the last recorded tempo point
 			//but just in case
 			recordedTempoIndex--;
 		}
 		
 		while(currentAlignmentPosition > recordedTempoData.globalTempoTimes[recordedTempoIndex]){
 			recordedTempoIndex++;
 		}
-		
 		
 		return recordedTempoData.globalTempo[recordedTempoIndex];
 }
 
 void AudioEventMatcher::updateBestAlignmentPosition(){

 	double totalLikelihoodAdded = 0;
 	if (channel <= recordedTracks.numberOfAudioTracks){
 		for (int i = 0;i < recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets.size();i++){
 			
 			if (checkMatch(recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets[i].aubioPitch, pitchIn)) {
-				quantity = getPitchDistance(recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets[i].aubioPitch, pitchIn, 12);
+				quantity = getPitchDistance(recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets[i].aubioPitch, pitchIn, pitchWidth);
 				
-				bayesianStruct.likelihood.addGaussianShapeFromRealTime(recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets[i].millisTime, 30, quantity);
+				bayesianStruct.likelihood.addGaussianShapeFromRealTime(recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets[i].millisTime, pitchLikelihoodWidth, quantity);
 				recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets[i].matched = true;
 				numberOfMatches++;
 				totalLikelihoodAdded += quantity;
 			} 
 			else{