comparison src/AudioEventMatcher.cpp @ 45:d23685b9e766

Fixed the alignment error caluculations and added histogram plotting

 
 void AudioEventMatcher::updateBestAlignmentPosition(){
 	//THIS DEALS WITH WHERE WE ARE NOW! ON THE SCREEN
 	//DIFFERENT TO WHEN EVENTS COME IN AS THEY ARE TIMESTAMPED - SO EG A PITCH EVENT MAY ARRIVE 16 CHROMA FRAMES LATER - BIG DIFFERENCE
 	
-	int newTime = ofGetElapsedTimeMillis() - startTime;
+	int newTime = getTimeNow();
 //	double tmp = bayesianStruct.posterior.getIndexInRealTerms(bayesianStruct.posterior.MAPestimate);;
 //	double timetmp = (newTime - lastAlignmentTime);
 //	double speedtmp = bayesianStruct.relativeSpeedPosterior.getIndexInRealTerms(bayesianStruct.relativeSpeedPosterior.MAPestimate);
 //	currentAlignmentTime = newTime;
 	currentAlignmentPosition = bayesianStruct.posterior.getIndexInRealTerms(bayesianStruct.posterior.MAPestimate);

 //	printf("updateBestAlignment:: alignment %i:: %i\n", newTime, (int) currentAlignmentPosition);
 	
 //	printf("ALIGN pos %f time diff %f (now %f , last %f)speed %f :: ALIGN BEST %f\n", tmp, timetmp, (double)ofGetElapsedTimeMillis(), lastAlignmentTime, speedtmp, currentAlignmentPosition);
 }
 
+int AudioEventMatcher::getTimeNow(){
+	return ofGetElapsedTimeMillis() - startTime;
+}
+
+
 void AudioEventMatcher::draw(){
 
 	//MAIN DRAW FUNCTION FOR ALL
 	
 	//draw some outlines in blue

 	
 	temporal.drawTempoArray(bayesLikelihoodWindow);
 	
 	drawRecordedTempo();
 	drawPlayingTempo();
+	
+	drawAlignmentTimes();
 	
 	
 }
 
 void AudioEventMatcher::drawRecordedTempo(){

 	tmpStr += " offsetis "+ofToString(bayesianStruct.posterior.offset);
 	tmpStr += " screenWidth = "+ofToString(bayesianStruct.posterior.getRealTermsAsIndex(screenWidthMillis));
 	ofDrawBitmapString(tmpStr, 20,140);
 	tmpStr = "best est "+ofToString(bayesianStruct.bestEstimate);
 	ofDrawBitmapString(tmpStr, 20, 180);
-	ofDrawBitmapString("screenwidth "+ofToString(screenWidthMillis), 20, 800);
+	//ofDrawBitmapString("screenwidth "+ofToString(screenWidthMillis), 20, 800);
 	
 	ofSetColor(255);
 	tmpStr = "pitch "+ofToString(recentPitch, 2);
 	tmpStr += " Nearest "+ofToString(pitchOfNearestMatch,2);
 	tmpStr += " dist "+ofToString(distanceOfNearestMatch, 2);

 	ofDrawBitmapString(alignString, 20, 50);
 	ofDrawBitmapString("pos "+ofToString(recordedTracks.loadedAudioFiles[0].fileLoader.onsetDetect.playPosition), 200,600);
 	
 }
 
+
+void AudioEventMatcher::drawAlignmentTimes(){
+	ofSetColor(255);
+	std::string dataString = "Live time "+ofToString(synchroniser.recordedPositionTimeSent);
+	dataString += ", Reh time "+ofToString(synchroniser.recordedPositionMillis);
+	ofDrawBitmapString(dataString, 10, ofGetHeight() - 20);
+
+}
+
+
 void AudioEventMatcher::newPitchEvent(const int& channel, const double& pitchIn, const double& timeIn){
 	if (pitchIn > 0){
 	liveInput.addPitchEvent(pitchIn, timeIn);
 	
 	//printPosteriorMAPinfo();	

 	bayesianStruct.likelihood.offset = bayesianStruct.prior.offset;
 	bayesianStruct.likelihood.zero();//set to zero
 	//double quantity = 1;//
 	double quantity = 1*onsetLikelihoodToNoise;//BETTER CHANGE THIS BACK TOO..see below//likelihoodToNoiseRatio / numberOfMatches;
 	int numberOfMatchesFound = 0;
-
+	double nearestOnsetDistance = 1000;
 	double startMatchingTime = bayesianStruct.likelihood.offset;
 	double endMatchingTime = bayesianStruct.likelihood.offset + matchWindowWidth;
 	double millisTime = -1*INFINITY;//or 0 is fine
 	int checkIndex = 0;
 	if (channel <= recordedTracks.numberOfAudioTracks && checkIndex < recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets.size()){

 			millisTime = recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets[i].millisTime;
 			if (millisTime >= startMatchingTime && millisTime <= endMatchingTime){
 				bayesianStruct.likelihood.addGaussianShapeFromRealTime(millisTime, onsetLikelihoodWidth,  quantity);
 				numberOfMatchesFound++;
 		//		printf("Adding Gaussian for onset at time %f offset %f\n", millisTime, bayesianStruct.likelihood.offset);
-				
+				if (fabs(currentAlignmentPosition - millisTime) < nearestOnsetDistance)
+					nearestOnsetDistance = currentAlignmentPosition - millisTime;
 			}//end if within limits (changed so it now is 4 sure)
 		}
 	}
 	
 	if (numberOfMatchesFound > 0){

 	projectedPrior = bayesianStruct.prior;
 	
 	
 	temporal.updateTempo(channel, timeIn);
 	}
-	
+	int timeNow = getTimeNow();
+	
+	printf("Nearest onset is %.1f time is %i and alignemnt %i time now %i\n", nearestOnsetDistance, (int) timeIn, (int)currentAlignmentPosition, timeNow);
 }
 
 
 
 void AudioEventMatcher::matchNewPitchEvent(const int& channel, const double& pitchIn, const double& timeIn){