Changeset dec789b for src

Timestamp:

Dec 6, 2018, 1:51:35 PM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/cnn, feature/crepe, feature/pitchshift, feature/timestretch, fix/ffmpeg5, master

Children:

78a564b

Parents:

3a96d3d (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/pitchshift

Location:

src

Files:

• pitch/pitchspecacf.c (modified) (1 diff)
• spectral/awhitening.c (modified) (1 diff)
• utils/hist.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;
   }