comparison dsp/onsets/DetectionFunction.cpp @ 238:e8e5f9130b49

...

 void DetectionFunction::initialise( DFConfig Config )
 {
     m_dataLength = Config.frameLength;
     m_halfLength = m_dataLength/2;
     m_DFType = Config.DFType;
+    m_stepSecs = Config.stepSecs;
+    m_stepSize = Config.stepSize;
 
     m_magHistory = new double[ m_halfLength ];
     memset(m_magHistory,0, m_halfLength*sizeof(double));
 		
     m_phaseHistory = new double[ m_halfLength ];

     {
     case DF_HFC:
 	retVal = HFC( m_halfLength, m_magnitude);
 	break;
 	
-    case  DF_SPECDIFF:
+    case DF_SPECDIFF:
 	retVal = specDiff( m_halfLength, m_magnitude);
 	break;
 	
     case DF_PHASEDEV:
 	retVal = phaseDev( m_halfLength, m_magnitude, m_thetaAngle);

     {
 	temp = fabs( (src[ i ] * src[ i ]) - (m_magHistory[ i ] * m_magHistory[ i ]) );
 		
 	diff= sqrt(temp);
 
-	if( src[ i ] > 0.1)
-	{
-	    val += diff;
-	}
+        // (See note in phaseDev below.)
+
+        val += diff;
 
 	m_magHistory[ i ] = src[ i ];
     }
 
     return val;

 
     for( i = 0; i < length; i++)
     {
 	tmpPhase = (srcPhase[ i ]- 2*m_phaseHistory[ i ]+m_phaseHistoryOld[ i ]);
 	dev = MathUtilities::princarg( tmpPhase );
-		
-	if( srcMagnitude[ i  ] > 0.1)
-	{
-	    tmpVal  = fabs( dev);
-	    val += tmpVal ;
-	}
+
+        // A previous version of this code only counted the value here
+        // if the magnitude exceeded 0.1.  My impression is that
+        // doesn't greatly improve the results for "loud" music (so
+        // long as the peak picker is reasonably sophisticated), but
+        // does significantly damage its ability to work with quieter
+        // music, so I'm removing it and counting the result always.
+        // Same goes for the spectral difference measure above.
+		
+        tmpVal  = fabs(dev);
+        val += tmpVal ;
 
 	m_phaseHistoryOld[ i ] = m_phaseHistory[ i ] ;
 	m_phaseHistory[ i ] = srcPhase[ i ];
     }