Changeset 93177fa for src

Timestamp:

Oct 15, 2009, 9:06:56 PM (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:

28c162c

Parents:

e8ae95ac

Message:

src/pitch/pitchdetection.{c,h}: update documentation, return ints in set methods

Location:

src/pitch

Files:

• pitchdetection.c (modified) (2 diffs)
• pitchdetection.h (modified) (1 diff)

src/pitch/pitchdetection.c

@@ -242 +242 @@
       break;
   }
-  return 0;
-}
-
-void aubio_pitchdetection_set_tolerance(aubio_pitchdetection_t *p, smpl_t tol) {
+  return AUBIO_OK;
+}
+
+uint_t aubio_pitchdetection_set_tolerance(aubio_pitchdetection_t *p, smpl_t tol) {
   switch(p->type) {
     case aubio_pitch_yin:
@@ -256 +256 @@
       break;
   }
+  return AUBIO_OK;
 }
 

src/pitch/pitchdetection.h

@@ -38 +38 @@
 /** execute pitch detection on an input signal frame
 
-  \param p pitch detection object as returned by new_aubio_pitchdetection
-  \param ibuf input signal of length hopsize
+  \param o pitch detection object as returned by new_aubio_pitchdetection()
+  \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 * p, fvec_t * ibuf, fvec_t * obuf);
+void aubio_pitchdetection_do (aubio_pitchdetection_t * o, fvec_t * in,
+    fvec_t * out);
 
 /** change yin or yinfft tolerance threshold
 
-  default is 0.15 for yin and 0.85 for yinfft
+  \param o pitch detection object as returned by new_aubio_pitchdetection()
+  \param tol tolerance default is 0.15 for yin and 0.85 for yinfft
 
 */
-void aubio_pitchdetection_set_tolerance(aubio_pitchdetection_t *p, smpl_t tol);
+uint_t aubio_pitchdetection_set_tolerance (aubio_pitchdetection_t * o,
+    smpl_t tol);
 
 /** deletion of the pitch detection object
 
-  \param p pitch detection object as returned by new_aubio_pitchdetection
+  \param o pitch detection object as returned by new_aubio_pitchdetection()
 
 */
-void del_aubio_pitchdetection(aubio_pitchdetection_t * p);
+void del_aubio_pitchdetection (aubio_pitchdetection_t * o);
 
 /** creation of the pitch detection object
 
+  \param mode set pitch detection algorithm
   \param bufsize size of the input buffer to analyse
   \param hopsize step size between two consecutive analysis instant
   \param channels number of channels to analyse
   \param samplerate sampling rate of the signal
-  \param type set pitch detection algorithm
+
+*/
+aubio_pitchdetection_t *new_aubio_pitchdetection (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 mode set pitch units for output
 
 */
-aubio_pitchdetection_t *new_aubio_pitchdetection (char_t * pitch_mode,
-    uint_t bufsize, uint_t hopsize, uint_t channels, uint_t samplerate);
-
-/** set the output unit of the pitch detection object */
-uint_t aubio_pitchdetection_set_unit (aubio_pitchdetection_t *p, char_t * pitch_unit);
+uint_t aubio_pitchdetection_set_unit (aubio_pitchdetection_t * o,
+    char_t * mode);
 
 #ifdef __cplusplus