Changeset 8802f92 for tests/python/src/pitch/pitchdetection.py

Timestamp:

Oct 8, 2009, 9:00:53 PM (15 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:

7280e67

Parents:

3027c6e

Message:

tests/python/src/pitch/pitchdetection.py: update to latest pitch prototypes

File:

• tests/python/src/pitch/pitchdetection.py (modified) (9 diffs)

tests/python/src/pitch/pitchdetection.py

@@ -28 +28 @@
     """ run pitchdetection on an empty buffer """
     vec = new_fvec(buf_size, channels)
+    out = new_fvec(1, channels)
     for i in range(100):
-      self.assertEqual(aubio_pitchdetection_do(self.o,vec),0.)
+      aubio_pitchdetection_do(self.o,vec, out)
+      self.assertEqual(fvec_read_sample(out, 0, 0),0.)
     del vec
 
@@ -35 +37 @@
     """ run pitchdetection on a train of 4 impulses """
     vec = new_fvec(buf_size, channels)
+    out = new_fvec(1, channels)
     fvec_write_sample(vec,-1.,0,  0)
     fvec_write_sample(vec, 1.,0,  buf_size/4)
@@ -41 +44 @@
     frequency = samplerate/2*4/buf_size
     for i in range(100):
-      self.assertEqual(aubio_pitchdetection_do(self.o,vec),frequency)
+      aubio_pitchdetection_do(self.o,vec, out)
+      self.assertEqual(fvec_read_sample(out, 0, 0),frequency)
     del vec
 
@@ -47 +51 @@
     """ run pitchdetection on a train of 4 positive impulses of arbitrary size """
     vec = new_fvec(buf_size, channels)
+    out = new_fvec(1, channels)
     frequency = samplerate/2*8/buf_size
     for i in range(100):
@@ -53 +58 @@
       fvec_write_sample(vec, 2.-.01*i,0,  buf_size/2)
       fvec_write_sample(vec, 2.-.01*i,0,3*buf_size/4)
-      self.assertAlmostEqual(aubio_pitchdetection_do(self.o,vec),frequency,1)
+      aubio_pitchdetection_do(self.o,vec, out)
+      self.assertAlmostEqual(fvec_read_sample(out, 0, 0),frequency,1)
     del vec
 
@@ -59 +65 @@
     """ run pitchdetection on a train of 4 negative impulses of arbitrary size """
     vec = new_fvec(buf_size, channels)
+    out = new_fvec(1, channels)
     frequency = samplerate/2*8/buf_size
     for i in range(1,100):
@@ -65 +72 @@
       fvec_write_sample(vec,-.01*i,0,  buf_size/2)
       fvec_write_sample(vec,-.01*i,0,3*buf_size/4)
-      self.assertAlmostEqual(aubio_pitchdetection_do(self.o,vec),frequency,1)
+      aubio_pitchdetection_do(self.o,vec, out)
+      self.assertAlmostEqual(fvec_read_sample(out, 0, 0),frequency,1)
     del vec
 
@@ -71 +79 @@
     """ run pitchdetection on a train of 8 impulses """
     vec = new_fvec(buf_size, channels)
+    out = new_fvec(1, channels)
     fvec_write_sample(vec, 1.,0,  0)
     fvec_write_sample(vec,-1.,0,  buf_size/8)
@@ -80 +89 @@
     fvec_write_sample(vec,-1.,0,7*buf_size/8)
     for i in range(100):
-      self.assertAlmostEqual(aubio_pitchdetection_do(self.o,vec),
+      aubio_pitchdetection_do(self.o,vec, out)
+      self.assertAlmostEqual(fvec_read_sample(out, 0, 0),
         samplerate/2/buf_size*8, 1) 
     del vec