Changeset ca1abdd for src

Timestamp:

Oct 19, 2009, 10:51:59 AM (15 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:

b14107f

Parents:

9f07d52

Message:

rename aubio_pitchdetection to aubio_pitch

Location:

src

Files:

• Makefile.am (modified) (2 diffs)
• aubio.h (modified) (1 diff)
• pitch/pitch.c (moved) (moved from src/pitch/pitchdetection.c) (15 diffs)
• pitch/pitch.h (moved) (moved from src/pitch/pitchdetection.h) (4 diffs)

src/Makefile.am

@@ -24 +24 @@
         spectral/tss.h \
         spectral/spectral_centroid.h \
-        pitch/pitchdetection.h \
+        pitch/pitch.h \
         pitch/pitchmcomb.h \
         pitch/pitchyin.h \
@@ -59 +59 @@
         spectral/tss.c \
         spectral/spectral_centroid.c \
-        pitch/pitchdetection.c \
+        pitch/pitch.c \
         pitch/pitchmcomb.c \
         pitch/pitchyin.c \

src/aubio.h

@@ -82 +82 @@
 #include "spectral/phasevoc.h"
 #include "spectral/spectral_centroid.h"
-#include "pitch/pitchdetection.h"
+#include "pitch/pitch.h"
 #include "pitch/pitchmcomb.h"
 #include "pitch/pitchyin.h"

src/pitch/pitch.c

@@ -30 +30 @@
 #include "pitch/pitchschmitt.h"
 #include "pitch/pitchyinfft.h"
-#include "pitch/pitchdetection.h"
+#include "pitch/pitch.h"
 
 /** pitch detection algorithm */
 typedef enum {
-  aubio_pitch_yin,     /**< YIN algorithm */
-  aubio_pitch_mcomb,   /**< Multi-comb filter */
-  aubio_pitch_schmitt, /**< Schmitt trigger */
-  aubio_pitch_fcomb,   /**< Fast comb filter */
-  aubio_pitch_yinfft,   /**< Spectral YIN */
-  aubio_pitch_default = aubio_pitch_yinfft, /**< the one used when "default" is asked */
-} aubio_pitchdetection_type;
+  aubio_pitcht_yin,     /**< YIN algorithm */
+  aubio_pitcht_mcomb,   /**< Multi-comb filter */
+  aubio_pitcht_schmitt, /**< Schmitt trigger */
+  aubio_pitcht_fcomb,   /**< Fast comb filter */
+  aubio_pitcht_yinfft,   /**< Spectral YIN */
+  aubio_pitcht_default = aubio_pitcht_yinfft, /**< the one used when "default" is asked */
+} aubio_pitch_type;
 
 /** pitch detection output mode */
@@ -49 +49 @@
   aubio_pitchm_bin,    /**< Frequency bin (0,bufsize) */
   aubio_pitchm_default = aubio_pitchm_freq, /**< the one used when "default" is asked */
-} aubio_pitchdetection_mode;
-
-typedef void (*aubio_pitchdetection_func_t)
-  (aubio_pitchdetection_t *p, fvec_t * ibuf, fvec_t *obuf);
-typedef smpl_t (*aubio_pitchdetection_conv_t)
+} aubio_pitch_mode;
+
+typedef void (*aubio_pitch_func_t)
+  (aubio_pitch_t *p, fvec_t * ibuf, fvec_t *obuf);
+typedef smpl_t (*aubio_pitch_conv_t)
   (smpl_t value, uint_t srate, uint_t bufsize);
 
-void aubio_pitchdetection_slideblock(aubio_pitchdetection_t *p, fvec_t *ibuf);
-
-void aubio_pitchdetection_mcomb   (aubio_pitchdetection_t *p, fvec_t *ibuf, fvec_t *obuf);
-void aubio_pitchdetection_yin     (aubio_pitchdetection_t *p, fvec_t *ibuf, fvec_t *obuf);
-void aubio_pitchdetection_schmitt (aubio_pitchdetection_t *p, fvec_t *ibuf, fvec_t *obuf);
-void aubio_pitchdetection_fcomb   (aubio_pitchdetection_t *p, fvec_t *ibuf, fvec_t *obuf);
-void aubio_pitchdetection_yinfft  (aubio_pitchdetection_t *p, fvec_t *ibuf, fvec_t *obuf);
+void aubio_pitch_slideblock(aubio_pitch_t *p, fvec_t *ibuf);
+
+void aubio_pitch_do_mcomb   (aubio_pitch_t *p, fvec_t *ibuf, fvec_t *obuf);
+void aubio_pitch_do_yin     (aubio_pitch_t *p, fvec_t *ibuf, fvec_t *obuf);
+void aubio_pitch_do_schmitt (aubio_pitch_t *p, fvec_t *ibuf, fvec_t *obuf);
+void aubio_pitch_do_fcomb   (aubio_pitch_t *p, fvec_t *ibuf, fvec_t *obuf);
+void aubio_pitch_do_yinfft  (aubio_pitch_t *p, fvec_t *ibuf, fvec_t *obuf);
 
 /** generic pitch detection structure */
-struct _aubio_pitchdetection_t {
-  aubio_pitchdetection_type type; /**< pitch detection mode */
-  aubio_pitchdetection_mode mode; /**< pitch detection output mode */
+struct _aubio_pitch_t {
+  aubio_pitch_type type; /**< pitch detection mode */
+  aubio_pitch_mode mode; /**< pitch detection output mode */
   uint_t srate;                   /**< samplerate */
   uint_t bufsize;                 /**< buffer size */
@@ -79 +79 @@
   cvec_t * fftgrain;              /**< spectral frame for mcomb */
   fvec_t * buf;                   /**< temporary buffer for yin */
-  aubio_pitchdetection_func_t callback; /**< pointer to current pitch detection method */
-  aubio_pitchdetection_conv_t freqconv; /**< pointer to current pitch conversion method */ 
+  aubio_pitch_func_t callback; /**< pointer to current pitch detection method */
+  aubio_pitch_conv_t freqconv; /**< pointer to current pitch conversion method */ 
 };
 
@@ -100 +100 @@
 }
 
-aubio_pitchdetection_t *
-new_aubio_pitchdetection (char_t * pitch_mode,
+aubio_pitch_t *
+new_aubio_pitch (char_t * pitch_mode,
     uint_t bufsize, uint_t hopsize, uint_t channels, uint_t samplerate)
 {
-  aubio_pitchdetection_t *p = AUBIO_NEW(aubio_pitchdetection_t);
-  aubio_pitchdetection_type pitch_type;
+  aubio_pitch_t *p = AUBIO_NEW(aubio_pitch_t);
+  aubio_pitch_type pitch_type;
   if (strcmp (pitch_mode, "mcomb") == 0)
-      pitch_type = aubio_pitch_mcomb;
+      pitch_type = aubio_pitcht_mcomb;
   else if (strcmp (pitch_mode, "yinfft") == 0)
-      pitch_type = aubio_pitch_yin;
+      pitch_type = aubio_pitcht_yin;
   else if (strcmp (pitch_mode, "yin") == 0)
-      pitch_type = aubio_pitch_yin;
+      pitch_type = aubio_pitcht_yin;
   else if (strcmp (pitch_mode, "schmitt") == 0)
-      pitch_type = aubio_pitch_schmitt;
+      pitch_type = aubio_pitcht_schmitt;
   else if (strcmp (pitch_mode, "fcomb") == 0)
-      pitch_type = aubio_pitch_fcomb;
+      pitch_type = aubio_pitcht_fcomb;
   else if (strcmp (pitch_mode, "default") == 0)
-      pitch_type = aubio_pitch_default;
+      pitch_type = aubio_pitcht_default;
   else {
       AUBIO_ERR ("unknown pitch detection method %s, using default.\n", pitch_mode);
-      pitch_type = aubio_pitch_default;
+      pitch_type = aubio_pitcht_default;
       return NULL;
   }
   p->srate = samplerate;
   p->type = pitch_type;
-  aubio_pitchdetection_set_unit (p, "default");
+  aubio_pitch_set_unit (p, "default");
   p->bufsize = bufsize;
   switch(p->type) {
-    case aubio_pitch_yin:
+    case aubio_pitcht_yin:
       p->buf      = new_fvec(bufsize,channels);
       p->yin      = new_aubio_pitchyin(bufsize);
-      p->callback = aubio_pitchdetection_yin;
+      p->callback = aubio_pitch_do_yin;
       aubio_pitchyin_set_tolerance (p->yin, 0.15);
       break;
-    case aubio_pitch_mcomb:
+    case aubio_pitcht_mcomb:
       p->pv       = new_aubio_pvoc(bufsize, hopsize, channels);
       p->fftgrain = new_cvec(bufsize, channels);
       p->mcomb    = new_aubio_pitchmcomb(bufsize,hopsize,channels);
       p->filter   = new_aubio_filter_c_weighting (samplerate, channels);
-      p->callback = aubio_pitchdetection_mcomb;
-      break;
-    case aubio_pitch_fcomb:
+      p->callback = aubio_pitch_do_mcomb;
+      break;
+    case aubio_pitcht_fcomb:
       p->buf      = new_fvec(bufsize,channels);
       p->fcomb    = new_aubio_pitchfcomb(bufsize,hopsize,channels);
-      p->callback = aubio_pitchdetection_fcomb;
-      break;
-    case aubio_pitch_schmitt:
+      p->callback = aubio_pitch_do_fcomb;
+      break;
+    case aubio_pitcht_schmitt:
       p->buf      = new_fvec(bufsize,channels);
       p->schmitt  = new_aubio_pitchschmitt(bufsize);
-      p->callback = aubio_pitchdetection_schmitt;
-      break;
-    case aubio_pitch_yinfft:
+      p->callback = aubio_pitch_do_schmitt;
+      break;
+    case aubio_pitcht_yinfft:
       p->buf      = new_fvec(bufsize,channels);
       p->yinfft   = new_aubio_pitchyinfft(bufsize);
-      p->callback = aubio_pitchdetection_yinfft;
+      p->callback = aubio_pitch_do_yinfft;
       aubio_pitchyinfft_set_tolerance (p->yinfft, 0.85);
       break;
@@ -163 +163 @@
 }
 
-void del_aubio_pitchdetection(aubio_pitchdetection_t * p) {
+void del_aubio_pitch(aubio_pitch_t * p) {
   switch(p->type) {
-    case aubio_pitch_yin:
+    case aubio_pitcht_yin:
       del_fvec(p->buf);
       del_aubio_pitchyin(p->yin);
       break;
-    case aubio_pitch_mcomb:
+    case aubio_pitcht_mcomb:
       del_aubio_pvoc(p->pv);
       del_cvec(p->fftgrain);
@@ -175 +175 @@
       del_aubio_pitchmcomb(p->mcomb);
       break;
-    case aubio_pitch_schmitt:
+    case aubio_pitcht_schmitt:
       del_fvec(p->buf);
       del_aubio_pitchschmitt(p->schmitt);
       break;
-    case aubio_pitch_fcomb:
+    case aubio_pitcht_fcomb:
       del_fvec(p->buf);
       del_aubio_pitchfcomb(p->fcomb);
       break;
-    case aubio_pitch_yinfft:
+    case aubio_pitcht_yinfft:
       del_fvec(p->buf);
       del_aubio_pitchyinfft(p->yinfft);
@@ -193 +193 @@
 }
 
-void aubio_pitchdetection_slideblock(aubio_pitchdetection_t *p, fvec_t *ibuf){
+void aubio_pitch_slideblock(aubio_pitch_t *p, fvec_t *ibuf){
   uint_t i,j = 0, overlap_size = 0;
   overlap_size = p->buf->length-ibuf->length;
@@ -208 +208 @@
 }
 
-uint_t aubio_pitchdetection_set_unit (aubio_pitchdetection_t *p, char_t * pitch_unit) {
-  aubio_pitchdetection_mode pitch_mode;
+uint_t aubio_pitch_set_unit (aubio_pitch_t *p, char_t * pitch_unit) {
+  aubio_pitch_mode pitch_mode;
   if (strcmp (pitch_unit, "freq") == 0)
       pitch_mode = aubio_pitchm_freq;
@@ -245 +245 @@
 }
 
-uint_t aubio_pitchdetection_set_tolerance(aubio_pitchdetection_t *p, smpl_t tol) {
+uint_t aubio_pitch_set_tolerance(aubio_pitch_t *p, smpl_t tol) {
   switch(p->type) {
-    case aubio_pitch_yin:
+    case aubio_pitcht_yin:
       aubio_pitchyin_set_tolerance (p->yin, tol);
       break;
-    case aubio_pitch_yinfft:
+    case aubio_pitcht_yinfft:
       aubio_pitchyinfft_set_tolerance (p->yinfft, tol);
       break;
@@ -259 +259 @@
 }
 
-void aubio_pitchdetection_do (aubio_pitchdetection_t *p, fvec_t * ibuf, fvec_t *obuf) {
+void aubio_pitch_do (aubio_pitch_t *p, fvec_t * ibuf, fvec_t *obuf) {
   uint_t i;
   p->callback(p, ibuf, obuf);
@@ -267 +267 @@
 }
 
-void aubio_pitchdetection_mcomb(aubio_pitchdetection_t *p, fvec_t *ibuf, fvec_t * obuf) {
+void aubio_pitch_do_mcomb(aubio_pitch_t *p, fvec_t *ibuf, fvec_t * obuf) {
   uint_t i;
   aubio_filter_do(p->filter,ibuf);
@@ -277 +277 @@
 }
 
-void aubio_pitchdetection_yin(aubio_pitchdetection_t *p, fvec_t *ibuf, fvec_t * obuf) {
+void aubio_pitch_do_yin(aubio_pitch_t *p, fvec_t *ibuf, fvec_t * obuf) {
   smpl_t pitch = 0.;
   uint_t i;
-  aubio_pitchdetection_slideblock(p,ibuf);
+  aubio_pitch_slideblock(p,ibuf);
   aubio_pitchyin_do(p->yin,p->buf, obuf);
   for (i = 0; i < obuf->channels; i++) {
@@ -294 +294 @@
 
 
-void aubio_pitchdetection_yinfft(aubio_pitchdetection_t *p, fvec_t *ibuf, fvec_t * obuf){
+void aubio_pitch_do_yinfft(aubio_pitch_t *p, fvec_t *ibuf, fvec_t * obuf){
   smpl_t pitch = 0.;
   uint_t i;
-  aubio_pitchdetection_slideblock(p,ibuf);
+  aubio_pitch_slideblock(p,ibuf);
   aubio_pitchyinfft_do(p->yinfft,p->buf,obuf);
   for (i = 0; i < obuf->channels; i++) {
@@ -310 +310 @@
 }
 
-void aubio_pitchdetection_fcomb(aubio_pitchdetection_t *p, fvec_t *ibuf, fvec_t * out){
-  uint_t i;
-  aubio_pitchdetection_slideblock(p,ibuf);
+void aubio_pitch_do_fcomb(aubio_pitch_t *p, fvec_t *ibuf, fvec_t * out){
+  uint_t i;
+  aubio_pitch_slideblock(p,ibuf);
   aubio_pitchfcomb_do(p->fcomb,p->buf, out);
   for (i = 0; i < out->channels; i++) {
@@ -319 +319 @@
 }
 
-void aubio_pitchdetection_schmitt(aubio_pitchdetection_t *p, fvec_t *ibuf, fvec_t *out){
+void aubio_pitch_do_schmitt(aubio_pitch_t *p, fvec_t *ibuf, fvec_t *out){
   smpl_t period, pitch = 0.;
   uint_t i;
-  aubio_pitchdetection_slideblock(p,ibuf);
+  aubio_pitch_slideblock(p,ibuf);
   aubio_pitchschmitt_do(p->schmitt,p->buf, out);
   for (i = 0; i < out->channels; i++) {

src/pitch/pitch.h

@@ -17 +17 @@
    */
 
-#ifndef PITCHAUTOTCORR_H
-#define PITCHAUTOTCORR_H
+#ifndef PITCH_H
+#define PITCH_H
 
 #ifdef __cplusplus
@@ -34 +34 @@
 
 /** pitch detection object */
-typedef struct _aubio_pitchdetection_t aubio_pitchdetection_t;
+typedef struct _aubio_pitch_t aubio_pitch_t;
 
 /** execute pitch detection on an input signal frame
 
-  \param o pitch detection object as returned by new_aubio_pitchdetection()
+  \param o pitch detection object as returned by new_aubio_pitch()
   \param in input signal of size [hopsize x channels]
   \param out output pitch candidates of size [1 x channes]
 
 */
-void aubio_pitchdetection_do (aubio_pitchdetection_t * o, fvec_t * in,
+void aubio_pitch_do (aubio_pitch_t * o, fvec_t * in,
     fvec_t * out);
 
 /** change yin or yinfft tolerance threshold
 
-  \param o pitch detection object as returned by new_aubio_pitchdetection()
+  \param o pitch detection object as returned by new_aubio_pitch()
   \param tol tolerance default is 0.15 for yin and 0.85 for yinfft
 
 */
-uint_t aubio_pitchdetection_set_tolerance (aubio_pitchdetection_t * o,
+uint_t aubio_pitch_set_tolerance (aubio_pitch_t * o,
     smpl_t tol);
 
 /** deletion of the pitch detection object
 
-  \param o pitch detection object as returned by new_aubio_pitchdetection()
+  \param o pitch detection object as returned by new_aubio_pitch()
 
 */
-void del_aubio_pitchdetection (aubio_pitchdetection_t * o);
+void del_aubio_pitch (aubio_pitch_t * o);
 
 /** creation of the pitch detection object
@@ -71 +71 @@
 
 */
-aubio_pitchdetection_t *new_aubio_pitchdetection (char_t * mode,
+aubio_pitch_t * new_aubio_pitch (char_t * mode,
     uint_t bufsize, uint_t hopsize, uint_t channels, uint_t samplerate);
 
 /** set the output unit of the pitch detection object 
 
-  \param o pitch detection object as returned by new_aubio_pitchdetection()
+  \param o pitch detection object as returned by new_aubio_pitch()
   \param mode set pitch units for output
 
 */
-uint_t aubio_pitchdetection_set_unit (aubio_pitchdetection_t * o,
+uint_t aubio_pitch_set_unit (aubio_pitch_t * o,
     char_t * mode);
 
@@ -87 +87 @@
 #endif
 
-#endif /*PITCHDETECTION_H*/
+#endif /*PITCH_H*/