Changeset 9638f84

Timestamp:

Nov 24, 2007, 5:44:49 PM (16 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:

d7a104c

Parents:

4bb32f4

Message:

pitchmcomb.c: make sure all variables are initialised

File:

• src/pitchmcomb.c (modified) (6 diffs)

src/pitchmcomb.c

@@ -192 +192 @@
   uint_t l;
   uint_t d;
-  uint_t curlen;
+  uint_t curlen = 0;
 
   smpl_t delta2;
@@ -214 +214 @@
     candidate[l]->ebin=scaler*peaks[root_peak].ebin;
     /* if less than N peaks available, curlen < N */
-    curlen = (uint_t)FLOOR(length/(candidate[l]->ebin));
+    if (candidate[l]->ebin != 0.)
+      curlen = (uint_t)FLOOR(length/(candidate[l]->ebin));
     curlen = (N < curlen )? N : curlen;
     /* fill candidate[l]->ecomb[k] with (k+1)*candidate[l]->ebin */
@@ -326 +327 @@
   aubio_pitchmcomb_t * p = AUBIO_NEW(aubio_pitchmcomb_t);
   /* bug: should check if size / 8 > post+pre+1 */
-  uint_t i;
+  uint_t i, j;
   uint_t spec_size;
   p->spec_partition   = 4;
@@ -353 +354 @@
   /* array of spectral peaks */
   p->peaks      = AUBIO_ARRAY(aubio_spectralpeak_t,spec_size);
+  for (i = 0; i < spec_size; i++) {
+    p->peaks[i].bin = 0.;
+    p->peaks[i].ebin = 0.;
+    p->peaks[i].mag = 0.;
+  }
   /* array of pointers to spectral candidates */
   p->candidates = AUBIO_ARRAY(aubio_spectralcandidate_t *,p->ncand);
@@ -358 +364 @@
     p->candidates[i] = AUBIO_NEW(aubio_spectralcandidate_t);
     p->candidates[i]->ecomb = AUBIO_ARRAY(smpl_t, spec_size);
+    for (j=0; j < spec_size; j++) {
+      p->candidates[i]->ecomb[j] = 0.;
+    }
+    p->candidates[i]->ene = 0.;
+    p->candidates[i]->ebin = 0.;
+    p->candidates[i]->len = 0.;
   }
   return p;
@@ -371 +383 @@
   AUBIO_FREE(p->peaks);
   for (i=0;i<p->ncand;i++) {
+    AUBIO_FREE(p->candidates[i]->ecomb);
     AUBIO_FREE(p->candidates[i]);
   }