Changeset dc467b5d for python

Timestamp:

Oct 27, 2013, 12:44:29 PM (11 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:

8247249

Parents:

dd15573 (diff), 7fc5ba2 (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' of aubio.org:/git/aubio/aubio into wavetable

Location:

python

Files:

• demos/demo_filterbank.py (added)
• demos/demo_waveform_plot.py (modified) (2 diffs)
• lib/generator.py (modified) (2 diffs)
• scripts/aubiocut (modified) (6 diffs)
• tests/run_all_tests (modified) (1 diff)

python/demos/demo_waveform_plot.py

@@ -5 +5 @@
 from numpy import zeros, hstack
 
-def get_waveform_plot(filename, samplerate = 0, block_size = 4096, ax = None):
+def get_waveform_plot(filename, samplerate = 0, block_size = 4096, ax = None, downsample = 2**4):
     import matplotlib.pyplot as plt
     if not ax:
@@ -13 +13 @@
 
     allsamples_max = zeros(0,)
-    downsample = 2**4  # to plot n samples / hop_s
+    downsample = downsample  # to plot n samples / hop_s
 
     a = source(filename, samplerate, hop_s)            # source file

python/lib/generator.py

@@ -34 +34 @@
   generated_objects = []
   cpp_output, cpp_objects = get_cpp_objects()
-  skip_objects = ['fft',
+  skip_objects = [
+      # already in ext/
+      'fft',
       'pvoc',
       'filter',
       'filterbank',
+      #'resampler',
+      # AUBIO_UNSTABLE
+      'hist',
+      'scale',
+      'beattracking',
       'resampler',
       'sndfile',
+      'peakpicker',
+      'pitchfcomb',
+      'pitchmcomb',
+      'pitchschmitt',
+      'pitchyin',
+      'pitchyinfft',
       'sink_apple_audio',
       'sink_sndfile',
       'source_apple_audio',
-      'source_sndfile']
+      'source_sndfile',
+      #'sampler',
+      'audio_unit',
+      ]
 
   write_msg("-- INFO: %d objects in total" % len(cpp_objects))
@@ -180 +196 @@
   s = """// generated list of objects created with generator.py
 
-#include "Python.h"
+#include <Python.h>
 
 """

python/scripts/aubiocut

@@ -9 +9 @@
 
 usage = "usage: %s [options] -i soundfile" % sys.argv[0]
-usage += "\nhelp: %s -h" % sys.argv[0]
+usage += "\n help: %s -h" % sys.argv[0]
 
 def parse_args():
@@ -22 +22 @@
                     complexdomain|hfc|phase|specdiff|energy|kl|mkl")
     # cutting methods
-    """
     parser.add_option("-b","--beat",
             action="store_true", dest="beat", default=False,
             help="use beat locations")
+    """
     parser.add_option("-S","--silencecut",
             action="store_true", dest="silencecut", default=False,
@@ -41 +41 @@
     parser.add_option("-B","--bufsize",
             action="store", dest="bufsize", default=512,
-            metavar = "<size>",
+            metavar = "<size>", type='int',
             help="buffer size [default=512]")
     parser.add_option("-H","--hopsize",
-            metavar = "<size>",
+            metavar = "<size>", type='int',
             action="store", dest="hopsize", default=256,
             help="overlap size [default=256]")
@@ -127 +127 @@
     source_file = options.source_file
 
-    from aubio import onset, source, sink
+    from aubio import onset, tempo, source, sink
 
     s = source(source_file, samplerate, hopsize)
     if samplerate == 0: samplerate = s.get_samplerate()
 
-    o = onset(options.onset_method, bufsize, hopsize)
+    if options.beat:
+        o = tempo(options.onset_method, bufsize, hopsize)
+    else:
+        o = onset(options.onset_method, bufsize, hopsize)
     o.set_threshold(options.threshold)
 
@@ -141 +144 @@
         samples, read = s()
         if o(samples):
-            this_onset = o.get_last_onset()
-            if options.verbose: print "%.4f" % o.get_last_onset_s()
-            timestamps.append (this_onset)
+            timestamps.append (o.get_last())
+            if options.verbose: print "%.4f" % o.get_last_s()
         total_frames += read
         if read < hopsize: break
-
+    del s
     # print some info
     nstamps = len(timestamps)
@@ -162 +164 @@
             return source_base_name + '_%02.3f' % (timestamp) + '.wav'
         # reopen source file
-        del s
         s = source(source_file, samplerate, hopsize)
+        if samplerate == 0: samplerate = s.get_samplerate()
         # create first sink at 0
         g = sink(new_sink_name(source_base_name, 0.), samplerate)

python/tests/run_all_tests

@@ -8 +8 @@
     if curdir == '': curdir = '.'
     files = os.listdir(curdir)
-    modfiles = filter (lambda y: y.endswith('.py'), files) 
+    modfiles = filter (lambda y: y.endswith('.py'), files)
     modfiles = filter (lambda f: f.startswith('test_'), modfiles)
+    modfiles = filter (lambda y: not 'beattracking' in y, modfiles)
+    modfiles = filter (lambda y: not 'hist' in y, modfiles)
+    modfiles = filter (lambda y: not 'scale' in y, modfiles)
+    modfiles = filter (lambda y: not 'peakpicker' in y, modfiles)
     # get module names
     modnames = map (lambda x: os.path.splitext(x)[0], modfiles)