Changeset dddf1f5 for src/pitch

Timestamp:

Nov 29, 2007, 5:34:18 PM (17 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:

212da72

Parents:

66a1b955 (diff), 6c7d49b (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 with main branch

Location:

src/pitch

Files:

• pitchdetection.c (moved) (moved from src/pitchdetection.c) (1 diff)
• pitchdetection.h (moved) (moved from src/pitchdetection.h)
• pitchfcomb.c (moved) (moved from src/pitchfcomb.c) (1 diff)
• pitchfcomb.h (moved) (moved from src/pitchfcomb.h)
• pitchmcomb.c (moved) (moved from src/pitchmcomb.c) (7 diffs)
• pitchmcomb.h (moved) (moved from src/pitchmcomb.h)
• pitchschmitt.c (moved) (moved from src/pitchschmitt.c) (1 diff)
• pitchschmitt.h (moved) (moved from src/pitchschmitt.h)
• pitchyin.c (added)
• pitchyin.h (moved) (moved from src/pitchyin.h)
• pitchyinfft.c (moved) (moved from src/pitchyinfft.c) (1 diff)
• pitchyinfft.h (moved) (moved from src/pitchyinfft.h)

src/pitch/pitchdetection.c

@@ -18 +18 @@
 
 #include "aubio_priv.h"
-#include "sample.h"
-#include "phasevoc.h"
+#include "fvec.h"
+#include "cvec.h"
+#include "spectral/phasevoc.h"
 #include "mathutils.h"
-#include "filter.h"
-#include "pitchmcomb.h"
-#include "pitchyin.h"
-#include "pitchfcomb.h"
-#include "pitchschmitt.h"
-#include "pitchyinfft.h"
-#include "pitchdetection.h"
+#include "temporal/filter.h"
+#include "pitch/pitchmcomb.h"
+#include "pitch/pitchyin.h"
+#include "pitch/pitchfcomb.h"
+#include "pitch/pitchschmitt.h"
+#include "pitch/pitchyinfft.h"
+#include "pitch/pitchdetection.h"
 
 typedef smpl_t (*aubio_pitchdetection_func_t)

src/pitch/pitchfcomb.c

@@ -19 +19 @@
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
+#include "cvec.h"
 #include "mathutils.h"
-#include "fft.h"
-#include "pitchfcomb.h"
+#include "spectral/fft.h"
+#include "pitch/pitchfcomb.h"
 
 #define MAX_PEAKS 8

src/pitch/pitchmcomb.c

@@ -19 +19 @@
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
+#include "cvec.h"
 #include "mathutils.h"
-#include "pitchmcomb.h"
+#include "pitch/pitchmcomb.h"
 
 #define CAND_SWAP(a,b) { register aubio_spectralcandidate_t *t=(a);(a)=(b);(b)=t; }
@@ -192 +193 @@
   uint_t l;
   uint_t d;
-  uint_t curlen;
+  uint_t curlen = 0;
 
   smpl_t delta2;
@@ -214 +215 @@
     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 +328 @@
   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 +355 @@
   /* 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 +365 @@
     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;
@@ -367 +380 @@
   del_fvec(p->newmag);
   del_fvec(p->scratch);
+  del_fvec(p->theta);
   del_fvec(p->scratch2);
   AUBIO_FREE(p->peaks);
   for (i=0;i<p->ncand;i++) {
+    AUBIO_FREE(p->candidates[i]->ecomb);
     AUBIO_FREE(p->candidates[i]);
   }

src/pitch/pitchschmitt.c

@@ -19 +19 @@
 
 #include "aubio_priv.h"
-#include "sample.h"
-#include "pitchschmitt.h"
+#include "fvec.h"
+#include "pitch/pitchschmitt.h"
 
 smpl_t aubio_schmittS16LE (aubio_pitchschmitt_t *p, uint_t nframes, signed short int *indata);

src/pitch/pitchyinfft.c

@@ -18 +18 @@
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
+#include "cvec.h"
 #include "mathutils.h"
-#include "fft.h"
-#include "pitchyinfft.h"
+#include "spectral/fft.h"
+#include "pitch/pitchyinfft.h"
 
 /** pitch yinfft structure */