Changeset 459e46f for python

Timestamp:

Mar 8, 2013, 7:13:43 PM (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:

9582713

Parents:

e6f7a4a

Message:

python/demos/: update and add some demos

Location:

python/demos

Files:

• aubiocut (deleted)
• demo_beats_and_tempo.py (deleted)
• demo_onset.py (modified) (1 diff)
• demo_onset_plot.py (modified) (5 diffs)
• demo_tempo.py (added)
• demo_tempo_plot.py (added)

python/demos/demo_onset.py

@@ -19 +19 @@
 s = source(filename, samplerate, hop_s)
 samplerate = s.samplerate
-o = onset("default", win_s, hop_s)
+o = onset("default", win_s, hop_s, samplerate)
 
-# onset detection delay, in blocks
+# onset detection delay, in samples
+# default to 4 blocks delay to catch up with
 delay = 4. * hop_s
 
+# list of onsets, in samples
 onsets = []
+
+# total number of frames read
 total_frames = 0
 while True:

python/demos/demo_onset_plot.py

@@ -19 +19 @@
 s = source(filename, samplerate, hop_s)
 samplerate = s.samplerate
-o = onset("default", win_s, hop_s)
+o = onset("default", win_s, hop_s, samplerate)
 
-# onset detection delay, in blocks
+# onset detection delay, in samples
+# default to 4 blocks delay to catch up with
 delay = 4. * hop_s
 
+# list of onsets, in samples
 onsets = []
 
@@ -32 +34 @@
 downsample = 2  # to plot n samples / hop_s
 
+# total number of frames read
 total_frames = 0
 while True:
@@ -39 +42 @@
         this_onset = int(total_frames - delay + is_onset[0] * hop_s)
         print "%f" % (this_onset / float(samplerate))
-        onsets.append(this_onset / float(samplerate))
+        onsets.append(this_onset)
     # keep some data to plot it later
     new_maxes = (abs(samples.reshape(hop_s/downsample, downsample))).max(axis=0)
@@ -59 +62 @@
     plt1.plot(allsamples_max_times,  allsamples_max, '-b')
     plt1.plot(allsamples_max_times, -allsamples_max, '-b')
-    for stamp in onsets: plt1.plot([stamp, stamp], [-1., 1.], '-r')
+    for stamp in onsets:
+        stamp /= float(samplerate)
+        plt1.plot([stamp, stamp], [-1., 1.], '-r')
     plt1.axis(xmin = 0., xmax = max(allsamples_max_times) )
     plt1.xaxis.set_visible(False)
@@ -67 +72 @@
     plt2.plot(desc_times, desc_plot, '-g')
     tdesc_plot = [d / max(desc) for d in tdesc]
-    for stamp in onsets: plt2.plot([stamp, stamp], [min(tdesc_plot), max(desc_plot)], '-r')
+    for stamp in onsets:
+        stamp /= float(samplerate)
+        plt2.plot([stamp, stamp], [min(tdesc_plot), max(desc_plot)], '-r')
     plt2.plot(desc_times, tdesc_plot, '-y')
     plt2.axis(ymin = min(tdesc_plot), ymax = max(desc_plot))