Changeset a9eb93e

Timestamp:

Sep 21, 2016, 3:55:21 PM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

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

Children:

4292013

Parents:

e2645cb

Message:

src/effects/pitchshift.h: use transpose, not pitchscale

Files:

• python/lib/gen_code.py (modified) (1 diff)
• src/effects/pitchshift.c (modified) (1 diff)
• src/effects/pitchshift.h (modified) (2 diffs)

python/lib/gen_code.py

@@ -20 +20 @@
     'method': '"default"',
     'uri': '"none"',
-    'pitchscale': '1.',
+    'transpose': '0.',
     }
 

src/effects/pitchshift.c

@@ -49 +49 @@
 aubio_pitchshift_t *
 new_aubio_pitchshift (const char_t * mode,
-    smpl_t pitchscale, uint_t hopsize, uint_t samplerate)
+    smpl_t transpose, uint_t hopsize, uint_t samplerate)
 {
   aubio_pitchshift_t *p = AUBIO_NEW (aubio_pitchshift_t);
   p->samplerate = samplerate;
   p->hopsize = hopsize;
-  p->timeratio = 1.;
-  p->pitchscale = pitchscale;
+  p->pitchscale = 1.;
+  if (transpose >= -24. && transpose <= 24.) {
+    p->pitchscale = POW(2., transpose / 12.);
+  } else {
+    AUBIO_ERR("pitchshift: transpose should be in the range [-24, 24], got %f\n", transpose);
+    goto beach;
+  }
 
   p->rboptions = RubberBandOptionProcessRealTime;

src/effects/pitchshift.h

@@ -58 +58 @@
 
   \param method set pitch shifting algorithm ("default")
-  \param pitchscale initial pitch scaling factor
+  \param transpose initial pitch transposition
   \param hop_size step size between two consecutive analysis instant
   \param samplerate sampling rate of the signal
@@ -66 +66 @@
 */
 aubio_pitchshift_t *new_aubio_pitchshift (const char_t * method,
-    smpl_t pitchscale, uint_t hop_size, uint_t samplerate);
+    smpl_t transpose, uint_t hop_size, uint_t samplerate);
 
 /** get the latency of the pitch shifting object, in samples