Changeset 56ef7e1 for src/pitch

Timestamp:

Oct 18, 2009, 3:08:59 PM (15 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

e5f49af

Parents:

74516f7

Message:

Change peakpicker to match API specs, make quadint per channel

• src/mathutils.c
  • add per channel mean and median
  • update moving thres and adapt_thres accordingly
  • change quadint unused span argument to a channel argument
• src/onset/onset.c:
  • make wasonset a vector for multi channel, use new peakpicker
• src/onset/peakpick.c:
  • update peakpicker do for multi channeling
• src/pitch/: update use to fvec_quadint
• src/tempo/beattracking.c: update calls to fvec_quadint
• src/tempo/tempo.c: update peakpicker usage
• tests/src/test-peakpick.c: update peakpicker usage

Location:

src/pitch

Files:

• pitchmcomb.c (modified) (2 diffs)
• pitchyin.c (modified) (1 diff)
• pitchyinfft.c (modified) (1 diff)

src/pitch/pitchmcomb.c

@@ -167 +167 @@
   /* skipped */                       /* low pass filtering   */
   /** \bug fvec_moving_thres may write out of bounds */
-  fvec_adapt_thres(mag,tmp,p->win_post,p->win_pre); /* adaptative threshold */
+  fvec_adapt_thres(mag,tmp,p->win_post,p->win_pre,i); /* adaptative threshold */
   fvec_add(mag,-p->threshold);        /* fixed threshold      */
   {
@@ -277 +277 @@
         count += ispeak;
         spectral_peaks[count-1].bin = j;
-        spectral_peaks[count-1].ebin = fvec_quadint(X, j, 1) - 1.;
+        spectral_peaks[count-1].ebin = fvec_quadint(X, j, i) - 1.;
       }
     }

src/pitch/pitchyin.c

@@ -149 +149 @@
       if(tau > 4 && (yin->data[c][period] < tol) && 
           (yin->data[c][period] < yin->data[c][period+1])) {
-        out->data[c][0] = fvec_quadint(yin,period,1);
+        out->data[c][0] = fvec_quadint(yin,period,c);
         goto beach;
       }
     }
-    out->data[c][0] = fvec_quadint(yin,fvec_min_elem(yin),1);
+    out->data[c][0] = fvec_quadint(yin,fvec_min_elem(yin),c);
 beach:
     continue;

src/pitch/pitchyinfft.c

@@ -132 +132 @@
     /* additional check for (unlikely) octave doubling in higher frequencies */
     if (tau>35) {
-      output->data[i][0] = fvec_quadint(yin,tau,1);
+      output->data[i][0] = fvec_quadint(yin,tau,i);
     } else {
       /* should compare the minimum value of each interpolated peaks */
       halfperiod = FLOOR(tau/2+.5);
       if (yin->data[0][halfperiod] < p->tol)
-        output->data[i][0] = fvec_quadint(yin,halfperiod,1);
+        output->data[i][0] = fvec_quadint(yin,halfperiod,i);
       else
-        output->data[i][0] = fvec_quadint(yin,tau,1);
+        output->data[i][0] = fvec_quadint(yin,tau,i);
     }
   } else {