Changeset 614963a

Timestamp:

Jul 16, 2012, 12:44:01 AM (12 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:

6bfbcdc

Parents:

55012c4 (diff), 3cd2434 (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 io

Files:

• interfaces/python/demo_filterbank_slaney.py (modified) (1 diff)
• interfaces/python/demo_filterbank_triangle_bands.py (modified) (2 diffs)
• src/tempo/beattracking.c (modified) (2 diffs)

interfaces/python/demo_filterbank_slaney.py

@@ -12 +12 @@
 from pylab import loglog, title, show, xlim, ylim, xlabel, ylabel
 xlim([0,samplerate / 2])
-print f.get_coeffs().shape
 times = vstack([arange(win_s / 2 + 1) * samplerate / win_s] * 40)
-print times.shape
 loglog(times.T, f.get_coeffs().T, '.-')
 title('Mel frequency bands coefficients')
 xlim([100, 7500])
 ylim([1.0e-3, 2.0e-2])
-xlabel('frequency (Hz)')
-ylabel('amplitude')
+xlabel('Frequency (Hz)')
+ylabel('Amplitude')
 show()

interfaces/python/demo_filterbank_triangle_bands.py

@@ -21 +21 @@
 xlim([50, samplerate/2])
 ylim([1.0e-6, 2.0e-2])
-ylabel('amplitude')
+ylabel('Amplitude')
 
 ## build a new filterbank
@@ -42 +42 @@
 xlim([50, samplerate/2])
 ylim([1.0e-6, 2.0e-2])
-xlabel('frequency (Hz)')
-ylabel('amplitude')
+xlabel('Frequency (Hz)')
+ylabel('Amplitude')
 
 show()

src/tempo/beattracking.c

@@ -160 +160 @@
   for (i = 1; i < laglen - 1; i++) {
     for (a = 1; a <= numelem; a++) {
-      for (b = (1 - a); b < a; b++) {
+      for (b = (1 - a); b < (sint_t)a; b++) {
         bt->acfout->data[i] += bt->acf->data[a * (i + 1) + b - 1]
             * 1. / (2. * a - 1.);
@@ -300 +300 @@
     for (i = 1; i < laglen - 1; i++) {
       for (a = 1; a <= bt->timesig; a++) {
-        for (b = (1 - a); b < a; b++) {
+        for (b = (1 - a); b < (sint_t)a; b++) {
           acfout->data[i] += acf->data[a * (i + 1) + b - 1];
         }