Changes in / [813f4c7:e79943b]

Files:

• README.md (modified) (1 diff)
• doc/aubionotes.txt (modified) (1 diff)
• python/demos/demo_pyaudio.py (added)
• python/tests/test_notes.py (modified) (1 diff, 1 prop)
• wscript (modified) (2 diffs)

README.md

@@ -171 +171 @@
 ---------------------------------
 
-Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
+Copyright (C) 2003-2016 Paul Brossier <piem@aubio.org>
 
 aubio is free software: you can redistribute it and/or modify it under the

doc/aubionotes.txt

@@ -50 +50 @@
   0.1. Lower threshold values imply more onsets detected. Try 0.5 in case of
   over-detections. Defaults to 0.3.
+
+  -M, --minioi value  Set the minimum inter-onset interval, in seconds, the
+  shortest interval between two consecutive notes. Defaults to 0.030
 
   -p, --pitch method  The pitch detection method to use. See PITCH METHODS

python/tests/test_notes.py

@@ -39 +39 @@
         assert_equal (self.o.get_silence(), val)
 
+from utils import list_all_sounds
+list_of_sounds = list_all_sounds('sounds')
+
+class aubio_notes_sinewave(TestCase):
+
+    def analyze_file(self, filepath, samplerate=0):
+        from aubio import source
+        import numpy as np
+        win_s = 512 # fft size
+        hop_s = 256 # hop size
+
+        s = source(filepath, samplerate, hop_s)
+        samplerate = s.samplerate
+
+        tolerance = 0.8
+
+        notes_o = notes("default", win_s, hop_s, samplerate)
+        total_frames = 0
+
+        results = []
+        while True:
+            samples, read = s()
+            new_note = notes_o(samples)
+            if (new_note[0] != 0):
+                note_str = ' '.join(["%.2f" % i for i in new_note])
+                results.append( [total_frames, np.copy(new_note)] )
+            total_frames += read
+            if read < hop_s: break
+        return results
+
+    def test_sinewave(self):
+        for filepath in list_of_sounds:
+            if '44100Hz_44100f_sine441.wav' in filepath:
+                results = self.analyze_file(filepath)
+                assert_equal (len(results), 1)
+                assert_equal (len(results[0]), 2)
+                assert_equal (results[0][0], 1280)
+                assert_equal (results[0][1], [69, 123, -1])
+
 if __name__ == '__main__':
     main()

wscript

@@ -48 +48 @@
 
 def options(ctx):
+    ctx.add_option('--build-type', action = 'store',
+            default = "release",
+            choices = ('debug', 'release'),
+            dest = 'build_type',
+            help = 'whether to compile with (--build_type=release) or without (--build_type=debug) '\
+              ' compiler opimizations [default: release]')
     add_option_enable_disable(ctx, 'fftw3f', default = False,
             help_str = 'compile with fftw3f instead of ooura (recommended)',
@@ -126 +132 @@
     ctx.env['DEST_OS'] = target_platform
 
+    if ctx.options.build_type == "debug":
+        ctx.define('DEBUG', 1)
+    else:
+        ctx.define('NDEBUG', 1)
+    
     if ctx.env.CC_NAME != 'msvc':
+        # enable debug symbols and configure warnings
         ctx.env.CFLAGS += ['-g', '-Wall', '-Wextra']
-    else:
-        ctx.env.CFLAGS += ['/W4', '/MD']
-        ctx.env.CFLAGS += ['/D_CRT_SECURE_NO_WARNINGS']
-
+        if ctx.options.build_type == "release":
+            # set optimization level 
+            ctx.env.CFLAGS += ['-O2']
+    else:
+        # enable debug symbols
+        ctx.env.CFLAGS += ['/Z7', '/FS']
+        ctx.env.LINKFLAGS += ['/DEBUG', '/INCREMENTAL:NO']
+        # configure warnings
+        ctx.env.CFLAGS += ['/W4', '/D_CRT_SECURE_NO_WARNINGS']
+        # set optimization level and runtime libs 
+        if (ctx.options.build_type == "release"):
+            ctx.env.CFLAGS += ['/Ox']
+            ctx.env.CFLAGS += ['/MD']
+        else:
+            assert(ctx.options.build_type == "debug")
+            ctx.env.CFLAGS += ['/MDd']
+        
     ctx.check_cc(lib='m', uselib_store='M', mandatory=False)