Changeset 09558b8

Timestamp:

Feb 2, 2017, 2:04:27 AM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

yinfft+

Children:

422a2a9

Parents:

a7b14a6

Message:

src/pitch/pitchyinfft.c: simplify local peak lookup

File:

• src/pitch/pitchyinfft.c (modified) (3 diffs)

src/pitch/pitchyinfft.c

@@ -112 +112 @@
   uint_t tau, l;
   uint_t length = p->fftout->length;
-  uint_t halfperiod;
   fvec_t *fftout = p->fftout;
   fvec_t *yin = p->yinfft;
   smpl_t tmp = 0., sum = 0.;
+  uint_t startbin = 0, endbin = 0, before = 0, after = 0;
 
   // window the input
@@ -154 +154 @@
   tmp = fvec_min(yin);
   if (tmp > p->tol) {
-    // give up - got no confident candidate at all 
+    // give up - got no confident candidate at all
     output->data[0] = 0.;
     return;
@@ -169 +169 @@
   }
   // find local min around current pick to sharpen the results
-  const uint_t LOCAL_NOTE_SEEK_RANGE = 1;
-  const smpl_t note = aubio_bintomidi (tau, p->samplerate, p->fftout->length);
-  const uint_t startbin = MAX (0, (uint_t)aubio_miditobin (note - LOCAL_NOTE_SEEK_RANGE,
-    p->samplerate, p->fftout->length));
-  const uint_t endbin = MIN (yin->length, (uint_t)(aubio_miditobin (note + LOCAL_NOTE_SEEK_RANGE,
-    p->samplerate, p->fftout->length) + 0.5));
+  before = 2, after = 5;
+  // for low frequency, the peak may be large, we use a larger after
+  if (tau > yin->length/2) { before = 1; after = 20; }
+  startbin = tau > before ? tau - before : 0;
+  endbin = tau < yin->length - 1 - after ? tau + after : yin->length - 1;
   tmp = yin->data[tau];
   for (l = startbin; l < endbin; l++) {