Changes in src/pitch/pitchmcomb.c [ce3ff2b:5b41ef9]

File:

• src/pitch/pitchmcomb.c (modified) (11 diffs)

src/pitch/pitchmcomb.c

@@ -32 +32 @@
     uint_t length);
 uint_t aubio_pitchmcomb_quadpick (aubio_spectralpeak_t * spectral_peaks,
-    const fvec_t * X);
-void aubio_pitchmcomb_spectral_pp (aubio_pitchmcomb_t * p, const fvec_t * oldmag);
-void aubio_pitchmcomb_combdet (aubio_pitchmcomb_t * p, const fvec_t * newmag);
+    fvec_t * X);
+void aubio_pitchmcomb_spectral_pp (aubio_pitchmcomb_t * p, fvec_t * oldmag);
+void aubio_pitchmcomb_combdet (aubio_pitchmcomb_t * p, fvec_t * newmag);
 /* not used but useful : sort by amplitudes (or anything else)
  * sort_pitchpeak(peaks, length);
@@ -43 +43 @@
 void aubio_pitchmcomb_sort_peak (aubio_spectralpeak_t * peaks, uint_t nbins);
 /** select the best candidates */
-uint_t aubio_pitch_cands (aubio_pitchmcomb_t * p, const cvec_t * fftgrain,
+uint_t aubio_pitch_cands (aubio_pitchmcomb_t * p, cvec_t * fftgrain,
     smpl_t * cands);
 
@@ -102 +102 @@
 
 void
-aubio_pitchmcomb_do (aubio_pitchmcomb_t * p, const cvec_t * fftgrain, fvec_t * output)
+aubio_pitchmcomb_do (aubio_pitchmcomb_t * p, cvec_t * fftgrain, fvec_t * output)
 {
   uint_t j;
@@ -135 +135 @@
 
 uint_t
-aubio_pitch_cands (aubio_pitchmcomb_t * p, const cvec_t * fftgrain, smpl_t * cands)
+aubio_pitch_cands (aubio_pitchmcomb_t * p, cvec_t * fftgrain, smpl_t * cands)
 {
   uint_t j;
@@ -166 +166 @@
 
 void
-aubio_pitchmcomb_spectral_pp (aubio_pitchmcomb_t * p, const fvec_t * newmag)
+aubio_pitchmcomb_spectral_pp (aubio_pitchmcomb_t * p, fvec_t * newmag)
 {
   fvec_t *mag = (fvec_t *) p->scratch;
@@ -198 +198 @@
 
 void
-aubio_pitchmcomb_combdet (aubio_pitchmcomb_t * p, const fvec_t * newmag)
+aubio_pitchmcomb_combdet (aubio_pitchmcomb_t * p, fvec_t * newmag)
 {
   aubio_spectralpeak_t *peaks = (aubio_spectralpeak_t *) p->peaks;
@@ -286 +286 @@
  */
 uint_t
-aubio_pitchmcomb_quadpick (aubio_spectralpeak_t * spectral_peaks, const fvec_t * X)
+aubio_pitchmcomb_quadpick (aubio_spectralpeak_t * spectral_peaks, fvec_t * X)
 {
   uint_t j, ispeak, count = 0;
@@ -336 +336 @@
   uint_t run = 0;
   for (cur = 0; cur < nbins; cur++) {
-    for (run = cur + 1; run < nbins; run++) {
+    run = cur + 1;
+    for (run = cur; run < nbins; run++) {
       if (candidates[run]->ene > candidates[cur]->ene)
         CAND_SWAP (candidates[run], candidates[cur]);
@@ -351 +352 @@
   uint_t run = 0;
   for (cur = 0; cur < nbins; cur++) {
-    for (run = cur + 1; run < nbins; run++) {
+    run = cur + 1;
+    for (run = cur; run < nbins; run++) {
       if (candidates[run]->ebin < candidates[cur]->ebin)
         CAND_SWAP (candidates[run], candidates[cur]);
@@ -365 +367 @@
   uint_t i, j;
   uint_t spec_size;
-  p->spec_partition = 2;
+  p->spec_partition = 4;
   p->ncand = 5;
   p->npartials = 5;
@@ -377 +379 @@
   p->phasefreq = bufsize / hopsize / TWO_PI;
   p->phasediff = TWO_PI * hopsize / bufsize;
-  spec_size = bufsize / p->spec_partition + 1;
+  spec_size = bufsize / p->spec_partition;
   //p->pickerfn = quadpick;
   //p->biquad = new_biquad(0.1600,0.3200,0.1600, -0.5949, 0.2348);