Changeset 155cc10 for src/spectral/ooura_fft8g.c

Timestamp:

Mar 10, 2017, 2:26:32 PM (8 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, sampler

Children:

ee8a57c

Parents:

00d0275 (diff), 67b6618 (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 branch 'master' into awhitening

File:

• src/spectral/ooura_fft8g.c (modified) (12 diffs)

src/spectral/ooura_fft8g.c

@@ -3 +3 @@
 //  - include "aubio_priv.h" (for config.h and types.h)
 //  - add missing prototypes
-//  - use COS and SIN macros
+//  - use COS, SIN, and ATAN macros
+//  - add cast to (smpl_t) to avoid float conversion warnings
+//  - declare initialization as static
+//  - prefix public function with aubio_ooura_
 
 #include "aubio_priv.h"
 
-void cdft(int n, int isgn, smpl_t *a, int *ip, smpl_t *w);
-void rdft(int n, int isgn, smpl_t *a, int *ip, smpl_t *w);
-void ddct(int n, int isgn, smpl_t *a, int *ip, smpl_t *w);
-void ddst(int n, int isgn, smpl_t *a, int *ip, smpl_t *w);
-void dfct(int n, smpl_t *a, smpl_t *t, int *ip, smpl_t *w);
-void dfst(int n, smpl_t *a, smpl_t *t, int *ip, smpl_t *w);
-void makewt(int nw, int *ip, smpl_t *w);
-void makect(int nc, int *ip, smpl_t *c);
-void bitrv2(int n, int *ip, smpl_t *a);
-void bitrv2conj(int n, int *ip, smpl_t *a);
-void cftfsub(int n, smpl_t *a, smpl_t *w);
-void cftbsub(int n, smpl_t *a, smpl_t *w);
-void cft1st(int n, smpl_t *a, smpl_t *w);
-void cftmdl(int n, int l, smpl_t *a, smpl_t *w);
-void rftfsub(int n, smpl_t *a, int nc, smpl_t *c);
-void rftbsub(int n, smpl_t *a, int nc, smpl_t *c);
-void dctsub(int n, smpl_t *a, int nc, smpl_t *c);
-void dstsub(int n, smpl_t *a, int nc, smpl_t *c);
+void aubio_ooura_cdft(int n, int isgn, smpl_t *a, int *ip, smpl_t *w);
+void aubio_ooura_rdft(int n, int isgn, smpl_t *a, int *ip, smpl_t *w);
+void aubio_ooura_ddct(int n, int isgn, smpl_t *a, int *ip, smpl_t *w);
+void aubio_ooura_ddst(int n, int isgn, smpl_t *a, int *ip, smpl_t *w);
+void aubio_ooura_dfct(int n, smpl_t *a, smpl_t *t, int *ip, smpl_t *w);
+void aubio_ooura_dfst(int n, smpl_t *a, smpl_t *t, int *ip, smpl_t *w);
+static void makewt(int nw, int *ip, smpl_t *w);
+static void makect(int nc, int *ip, smpl_t *c);
+static void bitrv2(int n, int *ip, smpl_t *a);
+static void bitrv2conj(int n, int *ip, smpl_t *a);
+static void cftfsub(int n, smpl_t *a, smpl_t *w);
+static void cftbsub(int n, smpl_t *a, smpl_t *w);
+static void cft1st(int n, smpl_t *a, smpl_t *w);
+static void cftmdl(int n, int l, smpl_t *a, smpl_t *w);
+static void rftfsub(int n, smpl_t *a, int nc, smpl_t *c);
+static void rftbsub(int n, smpl_t *a, int nc, smpl_t *c);
+static void dctsub(int n, smpl_t *a, int nc, smpl_t *c);
+static void dstsub(int n, smpl_t *a, int nc, smpl_t *c);
 
 /*
@@ -303 +306 @@
 
 
-void cdft(int n, int isgn, smpl_t *a, int *ip, smpl_t *w)
+void aubio_ooura_cdft(int n, int isgn, smpl_t *a, int *ip, smpl_t *w)
 {
     void makewt(int nw, int *ip, smpl_t *w);
@@ -328 +331 @@
 
 
-void rdft(int n, int isgn, smpl_t *a, int *ip, smpl_t *w)
+void aubio_ooura_rdft(int n, int isgn, smpl_t *a, int *ip, smpl_t *w)
 {
     void makewt(int nw, int *ip, smpl_t *w);
@@ -362 +365 @@
         a[1] = xi;
     } else {
-        a[1] = 0.5 * (a[0] - a[1]);
+        a[1] = (smpl_t)0.5 * (a[0] - a[1]);
         a[0] -= a[1];
         if (n > 4) {
@@ -375 +378 @@
 
 
-void ddct(int n, int isgn, smpl_t *a, int *ip, smpl_t *w)
+void aubio_ooura_ddct(int n, int isgn, smpl_t *a, int *ip, smpl_t *w)
 {
     void makewt(int nw, int *ip, smpl_t *w);
@@ -434 +437 @@
 
 
-void ddst(int n, int isgn, smpl_t *a, int *ip, smpl_t *w)
+void aubio_ooura_ddst(int n, int isgn, smpl_t *a, int *ip, smpl_t *w)
 {
     void makewt(int nw, int *ip, smpl_t *w);
@@ -493 +496 @@
 
 
-void dfct(int n, smpl_t *a, smpl_t *t, int *ip, smpl_t *w)
+void aubio_ooura_dfct(int n, smpl_t *a, smpl_t *t, int *ip, smpl_t *w)
 {
     void makewt(int nw, int *ip, smpl_t *w);
@@ -589 +592 @@
 
 
-void dfst(int n, smpl_t *a, smpl_t *t, int *ip, smpl_t *w)
+void aubio_ooura_dfst(int n, smpl_t *a, smpl_t *t, int *ip, smpl_t *w)
 {
     void makewt(int nw, int *ip, smpl_t *w);
@@ -691 +694 @@
     if (nw > 2) {
         nwh = nw >> 1;
-        delta = atan(1.0) / nwh;
+        delta = ATAN(1.0) / nwh;
         w[0] = 1;
         w[1] = 0;
@@ -725 +728 @@
     if (nc > 1) {
         nch = nc >> 1;
-        delta = atan(1.0) / nch;
-        c[0] = cos(delta * nch);
-        c[nch] = 0.5 * c[0];
+        delta = ATAN(1.0) / nch;
+        c[0] = COS(delta * nch);
+        c[nch] = (smpl_t)0.5 * c[0];
         for (j = 1; j < nch; j++) {
-            c[j] = 0.5 * cos(delta * j);
-            c[nc - j] = 0.5 * sin(delta * j);
+            c[j] = (smpl_t)0.5 * COS(delta * j);
+            c[nc - j] = (smpl_t)0.5 * SIN(delta * j);
         }
     }
@@ -1586 +1589 @@
         k = n - j;
         kk += ks;
-        wkr = 0.5 - c[nc - kk];
+        wkr = (smpl_t)0.5 - c[nc - kk];
         wki = c[kk];
         xr = a[j] - a[k];
@@ -1612 +1615 @@
         k = n - j;
         kk += ks;
-        wkr = 0.5 - c[nc - kk];
+        wkr = (smpl_t)0.5 - c[nc - kk];
         wki = c[kk];
         xr = a[j] - a[k];