Changes in / [72d08ae:7e5b1bc]

Files:

• azure-pipelines.yml (modified) (3 diffs)
• doc/about.rst (modified) (1 diff)
• doc/aubiomfcc.txt (modified) (1 diff)
• doc/conf.py (modified) (1 diff)
• doc/python_module.rst (modified) (1 diff)
• python/ext/py-filterbank.c (modified) (3 diffs)
• python/lib/aubio/cmd.py (modified) (2 diffs)
• python/lib/aubio/cut.py (modified) (2 diffs)
• python/lib/aubio/slicing.py (modified) (6 diffs)
• python/tests/test_aubio_cmd.py (modified) (1 diff)
• python/tests/test_slicing.py (modified) (3 diffs)
• src/io/source_avcodec.c (modified) (1 diff)
• src/spectral/filterbank_mel.h (modified) (1 diff)
• src/spectral/mfcc.h (modified) (1 diff)
• src/spectral/phasevoc.c (modified) (1 diff)
• src/spectral/phasevoc.h (modified) (1 diff)
• src/synth/wavetable.c (modified) (1 diff)
• src/synth/wavetable.h (modified) (1 diff)

azure-pipelines.yml

@@ -1 +1 @@
 #  configuration file for azure continuous integration
 jobs:
+
 - job: linux
   pool:
     vmImage: 'Ubuntu 16.04'
-
   steps:
   - script: |
       make
     displayName: 'make'
+    env:
+      CFLAGS: -Werror
+
 - job: windows
   pool:
     vmIMage: 'VS2017-Win2016'
-
   steps:
   - script: |
@@ -24 +26 @@
   pool:
     vmIMage: macOS-10.13
-
   steps:
   - script: |
@@ -34 +35 @@
       make
     displayName: 'make'
+    env:
+      CFLAGS: -Werror

doc/about.rst

@@ -60 +60 @@
 -------
 
-aubio is a `free <http://www.debian.org/intro/free>`_ and `open source
+aubio is a `free <https://www.debian.org/intro/free>`_ and `open source
 <http://www.opensource.org/docs/definition.php>`_ software; **you** can
 redistribute it and/or modify it under the terms of the `GNU

doc/aubiomfcc.txt

@@ -52 +52 @@
   url:
 
-  http://cobweb.ecn.purdue.edu/~malcolm/interval/1998-010/ (see file mfcc.m)
+  https://engineering.purdue.edu/~malcolm/interval/1998-010/ (see file mfcc.m)
 
 SEE ALSO

doc/conf.py

@@ -46 +46 @@
 # General information about the project.
 project = u'aubio'
-copyright = u'2016, Paul Brossier'
+copyright = u'2018, Paul Brossier'
 
 # The version info for the project you're documenting, acts as replacement for

doc/python_module.rst

@@ -80 +80 @@
 .. _demo_filter.py: https://github.com/aubio/aubio/blob/master/python/demos/demo_filter.py
 .. _python tests: https://github.com/aubio/aubio/blob/master/python/tests
-

python/ext/py-filterbank.c

@@ -95 +95 @@
   if (self->vec.length != self->win_s / 2 + 1) {
     PyErr_Format(PyExc_ValueError,
-                 "input cvec has length %d, but fft expects length %d",
+                 "input cvec has length %d, but filterbank expects length %d",
                  self->vec.length, self->win_s / 2 + 1);
     return NULL;
@@ -140 +140 @@
   if (err > 0) {
     PyErr_SetString (PyExc_ValueError,
-        "error when setting filter to A-weighting");
+        "error when running set_triangle_bands");
     return NULL;
   }
@@ -159 +159 @@
   if (err > 0) {
     PyErr_SetString (PyExc_ValueError,
-        "error when setting filter to A-weighting");
+        "error when running set_mel_coeffs_slaney");
     return NULL;
   }

python/lib/aubio/cmd.py

@@ -248 +248 @@
                 action = "store", dest = "cut_until_nslices", default = None,
                 help="how many extra slices should be added at the end of each slice")
+        self.add_argument("--create-first",
+                action = "store_true", dest = "create_first", default = False,
+                help="always include first slice")
 
 # some utilities
@@ -500 +503 @@
 def main():
     parser = aubio_parser()
-    args = parser.parse_args()
+    if sys.version_info[0] != 3:
+        # on py2, create a dummy ArgumentParser to workaround the
+        # optional subcommand issue. See https://bugs.python.org/issue9253
+        # This ensures that:
+        #  - version string is shown when only '-V' is passed
+        #  - help is printed if  '-V' is passed with any other argument
+        #  - any other argument get forwarded to the real parser
+        parser_root = argparse.ArgumentParser(add_help=False)
+        parser_root.add_argument('-V', '--version', help="show version",
+                action="store_true", dest="show_version")
+        args, extras = parser_root.parse_known_args()
+        if args.show_version == False: # no -V, forward to parser
+            args = parser.parse_args(extras, namespace=args)
+        elif len(extras) != 0: # -V with other arguments, print help
+            parser.print_help()
+            sys.exit(1)
+    else: # in py3, we can simply use parser directly
+        args = parser.parse_args()
     if 'show_version' in args and args.show_version:
         sys.stdout.write('aubio version ' + aubio.version + '\n')

python/lib/aubio/cut.py

@@ -102 +102 @@
     s = source(source_uri, samplerate, hopsize)
     if samplerate == 0:
-        samplerate = s.get_samplerate()
+        samplerate = s.samplerate
         options.samplerate = samplerate
 
@@ -151 +151 @@
                 timestamps, timestamps_end = timestamps_end,
                 output_dir = options.output_directory,
-                samplerate = options.samplerate)
+                samplerate = options.samplerate,
+                create_first = options.create_first)
 
 def main():

python/lib/aubio/slicing.py

@@ -7 +7 @@
 
 def slice_source_at_stamps(source_file, timestamps, timestamps_end=None,
-                           output_dir=None, samplerate=0, hopsize=256):
+                           output_dir=None, samplerate=0, hopsize=256,
+                           create_first=False):
     """ slice a sound file at given timestamps """
 
@@ -13 +14 @@
         raise ValueError("no timestamps given")
 
-    if timestamps[0] != 0:
+    if timestamps[0] != 0 and create_first:
         timestamps = [0] + timestamps
         if timestamps_end is not None:
@@ -19 +20 @@
 
     if timestamps_end is not None:
-        if len(timestamps_end) != len(timestamps):
+        if len(timestamps_end) == len(timestamps) - 1:
+            timestamps_end = timestamps_end + [_max_timestamp]
+        elif len(timestamps_end) != len(timestamps):
             raise ValueError("len(timestamps_end) != len(timestamps)")
     else:
@@ -49 +52 @@
         vec, read = _source.do_multi()
         # if the total number of frames read will exceed the next region start
-        if len(regions) and total_frames + read >= regions[0][0]:
+        while len(regions) and total_frames + read >= regions[0][0]:
             #print "getting", regions[0], "at", total_frames
             # get next region
@@ -76 +79 @@
                     # write remaining samples from current region
                     _sink.do_multi(vec[:, start:remaining], remaining - start)
-                    #print "closing region", "remaining", remaining
+                    #print("closing region", "remaining", remaining)
                     # close this file
                     _sink.close()
@@ -83 +86 @@
                 _sink.do_multi(vec[:, start:read], read - start)
         total_frames += read
+        # remove old slices
+        slices = list(filter(lambda s: s['end_stamp'] > total_frames,
+            slices))
         if read < hopsize:
             break

python/tests/test_aubio_cmd.py

@@ -20 +20 @@
 
     def test_samples2seconds(self):
-        self.assertEqual(aubio.cmd.samples2seconds(3200, 32000), "0.100000\t")
+        self.assertEqual(aubio.cmd.samples2seconds(3200, 32000),
+                "0.100000\t")
 
     def test_samples2milliseconds(self):
-        self.assertEqual(aubio.cmd.samples2milliseconds(3200, 32000), "100.000000\t")
+        self.assertEqual(aubio.cmd.samples2milliseconds(3200, 32000),
+                "100.000000\t")
 
     def test_samples2samples(self):
-        self.assertEqual(aubio.cmd.samples2samples(3200, 32000), "3200\t")
+        self.assertEqual(aubio.cmd.samples2samples(3200, 32000),
+                "3200\t")
 
 if __name__ == '__main__':

python/tests/test_slicing.py

@@ -24 +24 @@
     def test_slice_start_only_no_zero(self):
         regions_start = [i*1000 for i in range(1, n_slices)]
-        slice_source_at_stamps(self.source_file, regions_start, output_dir = self.output_dir)
+        slice_source_at_stamps(self.source_file, regions_start,
+                output_dir = self.output_dir, create_first=True)
 
     def test_slice_start_beyond_end(self):
         regions_start = [i*1000 for i in range(1, n_slices)]
         regions_start += [count_samples_in_file(self.source_file) + 1000]
-        slice_source_at_stamps(self.source_file, regions_start, output_dir = self.output_dir)
+        slice_source_at_stamps(self.source_file, regions_start,
+                output_dir = self.output_dir, create_first=True)
 
     def test_slice_start_every_blocksize(self):
         hopsize = 200
-        regions_start = [i*hopsize for i in range(1, n_slices)]
+        regions_start = [i*hopsize for i in range(0, n_slices)]
         slice_source_at_stamps(self.source_file, regions_start, output_dir = self.output_dir,
                 hopsize = 200)
+
+    def test_slice_start_every_half_blocksize(self):
+        hopsize = 200
+        regions_start = [i*hopsize//2 for i in range(0, n_slices)]
+        slice_source_at_stamps(self.source_file, regions_start,
+                output_dir = self.output_dir, hopsize = 200)
 
     def tearDown(self):
@@ -92 +100 @@
             "number of samples written different from number of original samples")
 
+    def test_slice_start_and_ends_with_missing_end(self):
+        regions_start = [i*1000 for i in range(n_slices)]
+        regions_ends = [r-1 for r in regions_start[1:]]
+        slice_source_at_stamps(self.source_file, regions_start, regions_ends,
+                output_dir = self.output_dir)
+        written_samples = count_samples_in_directory(self.output_dir)
+        original_samples = count_samples_in_file(self.source_file)
+        total_files = count_files_in_directory(self.output_dir)
+        assert_equal(n_slices, total_files,
+            "number of slices created different from expected")
+        assert_equal(written_samples, original_samples,
+            "number of samples written different from number of original samples")
+
     def tearDown(self):
         shutil.rmtree(self.output_dir)
@@ -134 +155 @@
         regions_end = None
         slice_source_at_stamps (self.source_file, regions_start, regions_end,
-                output_dir = self.output_dir)
+                output_dir = self.output_dir, create_first=True)
         total_files = count_files_in_directory(self.output_dir)
         assert_equal(n_slices, total_files,

src/io/source_avcodec.c

@@ -435 +435 @@
     goto beach;
   }
+#else
+#warning "avutil < 53 is deprecated, crashes might occur on corrupt files"
 #endif
 

src/spectral/filterbank_mel.h

@@ -59 +59 @@
 
   The filter coefficients are built according to Malcolm Slaney's Auditory
-  Toolbox, available at http://engineering.purdue.edu/~malcolm/interval/1998-010/
-  (see file mfcc.m).
+  Toolbox, available online at the following address (see file mfcc.m):
+
+  https://engineering.purdue.edu/~malcolm/interval/1998-010/
 
 */

src/spectral/mfcc.h

@@ -27 +27 @@
 
   The implementation follows the specifications established by Malcolm Slaney
-  in its Auditory Toolbox, available online (see file mfcc.m).
+  in its Auditory Toolbox, available online at the following address (see
+  file mfcc.m):
 
-  http://engineering.ecn.purdue.edu/~malcolm/interval/1998-010/
+  https://engineering.purdue.edu/~malcolm/interval/1998-010/
 
   \example spectral/test-mfcc.c

src/spectral/phasevoc.c

@@ -213 +213 @@
     synthold[i] += synth[i + pv->hop_s] * pv->scale;
 }
+
+uint_t aubio_pvoc_get_win(aubio_pvoc_t* pv)
+{
+  return pv->win_s;
+}
+
+uint_t aubio_pvoc_get_hop(aubio_pvoc_t* pv)
+{
+  return pv->hop_s;
+}

src/spectral/phasevoc.h

@@ -89 +89 @@
 */
 uint_t aubio_pvoc_get_win(aubio_pvoc_t* pv);
+
 /** get hop size
 

src/synth/wavetable.c

@@ -165 +165 @@
   aubio_wavetable_set_amp (s, 0.);
   //s->last_pos = 0;
-  return aubio_wavetable_set_playing (s, 1);
+  return aubio_wavetable_set_playing (s, 0);
 }
 

src/synth/wavetable.h

@@ -51 +51 @@
 */
 aubio_wavetable_t * new_aubio_wavetable(uint_t samplerate, uint_t hop_size);
-
-/** load source in wavetable
-
-  \param o wavetable, created by new_aubio_wavetable()
-  \param uri the uri of the source to load
-
-  \return 0 if successful, non-zero otherwise
-
-*/
-uint_t aubio_wavetable_load( aubio_wavetable_t * o, const char_t * uri );
 
 /** process wavetable function