Changeset 7a04950

Timestamp:

May 10, 2005, 4:36:37 PM (20 years ago)

Author:

Paul Brossier <piem@altern.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:

d072c13

Parents:

603fca4

Message:

added pitchfcomb and pitchschmitt

Files:

• src/Makefile.am (modified) (2 diffs)
• src/aubio.h (modified) (2 diffs)
• src/pitchfcomb.c (added)
• src/pitchfcomb.h (added)
• src/pitchmcomb.c (modified) (1 diff)
• src/pitchmcomb.h (modified) (1 diff)
• src/pitchschmitt.c (added)
• src/pitchschmitt.h (added)
• swig/aubio.i (modified) (2 diffs)

src/Makefile.am

@@ -18 +18 @@
         pitchmcomb.h \
         pitchyin.h \
+        pitchschmitt.h \
+        pitchfcomb.h \
         filter.h
 
@@ -51 +53 @@
         pitchyin.c \
         pitchyin.h \
+        pitchschmitt.c \
+        pitchschmitt.h \
+        pitchfcomb.c \
+        pitchfcomb.h \
         filter.c \
         filter.h

src/aubio.h

@@ -67 +67 @@
 #include "tss.h"
 #include "resample.h"
-
 #include "peakpick.h"
 #include "biquad.h"
@@ -74 +73 @@
 #include "pitchmcomb.h"
 #include "pitchyin.h"
+#include "pitchschmitt.h"
+#include "pitchfcomb.h"
 
 #ifdef __cplusplus

src/pitchmcomb.c

@@ -342 +342 @@
 }
 
+
+void del_aubio_pitchmcomb (aubio_pitchmcomb_t *p) {
+  uint_t i;
+  del_fvec(p->newmag);
+  del_fvec(p->newmag);
+  del_fvec(p->newmag);
+  AUBIO_FREE(p->peaks);
+  for (i=0;i<p->ncand;i++) {
+    AUBIO_FREE(p->candidates[i]);
+  }
+  AUBIO_FREE(p->candidates);
+  AUBIO_FREE(p);
+}

src/pitchmcomb.h

@@ -36 +36 @@
 uint_t aubio_pitch_cands(aubio_pitchmcomb_t * p, cvec_t * fftgrain, smpl_t * cands);
 aubio_pitchmcomb_t * new_aubio_pitchmcomb(uint_t size, uint_t channels);
+void del_aubio_pitchmcomb(aubio_pitchmcomb_t *p);
 
 #ifdef __cplusplus

swig/aubio.i

@@ -163 +163 @@
 smpl_t aubio_pitchmcomb_detect(aubio_pitchmcomb_t * p, cvec_t * fftgrain);
 uint_t aubio_pitch_cands(aubio_pitchmcomb_t * p, cvec_t * fftgrain, smpl_t * cands);
+void del_aubio_pitchmcomb (aubio_pitchmcomb_t *p);
 
 /* pitch yin */
@@ -168 +169 @@
 void aubio_pitchyin_getcum(fvec_t *yin);
 uint_t aubio_pitchyin_getpitch(fvec_t *yin);
+
+/* pitch schmitt */
+aubio_pitchschmitt_t * new_aubio_pitchschmitt (uint_t size, uint_t samplerate);
+smpl_t aubio_pitchschmitt_detect (aubio_pitchschmitt_t *p, fvec_t * input);
+void del_aubio_pitchschmitt (aubio_pitchschmitt_t *p);
+
+/* pitch fcomb */
+aubio_pitchfcomb_t * new_aubio_pitchfcomb (uint_t size, uint_t samplerate);
+smpl_t aubio_pitchfcomb_detect (aubio_pitchfcomb_t *p, fvec_t * input);
+void del_aubio_pitchfcomb (aubio_pitchfcomb_t *p);
 
 /* peakpicker */