comparison Source/AubioOnsetDetector.cpp @ 3:979125db34ab

added OF visualiser src code. Added a long term median trigger threshold. New method is working very well on onsets

 	resetValues();
 	thresholdRelativeToMedian = 1.3;
 	cutoffForRepeatOnsetsMillis = 100;
 	medianSpeed = 10;
 	pos = 0;
+	
+	detectionTriggerRatio = 0.5f;
+	detectionTriggerThreshold = 10;
 }
 
 AubioOnsetDetector :: ~AubioOnsetDetector(){
 		aubio_onsetdetection_free (o);
 		

 bool AubioOnsetDetector :: checkForSlopeOnset(float bestValue){
 	bool onsetDetected = false;
 	//check for onset relative to our processed slope function
 	//a mix between increase in value and the gradient of that increase
 	
-	if (bestValue > bestSlopeMedian * thresholdRelativeToMedian && 
-		1000*framesToSeconds(currentFrame - lastSlopeOnsetFrame) > cutoffForRepeatOnsetsMillis
-		&& slopeFallenBelowMedian
+	if (bestValue > bestSlopeMedian * thresholdRelativeToMedian && //better than recent average 
+		1000*framesToSeconds(currentFrame - lastSlopeOnsetFrame) > cutoffForRepeatOnsetsMillis //after cutoff time
+		&& slopeFallenBelowMedian // has had onset and fall away again
+		&& bestValue > detectionTriggerThreshold * detectionTriggerRatio //longer term ratio of winning onsets 
 		){
 		printf("frame diff between onsets %6.1f", (1000*framesToSeconds(currentFrame - lastMedianOnsetFrame)) );
 		onsetDetected = true;
 		lastSlopeOnsetFrame = currentFrame;
 		slopeFallenBelowMedian = false;
+		
+		updateDetectionTriggerThreshold(bestValue);
 	}
 	
 	
 	if (bestValue > bestSlopeMedian)
-		bestSlopeMedian += (bestValue - bestSlopeMedian)*0.1;
+		bestSlopeMedian += (bestValue - bestSlopeMedian)*0.02;//was 1.1
 	else{
-		bestSlopeMedian *= 0.995;
+		bestSlopeMedian *= 0.99;
 		slopeFallenBelowMedian = true;;
 	}
 	return onsetDetected;
+}
+
+
+void AubioOnsetDetector::updateDetectionTriggerThreshold(const float& val){
+	float detectionAdaptSpeed = 0.05;//moving average, roughly last twenty onsets
+	detectionTriggerThreshold *= 1- detectionAdaptSpeed;
+	detectionTriggerThreshold += (val * detectionAdaptSpeed);
 }
 
 double  AubioOnsetDetector::framesToSeconds(float frames){
 	double seconds = frames * buffersize / 44100.;
 	return seconds;