comparison src/AudioEventMatcher.cpp @ 16:680ba08e9925

Auto synchroniser added using the elastique~ object in max

 const int matchWindowWidth = 6000;
 
 AudioEventMatcher::AudioEventMatcher(){
 
 	
-	pitchLikelihoodToNoise = 0.4;//more noise
-	onsetLikelihoodToNoise = 0.3;
+	pitchLikelihoodToNoise = 0.9;//more noise
+	
+	onsetLikelihoodToNoise = 0.4;
 	onsetLikelihoodWidth = 20;//in ms
 	
 	setArraySizes();
 	
 	usingRealTime = false;

 	bayesianStruct.relativeSpeedPrior.getMaximum();
 	
 	bayesianStruct.resetSize(matchWindowWidth);
 	bayesianStruct.setPositionDistributionScalar(1);
 	
+}
+
+void AudioEventMatcher::loadAudioFiles(){
+	recordedTracks.loadTestAudio();
+	synchroniser.fileLengthSamples = recordedTracks.loadedAudioFiles[0].fileLoader.totalNumberOfSamples;
+	printf("synchroniser has %f samples\n", synchroniser.fileLengthSamples);
 }
 
 void AudioEventMatcher::startPlaying(){
 	bayesianStruct.setStartPlaying();
 	currentAlignmentPosition = 0;

 //	double speedtmp = bayesianStruct.relativeSpeedPosterior.getIndexInRealTerms(bayesianStruct.relativeSpeedPosterior.MAPestimate);
 //	currentAlignmentTime = newTime;
 	currentAlignmentPosition = bayesianStruct.posterior.getIndexInRealTerms(bayesianStruct.posterior.MAPestimate);
 	currentAlignmentPosition += (newTime - lastAlignmentTime) * bayesianStruct.relativeSpeedPosterior.getIndexInRealTerms(bayesianStruct.relativeSpeedPosterior.MAPestimate);
 
+	
+	synchroniser.updateRecordedPosition(currentAlignmentPosition);
+	
+	synchroniser.updateOutputSpeed();
+	
 	bayesianStruct.projectDistribution(newTime, currentAlignmentPosition, projectedPrior);//prior gets updated to where we are now
 	
 //	printf("ALIGN pos %f time diff %f (now %f , last %f)speed %f :: ALIGN BEST %f\n", tmp, timetmp, (double)ofGetElapsedTimeMillis(), lastAlignmentTime, speedtmp, currentAlignmentPosition);
 }
 

 	//bayesianStruct.posterior.drawVector(0, bayesianStruct.posterior.getRealTermsAsIndex(screenWidthMillis), bayesPositionWindow);
 	//bayesianStruct.posterior.drawVector(bayesianStruct.posterior.getRealTermsAsIndex(0), bayesianStruct.posterior.getRealTermsAsIndex(screenWidthMillis), bayesPositionWindow);
 	//bayesianStruct.relativeSpeedPosterior.drawVector(0, bayesianStruct.relativeSpeedPosterior.getRealTermsAsIndex(2), bayesTempoWindow);
 	
 	ofDrawBitmapString("pitch "+ofToString(recentPitch, 2)+", Time "+ofToString(recentTime, 0), 20, 20);
+	
+	string alignString = " align "+ofToString(currentAlignmentPosition, 2);
+	alignString += " playing "+ofToString(synchroniser.playingPositionRatio, 5);
+	alignString += "  "+ofToString(synchroniser.playingPositionMillis)+" ms";
+	ofDrawBitmapString(alignString, 20, 50);
 	
 	ofDrawBitmapString("pos "+ofToString(recordedTracks.loadedAudioFiles[0].fileLoader.onsetDetect.playPosition), 200,600);
 }
 	
 void AudioEventMatcher::setScreenDisplayTimes(){

 	
 	//green line at current best estimate
 	ofSetColor(0,255,0);//green scrolling line best position
 	double currentEstimateIndex = (currentAlignmentPosition - screenStartTimeMillis)*ofGetWidth()/screenWidthMillis;
 	ofLine(currentEstimateIndex, bayesPositionWindow.y, currentEstimateIndex, bayesPositionWindow.y + bayesPositionWindow.height);
+	
+
+	ofSetColor(0,255,255);//synchroniser position
+	currentEstimateIndex = (synchroniser.playingPositionMillis - screenStartTimeMillis)*ofGetWidth()/screenWidthMillis;
+	ofLine(currentEstimateIndex, bayesLikelihoodWindow.y, currentEstimateIndex, bayesLikelihoodWindow.y + bayesPositionWindow.height);
+	
+	
 	
 	//draw track by track likelihoods
 	for (int i = 0; i <recordedTracks.numberOfAudioTracks;i++){
 		ofSetColor(200,255,50);//channel likelihoods in yellow
 		likelihoodVisualisation[i].drawConstrainedVector(likelihoodVisualisation[i].getRealTermsAsIndex(screenStartTimeMillis), likelihoodVisualisation[i].getRealTermsAsIndex(screenEndTimeMillis), 0, ofGetWidth(), recordedTracks.loadedAudioFiles[i].fileLoader.onsetDetect.window);		

 	double quantity = 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, 10);
+				quantity = getPitchDistance(recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets[i].aubioPitch, pitchIn, 16);
 				bayesianStruct.likelihood.addGaussianShapeFromRealTime(recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets[i].millisTime, 30, quantity);
 				recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets[i].matched = true;
 				numberOfMatches++;
 			} 
 			else{

 
 }
 
 double AudioEventMatcher::getPitchDistance(const double& pitchOne, const double& pitchTwo, const double& scale){
 	
+	double scaleFactor = scale ;//* pitchOne / 110.0;
+	
+	
 	double distance = abs(pitchOne - pitchTwo);
-	if (distance < scale)
-		distance = 1 - (distance/scale);
+	if (distance < scaleFactor)
+		distance = 1 - (distance/scaleFactor);
 	else
 		distance = 0;
 	
 //	printf("[pitch distance %f vs %f = %f\n", pitchOne, pitchTwo, distance);
 	return distance;
 
 }
 
 
 bool AudioEventMatcher::checkMatch(const double& recordedPitch, const double& livePitch){
-	if (abs(recordedPitch - livePitch) < 40)
+	if (abs(recordedPitch - livePitch) < 16)
 		return true;
 	else
 		return false;
 }