comparison src/BTrack.cpp @ 22:a8e3e95d14e4 develop

Renamed many variables, functions and arguments so they have more sensible names. Also removed an apparently redundant variable in OnsetDetectionFunction called wframe

 	// initialise parameters
 	tightness = 5;
 	alpha = 0.9;
 	tempo = 120;
 	estimatedTempo = 120.0;
-	p_fact = 60.*44100./512.;
+	tempoToLagFactor = 60.*44100./512.;
 	
 	m0 = 10;
 	beatCounter = -1;
 	
 	beatDueInFrame = false;

 
 //=======================================================================
 void BTrack::processAudioFrame(double *frame)
 {
     // calculate the onset detection function sample for the frame
-    double sample = odf.getDFsample(frame);
+    double sample = odf.calculateOnsetDetectionFunctionSample(frame);
     
     
     
     // process the new onset detection function sample in the beat tracking algorithm
     processOnsetDetectionFunctionSample(sample);

 	adaptiveThreshold(combFilterBankOutput,128);
 
 	
 	int t_index;
 	int t_index2;
-	// calculate tempo observation vector from bperiod observation vector
+	// calculate tempo observation vector from beat period observation vector
 	for (int i = 0;i < 41;i++)
 	{
-		t_index = (int) round(p_fact / ((double) ((2*i)+80)));
-		t_index2 = (int) round(p_fact / ((double) ((4*i)+160)));
+		t_index = (int) round(tempoToLagFactor / ((double) ((2*i)+80)));
+		t_index2 = (int) round(tempoToLagFactor / ((double) ((4*i)+160)));
 
 		
 		tempoObservationVector[i] = combFilterBankOutput[t_index-1] + combFilterBankOutput[t_index2-1];
 	}
 	

 }
 
 //=======================================================================
 void BTrack::adaptiveThreshold(double *x,int N)
 {
-	//int N = 512; // length of df
 	int i = 0;
 	int k,t = 0;
 	double x_thresh[N];
 	
 	int p_post = 7;

 		acf[l] = sum / (512-l);		// weight by number of mults and add to acf buffer
 	}
 }
 
 //=======================================================================
-double BTrack::calculateMeanOfArray(double *array,int start,int end)
+double BTrack::calculateMeanOfArray(double *array,int startIndex,int endIndex)
 {
 	int i;
 	double sum = 0;
 
-    int length = end - start;
+    int length = endIndex - startIndex;
 	
 	// find sum
-	for (i = start;i < end;i++)
+	for (i = startIndex;i < endIndex;i++)
 	{
 		sum = sum + array[i];
 	}
 	
     if (length > 0)

 		}
 	}
 }
 
 //=======================================================================
-void BTrack::updateCumulativeScore(double df_sample)
+void BTrack::updateCumulativeScore(double odfSample)
 {	 
 	int start, end, winsize;
 	double max;
 	
 	start = onsetDFBufferSize - round(2*beatPeriod);

 	{
 		cumulativeScore[i] = cumulativeScore[i+1];
 	}
 	
 	// add new value to cumulative score
-	cumulativeScore[onsetDFBufferSize-1] = ((1-alpha)*df_sample) + (alpha*max);
+	cumulativeScore[onsetDFBufferSize-1] = ((1-alpha)*odfSample) + (alpha*max);
 	
 	latestCumulativeScoreValue = cumulativeScore[onsetDFBufferSize-1];
 			
 }