Changeset e45345d

Timestamp:

Dec 7, 2018, 1:16:37 PM (6 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/timestretch, fix/ffmpeg5, master

Children:

6383ca4

Parents:

d91566e (diff), dd47431 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into feature/pydocstrings

Files:

• src/pitch/pitchspecacf.c (modified) (1 diff)
• src/spectral/awhitening.c (modified) (1 diff)
• src/utils/hist.c (modified) (1 diff)
• tests/src/spectral/test-awhitening.c (modified) (3 diffs)
• tests/src/test-mathutils.c (modified) (1 diff)

src/pitch/pitchspecacf.c

@@ -93 +93 @@
   del_fvec (p->sqrmag);
   del_fvec (p->fftout);
+  del_fvec (p->acf);
   AUBIO_FREE (p);
 }

src/spectral/awhitening.c

@@ -44 +44 @@
 {
   uint_t i = 0;
-  for (i = 0; i < o->peak_values->length; i++) {
+  uint_t length = MIN(fftgrain->length, o->peak_values->length);
+  for (i = 0; i < length; i++) {
     smpl_t tmp = MAX(o->r_decay * o->peak_values->data[i], o->floor);
     o->peak_values->data[i] = MAX(fftgrain->norm[i], tmp);

src/utils/hist.c

@@ -45 +45 @@
   uint_t i;
   if ((sint_t)nelems <= 0) {
+    AUBIO_FREE(s);
     return NULL;
   }

tests/src/spectral/test-awhitening.c

@@ -42 +42 @@
 
   aubio_pvoc_t *pv = new_aubio_pvoc(win_size, hop_size);
+  if (!pv) { err = 1; goto beach_pvoc; }
 
   aubio_spectral_whitening_t *awhitening =
     new_aubio_spectral_whitening (win_size, hop_size, samplerate);
+  if (!awhitening) { err = 1; goto beach_awhitening; }
 
   aubio_spectral_whitening_set_relax_time(awhitening, 20.);
@@ -72 +74 @@
       source_path, sink_path);
 
+  del_aubio_spectral_whitening(awhitening);
+beach_awhitening:
+  del_aubio_pvoc(pv);
+beach_pvoc:
   del_aubio_sink(o);
 beach_sink:
@@ -77 +83 @@
 beach_source:
   del_fvec(vec);
+  del_fvec(out);
+  del_fvec(scale);
+  del_cvec(fftgrain);
 beach_fvec:
   return err;

tests/src/test-mathutils.c

@@ -101 +101 @@
   fvec_set_window(window, "rectangle");
   fvec_print(window);
+  del_fvec(window);
 
   window_size /= 2.;