From: Paul Brossier <piem@piem.org>
Date: Thu, 23 Mar 2017 14:19:19 +0000 (+0100)
Subject: python/lib/aubio/cmd.py: add tempo subcommand to extract overall bpm
X-Git-Tag: 0.4.5~44^2~6
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=bd720394be951e879c4fab3c1203c4fa6dda30c6;p=aubio.git

python/lib/aubio/cmd.py: add tempo subcommand to extract overall bpm
---

diff --git a/python/lib/aubio/cmd.py b/python/lib/aubio/cmd.py
index de6e9db1..2ee823e0 100644
--- a/python/lib/aubio/cmd.py
+++ b/python/lib/aubio/cmd.py
@@ -58,6 +58,15 @@ def aubio_parser():
     parser_add_buf_hop_size(subparser, buf_size=1024, hop_size=512)
     parser_add_time_format(subparser)
     parser_add_verbose_help(subparser)
+    subparser.set_defaults(process=process_beat)
+
+    # tempo subcommand
+    subparser = subparsers.add_parser('tempo',
+            help='get locations of beats')
+    parser_add_input(subparser)
+    parser_add_buf_hop_size(subparser, buf_size=1024, hop_size=512)
+    parser_add_time_format(subparser)
+    parser_add_verbose_help(subparser)
     subparser.set_defaults(process=process_tempo)
 
     # notes subcommand
@@ -237,12 +246,12 @@ class process_pitch(default_process):
         fmt_out = self.time2string(frames_read, samplerate)
         sys.stdout.write(fmt_out + "%.6f\n" % res[0])
 
-class process_tempo(default_process):
+class process_beat(default_process):
     valid_opts = ['method', 'hop_size', 'buf_size', 'samplerate']
     def __init__(self, args):
         self.options = parse_options(args, self.valid_opts)
         self.tempo = aubio.tempo(**self.options)
-        super(process_tempo, self).__init__(args)
+        super(process_beat, self).__init__(args)
     def __call__(self, block):
         return self.tempo(block)
     def repr_res(self, res, frames_read, samplerate):
@@ -250,6 +259,19 @@ class process_tempo(default_process):
             outstr = self.time2string(self.tempo.get_last(), samplerate)
             sys.stdout.write(outstr + '\n')
 
+class process_tempo(process_beat):
+    def __init__(self, args):
+        super(process_tempo, self).__init__(args)
+        self.beat_locations = []
+    def repr_res(self, res, frames_read, samplerate):
+        if res[0] != 0:
+            self.beat_locations.append(self.tempo.get_last_s())
+    def flush(self, frames_read, samplerate):
+        import numpy as np
+        bpms = 60./ np.diff(self.beat_locations)
+        median_bpm = np.mean(bpms)
+        sys.stdout.write('%.2f bpm' % median_bpm + '\n')
+
 class process_notes(default_process):
     valid_opts = ['method', 'hop_size', 'buf_size', 'samplerate']
     def __init__(self, args):