Changeset b257b60 for src/spectral/specdesc.c

Timestamp:

Aug 12, 2015, 7:21:38 PM (9 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:

60fc05b

Parents:

3a1a5d6 (diff), 7b2d740 (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 'develop' into notes

File:

• src/spectral/specdesc.c (modified) (1 diff)

src/spectral/specdesc.c

@@ -119 +119 @@
     onset->data[0] +=
       SQRT (ABS (SQR (o->oldmag->data[j]) + SQR (fftgrain->norm[j])
-            - 2. * o->oldmag->data[j] * fftgrain->norm[j]
+            - 2 * o->oldmag->data[j] * fftgrain->norm[j]
             * COS (o->dev1->data[j] - fftgrain->phas[j])));
     /* swap old phase data (need to remember 2 frames behind)*/