Changeset 066433d

Timestamp:

Jan 9, 2010, 3:51:20 PM (14 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:

d453a4a

Parents:

8212692 (diff), 37eb9ce (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 with mono

Files:

• examples/utils.c (modified) (2 diffs)
• interfaces/python/aubio/__init__.py (modified) (1 diff)
• interfaces/python/aubioinput.py (modified) (2 diffs)
• interfaces/python/demo_beat.py (added)
• interfaces/python/demo_filterbank.py (added)
• interfaces/python/test_fvec.py (modified) (2 diffs)
• tests/src/test-pitch.c (modified) (1 diff)

examples/utils.c

@@ -238 +238 @@
 #endif /* HAVE_LASH */
 
-  woodblock = new_fvec (overlap_size, channels);
+  woodblock = new_fvec (overlap_size);
   if (output_filename || usejack) {
     /* dummy assignement to keep egcs happy */
@@ -251 +251 @@
   if (onsetfile) {
     /* read the output sound once */
-    aubio_sndfile_read (onsetfile, overlap_size, woodblock);
-  }
-
-  ibuf = new_fvec (overlap_size, channels);
-  obuf = new_fvec (overlap_size, channels);
+    aubio_sndfile_read_mono (onsetfile, overlap_size, woodblock);
+  }
+
+  ibuf = new_fvec (overlap_size);
+  obuf = new_fvec (overlap_size);
 
 }

interfaces/python/aubio/__init__.py

@@ -4 +4 @@
 class fvec(numpy.ndarray):
 
-    def __init__(self, length = 1024, **kwargs):
-        super(numpy.ndarray, self).__init__(**kwargs)
-
     def __new__(self, length = 1024, **kwargs):
-        self = numpy.zeros(length, dtype='float32', **kwargs)
-        return self
+        if type(length) == type([]):
+            return numpy.array(length, dtype='float32', **kwargs)
+        return numpy.zeros(length, dtype='float32', **kwargs)

interfaces/python/aubioinput.py

@@ -10 +10 @@
     import numpy
     samples = numpy.frombuffer(buffer.data, dtype=numpy.float32) 
-    samples.resize([len(samples)/chan, chan])
-    return samples.T
+    if chan == 1:
+        return samples.T
+    else:
+        samples.resize([len(samples)/chan, chan])
+        return samples.T
 
 class AubioSink(gst.BaseSink):
@@ -53 +56 @@
             if self.process:
                 self.process(v, self.pos)
-            self.pos += 1    
+            self.pos += 1
+        remaining = self.adapter.available()
+        if remaining < blocksize and remaining > 0:
+            block = self.adapter.take_buffer(remaining)
+            v = gst_buffer_to_numpy_array(block, chan)
+            if self.process:
+                self.process(v, self.pos)
+            self.pos += 1
         return gst.FLOW_OK
 

interfaces/python/test_fvec.py

@@ -13 +13 @@
         #del a
         assert_equal(array(a), 0.)
+
+    def test_vector_create_with_list(self):
+        a = fvec([0,1,2,3])
+        assert_equal (range(4), a)
 
     def test_vector_assign_element(self):
@@ -53 +57 @@
         from math import sqrt
         assert_almost_equal (alpha_norm(a, 2), sqrt(2)/2.)
+
+    def test_alpha_norm_of_none(self):
+        self.assertRaises (ValueError, alpha_norm, None, 1)
 
     def test_alpha_norm_of_array_of_float32(self):

tests/src/test-pitch.c

@@ -3 +3 @@
 int main(){
         /* allocate some memory */
-        uint_t win_s      = 1024;                       /* window size */
-        uint_t channels   = 1;                          /* number of channel */
-        fvec_t * in       = new_fvec (win_s, channels); /* input buffer */
-        fvec_t * out      = new_fvec (1, channels); /* input buffer */
-        aubio_pitch_t *p = new_aubio_pitch ("default", win_s, win_s / 2, channels, 44100);
+        uint_t win_s      = 1024; /* window size */
+        fvec_t * in       = new_fvec (win_s); /* input buffer */
+        fvec_t * out      = new_fvec (1); /* input buffer */
+        aubio_pitch_t *p = new_aubio_pitch ("default", win_s, win_s / 2, 44100);
         uint_t i = 0;