From: Paul Brossier <piem@piem.org>
Date: Mon, 25 Nov 2013 22:26:48 +0000 (+0100)
Subject: src/tempo/beattracking.c: fix rayleigh period clamping
X-Git-Tag: 0.4.0-beta1~75
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=ffa8607e07c2c9e6fd993551ee8d4994796601ff;p=aubio.git

src/tempo/beattracking.c: fix rayleigh period clamping
---

diff --git a/src/tempo/beattracking.c b/src/tempo/beattracking.c
index 1afab64d..a9173fb5 100644
--- a/src/tempo/beattracking.c
+++ b/src/tempo/beattracking.c
@@ -170,9 +170,11 @@ aubio_beattracking_do (aubio_beattracking_t * bt, fvec_t * dfframe,
 
   /* find non-zero Rayleigh period */
   maxindex = fvec_max_elem (bt->acfout);
-  bt->rp = maxindex ? fvec_quadratic_peak_pos (bt->acfout, maxindex) : 1;
-  //rp = (maxindex==127) ? 43 : maxindex; //rayparam
-  bt->rp = (maxindex == bt->acfout->length - 1) ? bt->rayparam : maxindex;      //rayparam
+  if (maxindex > 0 && maxindex < bt->acfout->length - 1) {
+    bt->rp = fvec_quadratic_peak_pos (bt->acfout, maxindex);
+  } else {
+    bt->rp = bt->rayparam;
+  }
 
   /* activate biased filterbank */
   aubio_beattracking_checkstate (bt);